sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shader Nodes: changed the way uniforms were replaced in the code, they are now assigned as any other input except for samplers that can't be assigned.

Browse Source
This commit is contained in:
Nehon 2017-07-16 00:02:38 +02:00
parent 385d2caeed
commit 85dc89b0aa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java
View File

@ -211,7 +211,7 @@ public class Glsl100ShaderGenerator extends ShaderGenerator {
* this methods does things in this order : * this methods does things in this order :
* *
* 1. declaring and mapping input<br> * 1. declaring and mapping input<br>
* variables : variable replaced with MatParams or WorldParams are not * variables : variable replaced with MatParams or WorldParams that are Samplers are not
* declared and are replaced by the param actual name in the code. For others * declared and are replaced by the param actual name in the code. For others
* variables, the name space is appended with a "_" before the variable name * variables, the name space is appended with a "_" before the variable name
* in the code to avoid names collision between shaderNodes. <br> * in the code to avoid names collision between shaderNodes. <br>
@ -240,9 +240,9 @@ public class Glsl100ShaderGenerator extends ShaderGenerator {
List<String> declaredInputs = new ArrayList<String>(); List<String> declaredInputs = new ArrayList<String>();
for (VariableMapping mapping : shaderNode.getInputMapping()) { for (VariableMapping mapping : shaderNode.getInputMapping()) {
//all variables fed with a matparam or world param are replaced but the matparam itself //Variables fed with a sampler matparam or world param are replaced by the matparam itself
//it avoids issue with samplers that have to be uniforms, and it optimize a but the shader code. //It avoids issue with samplers that have to be uniforms.
if (isWorldOrMaterialParam(mapping.getRightVariable())) { if (isWorldOrMaterialParam(mapping.getRightVariable()) && mapping.getRightVariable().getType().startsWith("sampler")) {
nodeSource = replace(nodeSource, mapping.getLeftVariable(), mapping.getRightVariable().getPrefix() + mapping.getRightVariable().getName()); nodeSource = replace(nodeSource, mapping.getLeftVariable(), mapping.getRightVariable().getPrefix() + mapping.getRightVariable().getName());
} else { } else {
if (mapping.getLeftVariable().getType().startsWith("sampler")) { if (mapping.getLeftVariable().getType().startsWith("sampler")) {
@ -421,6 +421,7 @@ public class Glsl100ShaderGenerator extends ShaderGenerator {
source.append(" = "); source.append(" = ");
String namePrefix = getAppendableNameSpace(mapping.getRightVariable()); String namePrefix = getAppendableNameSpace(mapping.getRightVariable());
source.append(namePrefix); source.append(namePrefix);
source.append(mapping.getRightVariable().getPrefix());
source.append(mapping.getRightVariable().getName()); source.append(mapping.getRightVariable().getName());
if (mapping.getRightSwizzling().length() > 0) { if (mapping.getRightSwizzling().length() > 0) {
source.append("."); source.append(".");