Got rid of the sorting for Technique selection

Nehon · Nehon · commit f2709858bbdc · 2017-01-14T18:53:18.000+01:00
diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java
@@ -711,19 +711,22 @@ public void selectTechnique(String name, final RenderManager renderManager) {
         // supports all the caps.
         if (tech == null) {
             EnumSet<Caps> rendererCaps = renderManager.getRenderer().getCaps();
-            List<TechniqueDef> techDefs = def.getSortedTechniqueDefs(name, renderManager);
+            List<TechniqueDef> techDefs = def.getTechniqueDefs(name);
             if (techDefs == null || techDefs.isEmpty()) {
                 throw new IllegalArgumentException(
                         String.format("The requested technique %s is not available on material %s", name, def.getName()));
             }
 
             TechniqueDef lastTech = null;
+            float weight = 0;
             for (TechniqueDef techDef : techDefs) {
                 if (rendererCaps.containsAll(techDef.getRequiredCaps())) {
-                    // use the first one that supports all the caps
-                    tech = new Technique(this, techDef);
-                    techniques.put(name, tech);
-                    break;
+                    float techWeight = techDef.getWeight() + (techDef.getLightMode() == renderManager.getPreferredLightMode() ? 10f : 0);
+                    if (techWeight > weight) {
+                        tech = new Technique(this, techDef);
+                        techniques.put(name, tech);
+                        weight = techWeight;
+                    }
                 }
                 lastTech = techDef;
             }
@@ -734,6 +737,7 @@ public void selectTechnique(String name, final RenderManager renderManager) {
                                 + "The capabilities %s are required.",
                                 name, def.getName(), lastTech.getRequiredCaps()));
             }
+            logger.log(Level.FINE, this.getMaterialDef().getName() + " selected technique def " + tech.getDef());
         } else if (technique == tech) {
             // attempting to switch to an already
             // active technique.
diff --git a/jme3-core/src/main/java/com/jme3/material/MaterialDef.java b/jme3-core/src/main/java/com/jme3/material/MaterialDef.java
@@ -55,7 +55,6 @@ public class MaterialDef{
 
     private Map<String, List<TechniqueDef>> techniques;
     private Map<String, MatParam> matParams;
-    private TechDefComparator comparator = new TechDefComparator();
 
     /**
      * Serialization only. Do not use.
@@ -188,17 +187,6 @@ public List<TechniqueDef> getTechniqueDefs(String name) {
         return techniques.get(name);
     }
 
-    public List<TechniqueDef> getSortedTechniqueDefs(String name, RenderManager rm) {
-        List<TechniqueDef> techDefs = getTechniqueDefs(name);
-        if (techDefs == null) {
-            return null;
-        }
-        //Sorting the techdef depending on their weight (depending on their glsl version) and on the preferred light mode)
-        comparator.rm = rm;
-        Collections.sort(techDefs, comparator);
-        return techDefs;
-    }
-
     /**
      *
      * @return the list of all the technique definitions names.
@@ -207,17 +195,4 @@ public Collection<String> getTechniqueDefsNames(){
         return techniques.keySet();
     }
 
-    public static class TechDefComparator implements Comparator<TechniqueDef> {
-
-        RenderManager rm;
-
-        @Override
-        public int compare(TechniqueDef o1, TechniqueDef o2) {
-            float o1Weight = o1.getWeight() + (o1.getLightMode() == rm.getPreferredLightMode() ? 10f : 0);
-            float o2Weight = o2.getWeight() + (o2.getLightMode() == rm.getPreferredLightMode() ? 10f : 0);
-            return (int) Math.signum(o2Weight - o1Weight);
-        }
-    }
-
-
 }
diff --git a/jme3-core/src/test/java/com/jme3/material/TestTechniqueDefOrdering.java b/jme3-core/src/test/java/com/jme3/material/TestTechniqueDefOrdering.java
