In-pass shadows (WIP)

jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java

@@ -561,4 +561,9 @@ public Object glFenceSync(int condition, int flags) {
     public void glBlendEquationSeparate(int colorMode, int alphaMode) {
         GLES20.glBlendEquationSeparate(colorMode, alphaMode);
     }
+
+    @Override
+    public void glFramebufferTextureLayerEXT(int target, int attachment, int texture, int level, int layer) {
+        throw new UnsupportedOperationException("OpenGL ES 2 does not support texture arrays");
+    }
 }

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

@@ -53,9 +53,11 @@
 import com.jme3.input.dummy.DummyMouseInput;
 import com.jme3.renderer.android.AndroidGL;
 import com.jme3.renderer.opengl.GL;
+import com.jme3.renderer.opengl.GLDebugES;
 import com.jme3.renderer.opengl.GLExt;
 import com.jme3.renderer.opengl.GLFbo;
 import com.jme3.renderer.opengl.GLRenderer;
+import com.jme3.renderer.opengl.GLTracer;
 import com.jme3.system.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
@@ -195,8 +197,12 @@ public void uncaughtException(Thread thread, Throwable thrown) {
 
         timer = new NanoTimer();
         Object gl = new AndroidGL();
-        // gl = GLTracer.createGlesTracer((GL)gl, (GLExt)gl);
-        // gl = new GLDebugES((GL)gl, (GLExt)gl);
+        if (settings.getBoolean("GraphicsDebug")) {
+            gl = new GLDebugES((GL) gl, (GLExt) gl, (GLFbo) gl);
+        }
+        if (settings.getBoolean("GraphicsTrace")) {
+            gl = GLTracer.createGlesTracer(gl, GL.class, GLFbo.class, GLExt.class);
+        }
         renderer = new GLRenderer((GL)gl, (GLExt)gl, (GLFbo)gl);
         renderer.initialize();
 

jme3-core/src/main/java/com/jme3/light/DefaultLightFilter.java

@@ -42,7 +42,7 @@
 public final class DefaultLightFilter implements LightFilter {
 
     private Camera camera;
-    private final HashSet<Light> processedLights = new HashSet<Light>();
+    private final HashSet<Light> processedLights = new HashSet<>();
     private final LightProbeBlendingStrategy probeBlendStrat;
 
     public DefaultLightFilter() {
@@ -59,6 +59,7 @@ public void setCamera(Camera camera) {
         for (Light light : processedLights) {
             light.frustumCheckNeeded = true;
         }
+        processedLights.clear();
     }
 
     @Override

jme3-core/src/main/java/com/jme3/light/Light.java

@@ -37,6 +37,7 @@
 import com.jme3.math.ColorRGBA;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.Spatial;
+import com.jme3.shadow.next.ShadowMap;
 import com.jme3.util.TempVars;
 import java.io.IOException;
 
@@ -120,6 +121,8 @@ public int getId(){
     boolean frustumCheckNeeded = true;
     boolean intersectsFrustum  = false;
 
+    protected ShadowMap shadowMap;
+
     protected Light() {
     }
 
@@ -163,6 +166,22 @@ public float getLastDistance(){
         return lastDistance;
     }
     */
+
+    /**
+     * @return the light's shadow map, or null if none was assigned.
+     */
+    public ShadowMap getShadowMap() {
+        return shadowMap;
+    }
+
+    /**
+     * Used internally to associate the light with a shadow map
+     * 
+     * @param shadowMap the light's shadow map
+     */
+    public void setShadowMap(ShadowMap shadowMap) {
+        this.shadowMap = shadowMap;
+    }
 
     /**
      * Sets the light color.

jme3-core/src/main/java/com/jme3/material/Material.java

@@ -81,9 +81,9 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
     private AssetKey key;
     private String name;
     private MaterialDef def;
-    private ListMap<String, MatParam> paramValues = new ListMap<String, MatParam>();
+    private ListMap<String, MatParam> paramValues = new ListMap<>();
     private Technique technique;
-    private HashMap<String, Technique> techniques = new HashMap<String, Technique>();
+    private HashMap<String, Technique> techniques = new HashMap<>();
     private RenderState additionalState = null;
     private RenderState mergedRenderState = new RenderState();
     private boolean transparent = false;
@@ -143,10 +143,12 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public void setKey(AssetKey key) {
         this.key = key;
     }
 
+    @Override
     public AssetKey getKey() {
         return key;
     }
@@ -200,9 +202,9 @@ public Material clone() {
                 mat.additionalState = additionalState.clone();
             }
             mat.technique = null;
-            mat.techniques = new HashMap<String, Technique>();
+            mat.techniques = new HashMap<>();
 
-            mat.paramValues = new ListMap<String, MatParam>();
+            mat.paramValues = new ListMap<>();
             for (int i = 0; i < paramValues.size(); i++) {
                 Map.Entry<String, MatParam> entry = paramValues.getEntry(i);
                 mat.paramValues.put(entry.getKey(), entry.getValue().clone());
@@ -817,7 +819,14 @@ private int updateShaderMaterialParameters(Renderer renderer, Shader shader,
 
     private void updateRenderState(RenderManager renderManager, Renderer renderer, TechniqueDef techniqueDef) {
         if (renderManager.getForcedRenderState() != null) {
-            renderer.applyRenderState(renderManager.getForcedRenderState());
+            if (techniqueDef.getForcedRenderState() != null) {
+                renderer.applyRenderState(
+                        techniqueDef.getForcedRenderState().copyMergedTo(
+                                renderManager.getForcedRenderState(),
+                                mergedRenderState));
+            } else {
+                renderer.applyRenderState(renderManager.getForcedRenderState());
+            }
         } else {
             if (techniqueDef.getRenderState() != null) {
                 renderer.applyRenderState(techniqueDef.getRenderState().copyMergedTo(additionalState, mergedRenderState));
@@ -933,10 +942,9 @@ private void resetUniformsNotSetByCurrent(Shader shader) {
      * </ul>
      *
      * @param geometry The geometry to render
-     * @param lights Presorted and filtered light list to use for rendering
      * @param renderManager The render manager requesting the rendering
      */
-    public void render(Geometry geometry, LightList lights, RenderManager renderManager) {
+    public void render(Geometry geometry, RenderManager renderManager) {
         if (technique == null) {
             selectTechnique(TechniqueDef.DEFAULT_TECHNIQUE_NAME, renderManager);
         }
@@ -956,7 +964,7 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana
         SafeArrayList<MatParamOverride> overrides = geometry.getWorldMatParamOverrides();
 
         // Select shader to use
-        Shader shader = technique.makeCurrent(renderManager, overrides, renderManager.getForcedMatParams(), lights, rendererCaps);
+        Shader shader = technique.makeCurrent(renderManager, geometry, overrides, renderManager.getForcedMatParams(), rendererCaps);
 
         // Begin tracking which uniforms were changed by material.
         clearUniformsSetByCurrent(shader);
@@ -965,29 +973,24 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana
         renderManager.updateUniformBindings(shader);
 
         // Set material parameters
-        int unit = updateShaderMaterialParameters(renderer, shader, overrides, renderManager.getForcedMatParams());
+        int nextTextureUnit = updateShaderMaterialParameters(renderer, shader, overrides, renderManager.getForcedMatParams());
 
         // Clear any uniforms not changed by material.
         resetUniformsNotSetByCurrent(shader);
 
         // Delegate rendering to the technique
-        technique.render(renderManager, shader, geometry, lights, unit);
+        technique.render(renderManager, shader, geometry, nextTextureUnit);
     }
 
-    /**
-     * Called by {@link RenderManager} to render the geometry by
-     * using this material.
-     *
-     * Note that this version of the render method
-     * does not perform light filtering.
-     *
-     * @param geom The geometry to render
-     * @param rm The render manager requesting the rendering
-     */
-    public void render(Geometry geom, RenderManager rm) {
-        render(geom, geom.getWorldLightList(), rm);
+    @Override
+    public String toString() {
+        return "Material[name=" + name + 
+                ", def=" + (def != null ? def.getName() : null) + 
+                ", tech=" + (technique != null && technique.getDef() != null ? technique.getDef().getName() : null) + 
+                "]";
     }
-
+
+    @Override
     public void write(JmeExporter ex) throws IOException {
         OutputCapsule oc = ex.getCapsule(this);
         oc.write(def.getAssetName(), "material_def", null);
@@ -998,13 +1001,6 @@ public void write(JmeExporter ex) throws IOException {
     }
 
     @Override
-    public String toString() {
-        return "Material[name=" + name + 
-                ", def=" + (def != null ? def.getName() : null) + 
-                ", tech=" + (technique != null && technique.getDef() != null ? technique.getDef().getName() : null) + 
-                "]";
-    }
-
     public void read(JmeImporter im) throws IOException {
         InputCapsule ic = im.getCapsule(this);
 
@@ -1054,7 +1050,7 @@ public void read(JmeImporter im) throws IOException {
         }
 
         def = (MaterialDef) im.getAssetManager().loadAsset(new AssetKey(defName));
-        paramValues = new ListMap<String, MatParam>();
+        paramValues = new ListMap<>();
 
         // load the textures and update nextTexUnit
         for (Map.Entry<String, MatParam> entry : params.entrySet()) {

jme3-core/src/main/java/com/jme3/material/RenderState.java

@@ -429,6 +429,9 @@ public enum StencilOperation {
         ADDITIONAL.applyBlendEquationAlpha = false;
         ADDITIONAL.applyBlendMode = false;
         ADDITIONAL.applyPolyOffset = false;
+        ADDITIONAL.applyStencilTest = false;
+        ADDITIONAL.applyLineWidth = false;
+        ADDITIONAL.applyDepthFunc = false;
     }
     boolean wireframe = false;
     boolean applyWireFrame = true;

jme3-core/src/main/java/com/jme3/material/Technique.java

@@ -133,9 +133,10 @@ private void applyOverrides(DefineList defineList, SafeArrayList<MatParamOverrid
      * @param rendererCaps The renderer capabilities which the shader should support.
      * @return A compatible shader.
      */
-    Shader makeCurrent(RenderManager renderManager, SafeArrayList<MatParamOverride> worldOverrides,
+    Shader makeCurrent(RenderManager renderManager, Geometry geometry,
+            SafeArrayList<MatParamOverride> worldOverrides,
             SafeArrayList<MatParamOverride> forcedOverrides,
-            LightList lights, EnumSet<Caps> rendererCaps) {
+            EnumSet<Caps> rendererCaps) {
         TechniqueDefLogic logic = def.getLogic();
         AssetManager assetManager = owner.getMaterialDef().getAssetManager();
 
@@ -149,7 +150,7 @@ Shader makeCurrent(RenderManager renderManager, SafeArrayList<MatParamOverride>
             applyOverrides(dynamicDefines, forcedOverrides);
         }
 
-        return logic.makeCurrent(assetManager, renderManager, rendererCaps, lights, dynamicDefines);
+        return logic.makeCurrent(assetManager, renderManager, rendererCaps, geometry, dynamicDefines);
     }
 
     /**
@@ -161,9 +162,9 @@ Shader makeCurrent(RenderManager renderManager, SafeArrayList<MatParamOverride>
      * @param geometry The geometry to render
      * @param lights Lights which influence the geometry.
      */
-    void render(RenderManager renderManager, Shader shader, Geometry geometry, LightList lights, int lastTexUnit) {
+    void render(RenderManager renderManager, Shader shader, Geometry geometry, int lastTextureUnit) {
         TechniqueDefLogic logic = def.getLogic();
-        logic.render(renderManager, shader, geometry, lights, lastTexUnit);
+        logic.render(renderManager, shader, geometry, lastTextureUnit);
     }
 
     /**

jme3-core/src/main/java/com/jme3/material/logic/DefaultTechniqueDefLogic.java

@@ -48,14 +48,15 @@
 public class DefaultTechniqueDefLogic implements TechniqueDefLogic {
 
     protected final TechniqueDef techniqueDef;
+    protected final LightList filteredLightList = new LightList(null);
 
     public DefaultTechniqueDefLogic(TechniqueDef techniqueDef) {
         this.techniqueDef = techniqueDef;
     }
 
     @Override
     public Shader makeCurrent(AssetManager assetManager, RenderManager renderManager,
-            EnumSet<Caps> rendererCaps, LightList lights, DefineList defines) {
+            EnumSet<Caps> rendererCaps, Geometry geometry, DefineList defines) {
         return techniqueDef.getShader(assetManager, rendererCaps, defines);
     }
 
@@ -70,6 +71,19 @@ public static void renderMeshFromGeometry(Renderer renderer, Geometry geom) {
             renderer.renderMesh(mesh, lodLevel, 1, null);
         }
     }
+
+    @Override
+    public void render(RenderManager renderManager, Shader shader, Geometry geometry, int lastTexUnit) {
+        Renderer renderer = renderManager.getRenderer();
+        renderer.setShader(shader);
+        renderMeshFromGeometry(renderer, geometry);
+    }
+
+    protected LightList getFilteredLightList(RenderManager renderManager, Geometry geom) {
+        filteredLightList.clear();
+        renderManager.getLightFilter().filterLights(geom, filteredLightList);
+        return filteredLightList;
+    }
 
     protected static ColorRGBA getAmbientColor(LightList lightList, boolean removeLights, ColorRGBA ambientLightColor) {
         ambientLightColor.set(0, 0, 0, 1);
@@ -85,13 +99,4 @@ protected static ColorRGBA getAmbientColor(LightList lightList, boolean removeLi
         ambientLightColor.a = 1.0f;
         return ambientLightColor;
     }
-
-
-
-    @Override
-    public void render(RenderManager renderManager, Shader shader, Geometry geometry, LightList lights, int lastTexUnit) {
-        Renderer renderer = renderManager.getRenderer();
-        renderer.setShader(shader);
-        renderMeshFromGeometry(renderer, geometry);
-    }
 }

jme3-core/src/main/java/com/jme3/material/logic/MultiPassLightingLogic.java

@@ -31,7 +31,6 @@
  */
 package com.jme3.material.logic;
 
-import com.jme3.asset.AssetManager;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -41,20 +40,16 @@
 import com.jme3.material.RenderState;
 import com.jme3.material.TechniqueDef;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.math.Vector4f;
-import com.jme3.renderer.Caps;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.Renderer;
 import com.jme3.scene.Geometry;
-import com.jme3.shader.DefineList;
 import com.jme3.shader.Shader;
 import com.jme3.shader.Uniform;
 import com.jme3.shader.VarType;
 import com.jme3.util.TempVars;
-import java.util.EnumSet;
 
 public final class MultiPassLightingLogic extends DefaultTechniqueDefLogic {
 
@@ -73,7 +68,7 @@ public MultiPassLightingLogic(TechniqueDef techniqueDef) {
     }
 
     @Override
-    public void render(RenderManager renderManager, Shader shader, Geometry geometry, LightList lights, int lastTexUnit) {
+    public void render(RenderManager renderManager, Shader shader, Geometry geometry, int lastTexUnit) {
         Renderer r = renderManager.getRenderer();
         Uniform lightDir = shader.getUniform("g_LightDirection");
         Uniform lightColor = shader.getUniform("g_LightColor");
@@ -82,6 +77,7 @@ public void render(RenderManager renderManager, Shader shader, Geometry geometry
         boolean isFirstLight = true;
         boolean isSecondLight = false;
 
+        LightList lights = getFilteredLightList(renderManager, geometry);
         getAmbientColor(lights, false, ambientLightColor);
 
         for (int i = 0; i < lights.size(); i++) {