Browse Source

*Reapplied -LINEAR fix from https://github.com/jMonkeyEngine/jmonkeyengine/commit/02322d04ccab5c1279e8634b76f520f4bb835aca

michael 10 years ago
parent
commit
6983aff1f3

+ 5 - 9
jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java

@@ -230,15 +230,7 @@ public class J3MLoader implements AssetLoader {
         String defaultVal = null;
         ColorSpace colorSpace = null;
 
-        String[] split = statement.split("-");
-        if (split.length > 1) {
-            if (split[1].equalsIgnoreCase("LINEAR")) {
-                colorSpace = ColorSpace.Linear;
-            }
-            statement = split[0].trim();
-        }
-
-        split = statement.split(":");
+        String[] split = statement.split(":");
 
         // Parse default val
         if (split.length == 1) {
@@ -250,6 +242,10 @@ public class J3MLoader implements AssetLoader {
             statement = split[0].trim();
             defaultVal = split[1].trim();
         }
+        if (statement.endsWith("-LINEAR")) {
+            colorSpace = ColorSpace.Linear;
+            statement = statement.substring(0, statement.length() - "-LINEAR".length());
+        }
 
         // Parse ffbinding
         int startParen = statement.indexOf("(");