From e898f26cf421ef00526e3195e9ca50a3e43e91b2 Mon Sep 17 00:00:00 2001 From: Nehon Date: Sat, 3 May 2014 13:49:05 +0200 Subject: [PATCH] The ShaderNodes system now correctly handles swizzle of types like ivecn, uvecn, bvecn --- jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java b/jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java index 5b264f10f..c057826e8 100644 --- a/jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java +++ b/jme3-core/src/main/java/com/jme3/shader/ShaderUtils.java @@ -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"); } }