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

The ShaderNodes system now correctly handles swizzle of types like ivecn, uvecn, bvecn

Browse Source
This commit is contained in:
Nehon 2014-05-03 13:49:05 +02:00
parent d5f6058e85
commit e898f26cf4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ public class ShaderUtils {
card = 0;
}
} else {
card = Integer.parseInt(type.replaceAll("vec", ""));
card = Integer.parseInt(type.replaceAll(".*vec", ""));
if (swizzling.length() > 0) {
if (card >= swizzling.length()) {
@ -138,6 +138,6 @@ public class ShaderUtils {
* @return true if a variable of the given type can have a swizzle
*/
public static boolean isSwizzlable(String type) {
return type.equals("vec4") || type.equals("vec3") || type.equals("vec2") || type.equals("float");
return type.indexOf("vec4")>-1 || type.indexOf("vec3")>-1 || type.indexOf("vec2")>-1 || type.equals("float");
}
}