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

* Material.setParam() now calls setTextureParam() instead of messing up internal state if the type is a texture

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10209 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..RD 2013-01-27 23:05:08 +00:00
parent 9eb9463261
commit 84183ad154
1 changed files with 13 additions and 9 deletions

22
engine/src/core/com/jme3/material/Material.java

@ -459,16 +459,20 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
public void setParam(String name, VarType type, Object value) {
checkSetParam(type, name);
MatParam val = getParam(name);
if (val == null) {
MatParam paramDef = def.getMaterialParam(name);
paramValues.put(name, new MatParam(type, name, value, paramDef.getFixedFuncBinding()));
if (type.isTextureType()) {
setTextureParam(name, type, (Texture)value);
} else {
val.setValue(value);
}
if (technique != null) {
technique.notifyParamChanged(name, type, value);
MatParam val = getParam(name);
if (val == null) {
MatParam paramDef = def.getMaterialParam(name);
paramValues.put(name, new MatParam(type, name, value, paramDef.getFixedFuncBinding()));
} else {
val.setValue(value);
}
if (technique != null) {
technique.notifyParamChanged(name, type, value);
}
}
}