Shadows

Apps/Sandcastle/gallery/development/Shadows.html

@@ -231,7 +231,7 @@
             polygonOffsetFactor : 1.1,
             polygonOffsetUnits : 4.0,
             normalOffset : true,
-            normalOffsetScale : 2.0,
+            normalOffsetScale : 0.5,
             normalShading : true,
             normalShadingSmooth : 0.3,
             depthBias : 0.0001
@@ -242,7 +242,7 @@
             polygonOffsetFactor : 1.1,
             polygonOffsetUnits : 4.0,
             normalOffset : true,
-            normalOffsetScale : 0.2,
+            normalOffsetScale : 0.1,
             normalShading : true,
             normalShadingSmooth : 0.05,
             depthBias : 0.00001

CHANGES.md

@@ -1,20 +1,19 @@
 Change Log
 ==========
 
-### Shadows TODO
-* Added shadows
-    * Added `Viewer.shadows` and `Viewer.terrainShadows`. Both are disabled by default.
-    * Added `castShadows` and `receiveShadows` properties to `Primitive`, and options to the `Primitive` constructor.
-    * Added `castShadows` and `receiveShadows` properties to `Model`, and options to the `Model` constructor and `Model.fromGltf`.
-    * Added `castShadows` and `receiveShadows` properties to `Globe`.
-* Added `Matrix4.computeView`.
-
 ### 1.22 - 2016-06-01
 
 * Breaking changes
   *
 * Deprecated
   *
