spatial: fix bug in remove/clear MPO

shadowislord · shadowislord · commit 5d2f2b19e611 · 2016-04-02T15:08:31.000-04:00
add unit test for those methods
diff --git a/jme3-core/src/main/java/com/jme3/scene/Spatial.java b/jme3-core/src/main/java/com/jme3/scene/Spatial.java
@@ -608,16 +608,16 @@ public void addMatParamOverride(MatParamOverride override) {
     }
 
     public void removeMatParamOverride(MatParamOverride override) {
-        if (worldOverrides.remove(override)) {
+        if (localOverrides.remove(override)) {
             setMatParamOverrideRefresh();
         }
     }
 
     public void clearMatParamOverrides() {
-        if (!worldOverrides.isEmpty()) {
+        if (!localOverrides.isEmpty()) {
             setMatParamOverrideRefresh();
         }
-        worldOverrides.clear();
+        localOverrides.clear();
     }
 
     /**
diff --git a/jme3-core/src/test/java/com/jme3/material/TechniqueDefMatParamOverrideTest.java b/jme3-core/src/test/java/com/jme3/material/TechniqueDefMatParamOverrideTest.java
@@ -196,6 +196,7 @@ public void testRemove() {
 
         reset();
         geometry.clearMatParamOverrides();
+        geometry.updateGeometricState();
         outDefines(def("NUM_BONES", VarType.Int, 1234));
         outUniforms(uniform("NumberOfBones", VarType.Int, 1234));
 
@@ -245,6 +246,7 @@ public void testRemoveMpoOnly() {
 
         reset();
         geometry.clearMatParamOverrides();
+        geometry.updateGeometricState();
         outDefines();
         outUniforms();
     }
@@ -287,6 +289,7 @@ public void testRemoveTexture() {
 
         reset();
         geometry.clearMatParamOverrides();
+        geometry.updateGeometricState();
         outDefines();
         outUniforms();
         outTextures();
@@ -312,6 +315,7 @@ public void testRemoveTextureOverride() {
 
         reset();
         geometry.clearMatParamOverrides();
+        geometry.updateGeometricState();
         outDefines(def("DIFFUSEMAP", VarType.Texture2D, tex1));
         outUniforms(uniform("DiffuseMap", VarType.Int, 0));
         outTextures(tex1);
diff --git a/jme3-core/src/test/java/com/jme3/scene/SceneMatParamOverrideTest.java b/jme3-core/src/test/java/com/jme3/scene/SceneMatParamOverrideTest.java
@@ -78,6 +78,75 @@ private static Node createDummyScene() {
         return scene;
     }
 
+    @Test
+    public void testOverrides_Empty() {
+        Node n = new Node("Node");
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+
+        n.updateGeometricState();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+    }
+
+    @Test
+    public void testOverrides_AddRemove() {
+        MatParamOverride override = mpoBool("Test", true);
+        Node n = new Node("Node");
+
+        n.removeMatParamOverride(override);
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+
+        n.addMatParamOverride(override);
+
+        assertSame(n.getLocalOverrides().get(0), override);
+        assertTrue(n.getWorldOverrides().isEmpty());
+        n.updateGeometricState();
+
+        assertSame(n.getLocalOverrides().get(0), override);
+        assertSame(n.getWorldOverrides().get(0), override);
+
+        n.removeMatParamOverride(override);
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertSame(n.getWorldOverrides().get(0), override);
+
+        n.updateGeometricState();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+    }
+
+    @Test
+    public void testOverrides_Clear() {
+        MatParamOverride override = mpoBool("Test", true);
+        Node n = new Node("Node");
+
+        n.clearMatParamOverrides();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+
+        n.addMatParamOverride(override);
+        n.clearMatParamOverrides();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+
+        n.addMatParamOverride(override);
+        n.updateGeometricState();
+        n.clearMatParamOverrides();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertSame(n.getWorldOverrides().get(0), override);
+
+        n.updateGeometricState();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+
+        n.addMatParamOverride(override);
+        n.clearMatParamOverrides();
+        n.updateGeometricState();
+        assertTrue(n.getLocalOverrides().isEmpty());
+        assertTrue(n.getWorldOverrides().isEmpty());
+    }
+
     @Test
     public void testOverrides_AddAfterAttach() {
         Node scene = createDummyScene();

Original file line number	Diff line number	Diff line change
`@@ -608,16 +608,16 @@ public void addMatParamOverride(MatParamOverride override) {`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`public void removeMatParamOverride(MatParamOverride override) {`
`611`		`- if (worldOverrides.remove(override)) {`
	`611`	`+ if (localOverrides.remove(override)) {`
`612`	`612`	`setMatParamOverrideRefresh();`
`613`	`613`	`}`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`public void clearMatParamOverrides() {`
`617`		`- if (!worldOverrides.isEmpty()) {`
	`617`	`+ if (!localOverrides.isEmpty()) {`
`618`	`618`	`setMatParamOverrideRefresh();`
`619`	`619`	`}`
`620`		`- worldOverrides.clear();`
	`620`	`+ localOverrides.clear();`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`/**`