j3md Fix for default textures (#1052)

jMonkeyEngine · Jul 10, 2019 · 37ee57e · 37ee57e
1 parent 67b3279
commit 37ee57e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/jme3-core/src/main/java/com/jme3/material/MaterialDef.java b/jme3-core/src/main/java/com/jme3/material/MaterialDef.java
@@ -38,6 +38,7 @@
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import com.jme3.texture.Texture;
 
 /**
  * Describes a J3MD (Material definition).
@@ -129,10 +130,11 @@ public void addMaterialParam(VarType type, String name, Object value) {
      * @param type Type of the parameter
      * @param name Name of the parameter
      * @param colorSpace the color space of the texture required by this texture param
+     * @param value Default value of the parameter
      * @see ColorSpace
      */
-    public void addMaterialParamTexture(VarType type, String name, ColorSpace colorSpace) {
-        matParams.put(name, new MatParamTexture(type, name, null, colorSpace));
+    public void addMaterialParamTexture(VarType type, String name, ColorSpace colorSpace,Texture value) {
+        matParams.put(name, new MatParamTexture(type, name, value, colorSpace));
     }
 
     /**

diff --git a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
@@ -297,8 +297,7 @@ private Texture parseTextureType(final VarType type, final String value) {
             for (final TextureOptionValue textureOptionValue : textureOptionValues) {
                 textureOptionValue.applyToTexture(texture);
             }
-        }
-
+        }        
         return texture;
     }
 
@@ -404,7 +403,7 @@ private void readParam(String statement) throws IOException{
             defaultValObj = readValue(type, defaultVal);
         }
         if(type.isTextureType()){
-            materialDef.addMaterialParamTexture(type, name, colorSpace);
+            materialDef.addMaterialParamTexture(type, name, colorSpace,(Texture)defaultValObj);
         }else{
             materialDef.addMaterialParam(type, name, defaultValObj);
         }