Merge pull request #4006 from AnalyticalGraphicsInc/shadows-derived-fix

Shadow fixes for derived commands and OIT
CesiumGS · Jun 7, 2016 · 6959c80 · 6959c80
2 parents fdfbdef + fd902f2
commit 6959c80
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Source/Renderer/DrawCommand.js b/Source/Renderer/DrawCommand.js
@@ -465,6 +465,8 @@ define([
         result._owner = command._owner;
         result._debugShowBoundingVolume = command._debugShowBoundingVolume;
         result._debugOverlappingFrustums = command._debugOverlappingFrustums;
+        result._castShadows = command._castShadows;
+        result._receiveShadows = command._receiveShadows;
 
         result.dirty = true;
         result.lastDirtyTime = 0;

diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js
@@ -1487,7 +1487,10 @@ define([
 
         if (scene.debugShowCommands || scene.debugShowFrustums) {
             executeDebugCommand(command, scene, passState);
-        } else if (scene.frameState.shadowHints.shadowsEnabled && command.receiveShadows) {
+        } else if (scene.frameState.shadowHints.shadowsEnabled && command.receiveShadows && defined(command.derivedCommands.shadows)) {
+            // If the command receives shadows, execute the derived shadows command.
+            // Some commands, such as OIT derived commands, do not have derived shadow commands themselves
+            // and instead shadowing is built-in. In this case execute the command regularly below.
             command.derivedCommands.shadows.receiveCommand.execute(context, passState);
         } else {
             command.execute(context, passState);
@@ -1895,6 +1898,9 @@ define([
                 var numberOfCommands = pass.commandList.length;
                 for (var k = 0; k < numberOfCommands; ++k) {
                     var command = pass.commandList[k];
+                    // Set the correct pass before rendering into the shadow map because some shaders
+                    // conditionally render based on whether the pass is translucent or opaque.
+                    uniformState.updatePass(command.pass);
                     executeCommand(command.derivedCommands.shadows.castCommands[i], scene, context, pass.passState);
                 }
             }

diff --git a/Source/Scene/ShadowMap.js b/Source/Scene/ShadowMap.js
@@ -1483,6 +1483,8 @@ define([
         }
 
         result = DrawCommand.shallowClone(command, result);
+        result.castShadows = true;
+        result.receiveShadows = false;
 
         if (!defined(castShader) || oldShaderId !== command.shaderProgram.id || shadowsDirty) {
             if (defined(castShader)) {
@@ -1575,6 +1577,8 @@ define([
             }
 
             result.receiveCommand = DrawCommand.shallowClone(command, result.receiveCommand);
+            result.castShadows = false;
+            result.receiveShadows = true;
 
             // If castShadows changed, recompile the receive shadows shader. The normal shading technique simulates
             // self-shadowing so it should be turned off if castShadows is false.