MPO: add ability to disable an override

shadowislord · shadowislord · commit 50658b8e539e · 2016-04-02T15:08:40.000-04:00
diff --git a/jme3-core/src/main/java/com/jme3/material/MatParamOverride.java b/jme3-core/src/main/java/com/jme3/material/MatParamOverride.java
@@ -35,6 +35,8 @@
 
 public final class MatParamOverride extends MatParam {
 
+    private boolean enabled = true;
+
     public MatParamOverride() {
         super();
     }
@@ -43,4 +45,36 @@ public MatParamOverride(VarType type, String name, Object value) {
         super(type, name, value);
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && this.enabled == ((MatParamOverride) obj).enabled;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = super.hashCode();
+        hash = 59 * hash + (enabled ? 1 : 0);
+        return hash;
+    }
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public void write(JmeExporter ex) throws IOException {
+        super.write(ex);
+        OutputCapsule oc = ex.getCapsule(this);
+        oc.write(enabled, "enabled", true);
+    }
+
+    @Override
+    public void read(JmeImporter im) throws IOException {
+        super.read(im);
+        InputCapsule ic = im.getCapsule(this);
+        enabled = ic.readBoolean("enabled", true);
+    }
 }
diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java
@@ -792,7 +792,7 @@ private void updateShaderMaterialParameters(Renderer renderer, Shader shader, Ar
             VarType type = override.getVarType();
 
             MatParam paramDef = def.getMaterialParam(override.getName());
-            if (paramDef == null || paramDef.getVarType() != type) {
+            if (paramDef == null || paramDef.getVarType() != type || !override.isEnabled()) {
                 continue;
             }
 
diff --git a/jme3-core/src/main/java/com/jme3/material/Technique.java b/jme3-core/src/main/java/com/jme3/material/Technique.java
@@ -128,6 +128,9 @@ Shader makeCurrent(RenderManager renderManager, ArrayList<MatParamOverride> over
         dynamicDefines.setAll(paramDefines);
 
         for (MatParamOverride override : overrides) {
+            if (!override.isEnabled()) {
+                continue;
+            }
             Integer defineId = def.getShaderParamDefineId(override.name);
             if (defineId != null) {
                 if (def.getDefineIdType(defineId) == override.type) {
diff --git a/jme3-core/src/test/java/com/jme3/material/MaterialMatParamOverrideTest.java b/jme3-core/src/test/java/com/jme3/material/MaterialMatParamOverrideTest.java
@@ -55,7 +55,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class TechniqueDefMatParamOverrideTest {
+public class MaterialMatParamOverrideTest {
 
     private static final HashSet<String> IGNORED_UNIFORMS = new HashSet<String>(
             Arrays.asList(new String[]{"m_ParallaxHeight", "m_Shininess"}));
@@ -119,6 +119,27 @@ public void testFloatOverride() {
         outUniforms(uniform("AlphaDiscardThreshold", VarType.Float, 2.79f));
     }
 
+    @Test
+    public void testMpoDisable() {
+        material("Common/MatDefs/Light/Lighting.j3md");
+        inputMp(mpoFloat("AlphaDiscardThreshold", 3.12f));
+
+        MatParamOverride override = mpoFloat("AlphaDiscardThreshold", 2.79f);
+        inputMpo(override);
+        outDefines(def("DISCARD_ALPHA", VarType.Float, 2.79f));
+        outUniforms(uniform("AlphaDiscardThreshold", VarType.Float, 2.79f));
+
+        reset();
+        override.setEnabled(false);
+        outDefines(def("DISCARD_ALPHA", VarType.Float, 3.12f));
+        outUniforms(uniform("AlphaDiscardThreshold", VarType.Float, 3.12f));
+
+        reset();
+        override.setEnabled(true);
+        outDefines(def("DISCARD_ALPHA", VarType.Float, 2.79f));
+        outUniforms(uniform("AlphaDiscardThreshold", VarType.Float, 2.79f));
+    }
+
     @Test
     public void testIntMpoOnly() {
         material("Common/MatDefs/Light/Lighting.j3md");
@@ -349,13 +370,13 @@ public boolean equals(Object obj) {
     private final NullRenderer renderer = new NullRenderer() {
         @Override
         public void setShader(Shader shader) {
-            TechniqueDefMatParamOverrideTest.this.usedShader = shader;
+            MaterialMatParamOverrideTest.this.usedShader = shader;
             evaluated = true;
         }
 
         @Override
         public void setTexture(int unit, Texture texture) {
-            TechniqueDefMatParamOverrideTest.this.usedTextures[unit] = texture;
+            MaterialMatParamOverrideTest.this.usedTextures[unit] = texture;
         }
     };
     private final RenderManager renderManager = new RenderManager(renderer);

Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ private void updateShaderMaterialParameters(Renderer renderer, Shader shader, Ar`
`792`	`792`	`VarType type = override.getVarType();`
`793`	`793`
`794`	`794`	`MatParam paramDef = def.getMaterialParam(override.getName());`
`795`		`- if (paramDef == null \|\| paramDef.getVarType() != type) {`
	`795`	`+ if (paramDef == null \|\| paramDef.getVarType() != type \|\| !override.isEnabled()) {`
`796`	`796`	`continue;`
`797`	`797`	`}`
`798`	`798`