+* Added shadows
+    * Added `Viewer.shadows` and `Viewer.terrainShadows`. Both are off by default.
+    * Added `Viewer.shadowMap` and `Scene.shadowMap` for accessing the scene's shadow map.
+    * Added `castShadows` and `receiveShadows` properties to `Model` and `Entity.model`, and options to the `Model` constructor and `Model.fromGltf`.
+    * Added `castShadows` and `receiveShadows` properties to `Primitive`, and options to the `Primitive` constructor.
+    * Added `castShadows` and `receiveShadows` properties to `Globe`.
+* Added `Matrix4.computeView`.
 * Improved KML NetworkLink compatibility by supporting the `Url` tag. [#3895](https://github.com/AnalyticalGraphicsInc/cesium/pull/3895).
 * Added `VelocityVectorProperty` so billboard's aligned axis can follow the velocity vector.  [#3908](https://github.com/AnalyticalGraphicsInc/cesium/issues/3908)
 * Improve memory management for entity billboard/label/point/path visualization.

Source/Renderer/DrawCommand.js

@@ -39,8 +39,9 @@ define([
         this._debugOverlappingFrustums = 0;
         this._castShadows = defaultValue(options.castShadows, false);
         this._receiveShadows = defaultValue(options.receiveShadows, false);
-        this._dirty = true;
-        this._lastDirtyTime = 0;
+
+        this.dirty = true;
+        this.lastDirtyTime = 0;
 
         /**
          * @private
@@ -70,7 +71,7 @@ define([
             set : function(value) {
                 if (this._boundingVolume !== value) {
                     this._boundingVolume = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -91,7 +92,7 @@ define([
             set : function(value) {
                 if (this._orientedBoundingBox !== value) {
                     this._orientedBoundingBox = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -110,7 +111,7 @@ define([
             set : function(value) {
                 if (this._cull !== value) {
                     this._cull = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -131,7 +132,7 @@ define([
             set : function(value) {
                 if (this._modelMatrix !== value) {
                     this._modelMatrix = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -149,7 +150,7 @@ define([
             set : function(value) {
                 if (this._primitiveType !== value) {
                     this._primitiveType = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -167,7 +168,7 @@ define([
             set : function(value) {
                 if (this._vertexArray !== value) {
                     this._vertexArray = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -185,7 +186,7 @@ define([
             set : function(value) {
                 if (this._count !== value) {
                     this._count = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -203,7 +204,7 @@ define([
             set : function(value) {
                 if (this._offset !== value) {
                     this._offset = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -221,7 +222,7 @@ define([
             set : function(value) {
                 if (this._instanceCount !== value) {
                     this._instanceCount = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -239,7 +240,7 @@ define([
             set : function(value) {
                 if (this._shaderProgram !== value) {
                     this._shaderProgram = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -257,7 +258,7 @@ define([
             set : function(value) {
                 if (this._castShadows !== value) {
                     this._castShadows = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -275,7 +276,7 @@ define([
             set : function(value) {
                 if (this._receiveShadows !== value) {
                     this._receiveShadows = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -294,7 +295,7 @@ define([
             set : function(value) {
                 if (this._uniformMap !== value) {
                     this._uniformMap = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -312,7 +313,7 @@ define([
             set : function(value) {
                 if (this._renderState !== value) {
                     this._renderState = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -330,7 +331,7 @@ define([
             set : function(value) {
                 if (this._framebuffer !== value) {
                     this._framebuffer = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -348,7 +349,7 @@ define([
             set : function(value) {
                 if (this._pass !== value) {
                     this._pass = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -367,7 +368,7 @@ define([
             set : function(value) {
                 if (this._executeInClosestFrustum !== value) {
                     this._executeInClosestFrustum = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -390,7 +391,7 @@ define([
             set : function(value) {
                 if (this._owner !== value) {
                     this._owner = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -413,7 +414,7 @@ define([
             set : function(value) {
                 if (this._debugShowBoundingVolume !== value) {
                     this._debugShowBoundingVolume = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         },
@@ -429,7 +430,7 @@ define([
             set : function(value) {
                 if (this._debugOverlappingFrustums !== value) {
                     this._debugOverlappingFrustums = value;
-                    this._dirty = true;
+                    this.dirty = true;
                 }
             }
         }
@@ -464,8 +465,9 @@ define([
         result._owner = command._owner;
         result._debugShowBoundingVolume = command._debugShowBoundingVolume;
         result._debugOverlappingFrustums = command._debugOverlappingFrustums;
-        result._dirty = true;
-        result._lastDirtyTime = 0;
+
+        result.dirty = true;
+        result.lastDirtyTime = 0;
 
         return result;
     };

Source/Scene/Globe.js

@@ -191,7 +191,7 @@ define([
          * Determines whether the globe casts shadows from each light source. Any primitive that has
          * <code>receiveShadows</code> set to <code>true</code> will receive shadows that are casted by
          * the globe. This may impact performance since the terrain is rendered again from the light's
-         * perspective, which will also load terrain tiles that are potentially out of view.
+         * perspective. Currently only terrain that is in view casts shadows.
          *
          * @type {Boolean}
          * @default false

Source/Scene/QuadtreePrimitive.js

@@ -505,8 +505,7 @@ define([
     }
 
     function screenSpaceError(primitive, frameState, tile) {
-        // TODO: check for sseDenominator so shadow cameras with orthographic frustum works. check correctness.
-        if (frameState.mode === SceneMode.SCENE2D || !defined(frameState.camera.frustum.sseDenominator)) {
+        if (frameState.mode === SceneMode.SCENE2D) {
             return screenSpaceError2D(primitive, frameState, tile);
         }
 

Source/Scene/Scene.js

@@ -554,7 +554,8 @@ define([
         this._sunCamera = new Camera(this);
 
         /**
-         * Render shadows in the scene.
+         * The shadow map in the scene. When enabled, models, primitives, and the globe may cast and receive shadows.
+         * By default the light source of the shadow map is the sun.
          * @type {ShadowMap}
          */
         this.shadowMap = new ShadowMap({
@@ -1094,15 +1095,15 @@ define([
         if (shadowsEnabled && (command.receiveShadows || command.castShadows)) {
             // Update derived commands when any shadow maps become dirty
             var lastDirtyTime = frameState.shadowHints.lastDirtyTime;
-            if (command._lastDirtyTime !== lastDirtyTime) {
-                command._lastDirtyTime = lastDirtyTime;
-                command._dirty = true;
+            if (command.lastDirtyTime !== lastDirtyTime) {
+                command.lastDirtyTime = lastDirtyTime;
+                command.dirty = true;
                 shadowsDirty = true;
             }
         }
 
-        if (command._dirty) {
-            command._dirty = false;
+        if (command.dirty) {
+            command.dirty = false;
 
             var derivedCommands = command.derivedCommands;