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

j3md Fix for default textures (#1052)

Browse Source
This commit is contained in:
Riccardo Balbo 2019-03-27 18:19:37 +01:00 committed by Stephen Gold
parent 67b32790ee
commit 37ee57e845
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-core/src/main/java/com/jme3/material/MaterialDef.java
View File

@ -38,6 +38,7 @@ import com.jme3.texture.image.ColorSpace;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.jme3.texture.Texture;
/** /**
* Describes a J3MD (Material definition). * Describes a J3MD (Material definition).
@ -129,10 +130,11 @@ public class MaterialDef{
* @param type Type of the parameter * @param type Type of the parameter
* @param name Name of the parameter * @param name Name of the parameter
* @param colorSpace the color space of the texture required by this texture param * @param colorSpace the color space of the texture required by this texture param
* @param value Default value of the parameter
* @see ColorSpace * @see ColorSpace
*/ */
public void addMaterialParamTexture(VarType type, String name, ColorSpace colorSpace) { public void addMaterialParamTexture(VarType type, String name, ColorSpace colorSpace,Texture value) {
matParams.put(name, new MatParamTexture(type, name, null, colorSpace)); matParams.put(name, new MatParamTexture(type, name, value, colorSpace));
} }
/** /**

3
jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
View File

@ -298,7 +298,6 @@ public class J3MLoader implements AssetLoader {
textureOptionValue.applyToTexture(texture); textureOptionValue.applyToTexture(texture);
} }
} }
return texture; return texture;
} }
@ -404,7 +403,7 @@ public class J3MLoader implements AssetLoader {
defaultValObj = readValue(type, defaultVal); defaultValObj = readValue(type, defaultVal);
} }
if(type.isTextureType()){ if(type.isTextureType()){
materialDef.addMaterialParamTexture(type, name, colorSpace); materialDef.addMaterialParamTexture(type, name, colorSpace,(Texture)defaultValObj);
}else{ }else{
materialDef.addMaterialParam(type, name, defaultValObj); materialDef.addMaterialParam(type, name, defaultValObj);
} }