From 3d6656463e9cceed37cc76b4b8193740ee7450bf Mon Sep 17 00:00:00 2001
From: Hannes Nevalainen <kwando@merciless.me>
Date: Mon, 1 Sep 2014 22:20:16 +0200
Subject: [PATCH] Move update logic into DefineList.

---
 .../java/com/jme3/material/Technique.java     | 16 +------------
 .../main/java/com/jme3/shader/DefineList.java | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/jme3-core/src/main/java/com/jme3/material/Technique.java b/jme3-core/src/main/java/com/jme3/material/Technique.java
index fb5ee4b69..b99cbc3bb 100644
--- a/jme3-core/src/main/java/com/jme3/material/Technique.java
+++ b/jme3-core/src/main/java/com/jme3/material/Technique.java
@@ -179,21 +179,7 @@ public class Technique /* implements Savable */ {
         }
         
         if (techniqueSwitched) {
-            // If the technique was switched, check if the define list changed
-            // based on material parameters.
-            
-            ListMap params = owner.getParamsMap();
-            
-            if (!defines.equalsParams(params, def)) {
-                // Defines were changed, update define list
-                defines.clear();
-                for(int i=0;i<params.size();i++) {
-                    MatParam param = (MatParam)params.getValue(i);
-                    String defineName = def.getShaderParamDefine(param.getName());
-                    if (defineName != null) {
-                        defines.set(defineName, param.getVarType(), param.getValue());
-                    }
-                }
+            if (defines.update(owner.getParamsMap(), def)) {
                 needReload = true;
             }
         }
diff --git a/jme3-core/src/main/java/com/jme3/shader/DefineList.java b/jme3-core/src/main/java/com/jme3/shader/DefineList.java
index 144cbb088..93d4cbeaf 100644
--- a/jme3-core/src/main/java/com/jme3/shader/DefineList.java
+++ b/jme3-core/src/main/java/com/jme3/shader/DefineList.java
@@ -182,7 +182,29 @@ public class DefineList implements Savable, Cloneable {
         return defines.equals(other.defines);
     }
     
-    public boolean equalsParams(ListMap params, TechniqueDef def) {
+    /**
+     * Update defines if the define list changed based on material parameters.
+     * @param params
+     * @param def
+     * @return true if defines was updated
+     */
+    public boolean update(ListMap params, TechniqueDef def){
+        if(equalsParams(params, def)){
+            return false;
+        }
+         // Defines were changed, update define list
+        clear();
+        for(int i=0;i<params.size();i++) {
+            MatParam param = (MatParam)params.getValue(i);
+            String defineName = def.getShaderParamDefine(param.getName());
+            if (defineName != null) {
+                set(defineName, param.getVarType(), param.getValue());
+            }
+        }
+        return true;
+    }
+    
+    private boolean equalsParams(ListMap params, TechniqueDef def) {
         
         int size = 0;