syntax error fixes

shadowislord · shadowislord · commit 80af02e1f34c · 2016-04-02T15:04:21.000-04:00
diff --git a/jme3-core/src/main/java/com/jme3/material/DefaultTechniqueDefLogic.java b/jme3-core/src/main/java/com/jme3/material/DefaultTechniqueDefLogic.java
@@ -56,7 +56,7 @@ public DefaultTechniqueDefLogic(TechniqueDef techniqueDef) {
 
     @Override
     public Shader makeCurrent(AssetManager assetManager, RenderManager renderManager,
-            EnumSet<Caps> rendererCaps, DefineList defines) {
+            EnumSet<Caps> rendererCaps, LightList lights, DefineList defines) {
         return techniqueDef.getShader(assetManager, rendererCaps, defines);
     }
 
diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java
@@ -834,7 +834,7 @@ public void preload(RenderManager renderManager) {
             return;
         }
 
-        Shader shader = technique.makeCurrent(renderManager, rendererCaps);
+        Shader shader = technique.makeCurrent(renderManager, null, rendererCaps);
         updateShaderMaterialParameters(renderer, shader);
         renderManager.getRenderer().setShader(shader);
     }
@@ -939,7 +939,7 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana
         updateRenderState(renderManager, renderer, techniqueDef);
 
         // Select shader to use
-        Shader shader = technique.makeCurrent(renderManager, rendererCaps);
+        Shader shader = technique.makeCurrent(renderManager, lights, rendererCaps);
         
         // Begin tracking which uniforms were changed by material.
         clearUniformsSetByCurrent(shader);
diff --git a/jme3-core/src/main/java/com/jme3/material/SinglePassLightingLogic.java b/jme3-core/src/main/java/com/jme3/material/SinglePassLightingLogic.java
@@ -76,10 +76,10 @@ public SinglePassLightingLogic(TechniqueDef techniqueDef) {
 
     @Override
     public Shader makeCurrent(AssetManager assetManager, RenderManager renderManager,
-            EnumSet<Caps> rendererCaps, DefineList defines) {
+            EnumSet<Caps> rendererCaps, LightList lights, DefineList defines) {
         defines.set(nbLightsDefineId, renderManager.getSinglePassLightBatchSize() * 3);
         defines.set(singlePassLightingDefineId, true);
-        return super.makeCurrent(assetManager, renderManager, rendererCaps, defines);
+        return super.makeCurrent(assetManager, renderManager, rendererCaps, lights, defines);
     }
 
     /**
diff --git a/jme3-core/src/main/java/com/jme3/material/Technique.java b/jme3-core/src/main/java/com/jme3/material/Technique.java
@@ -131,10 +131,10 @@ void notifyTechniqueSwitched() {
      * @param rendererCaps The renderer capabilities which the shader should support.
      * @return A compatible shader.
      */
-    Shader makeCurrent(RenderManager renderManager, EnumSet<Caps> rendererCaps) {
+    Shader makeCurrent(RenderManager renderManager, LightList lights, EnumSet<Caps> rendererCaps) {
         TechniqueDefLogic logic = def.getLogic();
         AssetManager assetManager = owner.getMaterialDef().getAssetManager();
-        return logic.makeCurrent(assetManager, renderManager, rendererCaps, dynamicDefines);
+        return logic.makeCurrent(assetManager, renderManager, rendererCaps, lights, dynamicDefines);
     }
     
     /**
diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDefLogic.java b/jme3-core/src/main/java/com/jme3/material/TechniqueDefLogic.java
@@ -66,14 +66,16 @@ public interface TechniqueDefLogic {
      * @param renderManager The render manager for which rendering is to be performed.
      * @param rendererCaps Renderer capabilities. The returned shader must
      * support these capabilities.
+     * @param lights The lights with which the geometry shall be rendered. This
+     * list must not include culled lights.
      * @param defines The define list used by the technique, any 
      * {@link TechniqueDef#addShaderUnmappedDefine(java.lang.String) unmapped defines}
      * should be set here to change shader behavior.
      * 
      * @return The shader to use for rendering.
      */
     public Shader makeCurrent(AssetManager assetManager, RenderManager renderManager, 
-                              EnumSet<Caps> rendererCaps, DefineList defines);
+            EnumSet<Caps> rendererCaps, LightList lights, DefineList defines);
     
     /**
      * Requests that the <code>TechniqueDefLogic</code> renders the given geometry.
diff --git a/jme3-core/src/main/java/com/jme3/renderer/RenderManager.java b/jme3-core/src/main/java/com/jme3/renderer/RenderManager.java
@@ -49,7 +49,7 @@
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.*;
-import com.jme3.shader.Uniform;
+import com.jme3.shader.Shader;
 import com.jme3.shader.UniformBinding;
 import com.jme3.shader.UniformBindingManager;
 import com.jme3.system.NullRenderer;
@@ -483,8 +483,8 @@ public void setWorldMatrix(Matrix4f mat) {
      * Updates the given list of uniforms with {@link UniformBinding uniform bindings}
      * based on the current world state.
      */
-    public void updateUniformBindings(List<Uniform> params) {
-        uniformBindingManager.updateUniformBindings(params);
+    public void updateUniformBindings(Shader shader) {
+        uniformBindingManager.updateUniformBindings(shader);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public DefaultTechniqueDefLogic(TechniqueDef techniqueDef) {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`public Shader makeCurrent(AssetManager assetManager, RenderManager renderManager,`
`59`		`- EnumSet<Caps> rendererCaps, DefineList defines) {`
	`59`	`+ EnumSet<Caps> rendererCaps, LightList lights, DefineList defines) {`
`60`	`60`	`return techniqueDef.getShader(assetManager, rendererCaps, defines);`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ public void preload(RenderManager renderManager) {`
`834`	`834`	`return;`
`835`	`835`	`}`
`836`	`836`
`837`		`- Shader shader = technique.makeCurrent(renderManager, rendererCaps);`
	`837`	`+ Shader shader = technique.makeCurrent(renderManager, null, rendererCaps);`
`838`	`838`	`updateShaderMaterialParameters(renderer, shader);`
`839`	`839`	`renderManager.getRenderer().setShader(shader);`
`840`	`840`	`}`
`@@ -939,7 +939,7 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana`
`939`	`939`	`updateRenderState(renderManager, renderer, techniqueDef);`
`940`	`940`
`941`	`941`	`// Select shader to use`
`942`		`- Shader shader = technique.makeCurrent(renderManager, rendererCaps);`
	`942`	`+ Shader shader = technique.makeCurrent(renderManager, lights, rendererCaps);`
`943`	`943`
`944`	`944`	`// Begin tracking which uniforms were changed by material.`
`945`	`945`	`clearUniformsSetByCurrent(shader);`