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

fix Uniform issue related to material changes

Browse Source
This commit is contained in:
Kirill Vainer 2016-04-20 16:41:01 -04:00
parent e71cf81b96
commit 3353aea546
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jme3-core/src/main/java/com/jme3/shader/Uniform.java
View File

@ -39,7 +39,7 @@ import java.nio.IntBuffer;
public class Uniform extends ShaderVariable { public class Uniform extends ShaderVariable {
private static final Integer ZERO_INT = Integer.valueOf(0); private static final Integer ZERO_INT = 0;
private static final Float ZERO_FLT = Float.valueOf(0); private static final Float ZERO_FLT = Float.valueOf(0);
private static final FloatBuffer ZERO_BUF = BufferUtils.createFloatBuffer(4*4); private static final FloatBuffer ZERO_BUF = BufferUtils.createFloatBuffer(4*4);
@ -171,13 +171,25 @@ public class Uniform extends ShaderVariable {
this.value = ZERO_FLT; this.value = ZERO_FLT;
break; break;
case Vector2: case Vector2:
this.value = Vector2f.ZERO; if (this.value != null) {
((Vector2f) this.value).set(Vector2f.ZERO);
}
break; break;
case Vector3: case Vector3:
this.value = Vector3f.ZERO; if (this.value != null) {
((Vector3f) this.value).set(Vector3f.ZERO);
}
break; break;
case Vector4: case Vector4:
this.value = Vector4f.ZERO; if (this.value != null) {
if (this.value instanceof ColorRGBA) {
((ColorRGBA) this.value).set(ColorRGBA.BlackNoAlpha);
} else if (this.value instanceof Vector4f) {
((Vector4f) this.value).set(Vector4f.ZERO);
} else {
((Quaternion) this.value).set(Quaternion.ZERO);
}
}
break; break;
default: default:
// won't happen because those are either textures // won't happen because those are either textures
@ -312,6 +324,26 @@ public class Uniform extends ShaderVariable {
} }
multiData.clear(); multiData.clear();
break; break;
case Vector2:
if (value.equals(this.value)) {
return;
}
if (this.value == null) {
this.value = new Vector2f((Vector2f) value);
} else {
((Vector2f) this.value).set((Vector2f) value);
}
break;
case Vector3:
if (value.equals(this.value)) {
return;
}
if (this.value == null) {
this.value = new Vector3f((Vector3f) value);
} else {
((Vector3f) this.value).set((Vector3f) value);
}
break;
case Vector4: case Vector4:
if (value.equals(this.value)) { if (value.equals(this.value)) {
return; return;