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

The shader generator now supports swizzle on the left variable of a mapping :

Browse Source 
input mapping vec3 v3.xy = v2
will generate
vec3 v3 = vec3(0.0);
v3.xy = v2;
As this statement can't be done in one line.
This commit is contained in:
Nehon 2015-02-12 22:32:59 +01:00
parent a04a304954
commit 5b6b33c8f5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,7 +396,18 @@ public class Glsl100ShaderGenerator extends ShaderGenerator {
source.append(mapping.getLeftVariable().getNameSpace()); source.append(mapping.getLeftVariable().getNameSpace());
source.append("_"); source.append("_");
source.append(mapping.getLeftVariable().getName()); source.append(mapping.getLeftVariable().getName());
//left swizzle, the variable can't be declared and assigned on the same line.
if (mapping.getLeftSwizzling().length() > 0) { if (mapping.getLeftSwizzling().length() > 0) {
//initialize the declared variable to 0.0
source.append(" = ");
source.append(mapping.getLeftVariable().getType());
source.append("(0.0);\n");
appendIndent(source);
//assign the value on a new line
source.append(mapping.getLeftVariable().getNameSpace());
source.append("_");
source.append(mapping.getLeftVariable().getName());
source.append("."); source.append(".");
source.append(mapping.getLeftSwizzling()); source.append(mapping.getLeftSwizzling());
} }

4
jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java
View File

@ -120,11 +120,7 @@ public class ShaderUtils {
card = Integer.parseInt(type.replaceAll(".*vec", "")); card = Integer.parseInt(type.replaceAll(".*vec", ""));
if (swizzling.length() > 0) { if (swizzling.length() > 0) {
//if (card >= swizzling.length()) {
card = swizzling.length(); card = swizzling.length();
// } else {
// card = 0;
// }
} }
} }
} }