Add option to disable log depth. Fix frustum equality and frustum changed flag.

Author: bagnell

Source/Core/OrthographicFrustum.js

@@ -259,7 +259,7 @@ define([
      * @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
      */
     OrthographicFrustum.prototype.equals = function(other) {
-        if (!defined(other)) {
+        if (!defined(other) || !(other instanceof OrthographicFrustum)) {
             return false;
         }
 

Source/Core/OrthographicOffCenterFrustum.js

@@ -361,7 +361,7 @@ define([
      * @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
      */
     OrthographicOffCenterFrustum.prototype.equals = function(other) {
-        return (defined(other) &&
+        return (defined(other) && other instanceof OrthographicOffCenterFrustum &&
                 this.right === other.right &&
                 this.left === other.left &&
                 this.top === other.top &&

Source/Core/PerspectiveFrustum.js

@@ -354,7 +354,7 @@ define([
      * @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
      */
     PerspectiveFrustum.prototype.equals = function(other) {
-        if (!defined(other)) {
+        if (!defined(other) || !(other instanceof PerspectiveFrustum)) {
             return false;
         }
 

Source/Core/PerspectiveOffCenterFrustum.js

@@ -412,7 +412,7 @@ define([
      * @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
      */
     PerspectiveOffCenterFrustum.prototype.equals = function(other) {
-        return (defined(other) &&
+        return (defined(other) && other instanceof PerspectiveOffCenterFrustum &&
                 this.right === other.right &&
                 this.left === other.left &&
                 this.top === other.top &&

Source/Scene/Scene.js

@@ -266,6 +266,7 @@ define([
         }
 
         this._logDepthBuffer = context.fragmentDepth;
+        this._logDepthBufferChanged = true;
 
         this._id = createGuid();
         this._jobScheduler = new JobScheduler();
@@ -1379,6 +1380,22 @@ define([
                 //>>includeEnd('debug');
                 this._minimumDisableDepthTestDistance = value;
             }
+        },
+
+        /**
+         * Whether or not to use a logarithmic depth buffer. Enabling this option will allow for less frustums in the multi-frustum,
+         * increasing performance. This property relies on {@link Context#fragmentDepth} being supported.
+         */
+        logDepthBuffer : {
+            get : function() {
+                return this._logDepthBuffer;
+            },
+            set : function(value) {
+                if (this._context.fragmentDepth && this._logDepthBuffer !== value) {
+                    this._logDepthBuffer = value;
+                    this._logDepthBufferChanged = true;
+                }
+            }
         }
     });
 
@@ -1432,7 +1449,7 @@ define([
         }
 
         var derivedCommands = command.derivedCommands;
-        if ((scene._frustumChanged || command.dirty) && defined(derivedCommands)) {
+        if ((scene._logDepthBufferChanged || scene._frustumChanged || command.dirty) && defined(derivedCommands)) {
             command.dirty = false;
 
             var frustum = scene.camera.frustum;
@@ -3099,14 +3116,14 @@ define([
         tryAndCatchError(this, time, update);
         this._postUpdate.raiseEvent(this, time);
 
-        this._frustumChanged = this._camera.frustum !== this._cameraClone.frustum;
+        this._frustumChanged = !this._camera.frustum.equals(this._cameraClone.frustum);
         if (this._frustumChanged && this._logDepthBuffer && !(this._camera.frustum instanceof OrthographicFrustum || this._camera.frustum instanceof OrthographicOffCenterFrustum)) {
             this._camera.frustum.near = 1.0;
             this._camera.frustum.far = 10000000000.0;
         }
 
         var cameraChanged = checkForCameraUpdates(this);
-        var shouldRender = !this.requestRenderMode || this._renderRequested || cameraChanged || this._frustumChanged || (this.mode === SceneMode.MORPHING);
+        var shouldRender = !this.requestRenderMode || this._renderRequested || cameraChanged || this._frustumChanged || this._logDepthBufferChanged || (this.mode === SceneMode.MORPHING);
         if (!shouldRender && defined(this.maximumRenderTimeChange) && defined(this._lastRenderTime)) {
             var difference = Math.abs(JulianDate.secondsDifference(this._lastRenderTime, time));
             shouldRender = shouldRender || difference > this.maximumRenderTimeChange;
@@ -3115,6 +3132,7 @@ define([
         if (shouldRender) {
             this._lastRenderTime = JulianDate.clone(time, this._lastRenderTime);
             this._renderRequested = false;
+            this._logDepthBufferChanged = false;
 
             // Render
             this._preRender.raiseEvent(this, time);

Source/Shaders/EllipsoidFS.glsl

@@ -1,3 +1,9 @@
+#ifdef WRITE_DEPTH
+#ifdef GL_EXT_frag_depth
+#extension GL_EXT_frag_depth : enable
+#endif
+#endif
+
 uniform vec3 u_radii;
 uniform vec3 u_oneOverEllipsoidRadiiSquared;
 
@@ -90,7 +96,16 @@ void main()
     t = (intersection.start != 0.0) ? intersection.start : intersection.stop;
     vec3 positionEC = czm_pointAlongRay(ray, t);
     vec4 positionCC = czm_projection * vec4(positionEC, 1.0);
+#ifdef LOG_DEPTH
     czm_writeLogZ(1.0 + positionCC.w);
+#else
+    float z = positionCC.z / positionCC.w;
+
+    float n = czm_depthRange.near;
+    float f = czm_depthRange.far;
+
+    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;
+#endif
 #endif
 #endif
 }

Source/Shaders/PostProcessFilters/PointCloudEyeDomeLighting.glsl

@@ -25,25 +25,28 @@ void main()
     {
         discard;
     }
-    else
-    {
-        vec4 color = texture2D(u_pointCloud_colorTexture, v_textureCoordinates);
 
-        // sample from neighbors up, down, left, right
-        float distX = u_distancesAndEdlStrength.x;
-        float distY = u_distancesAndEdlStrength.y;
+    vec4 color = texture2D(u_pointCloud_colorTexture, v_textureCoordinates);
 
-        vec2 responseAndCount = vec2(0.0);
+    // sample from neighbors up, down, left, right
+    float distX = u_distancesAndEdlStrength.x;
+    float distY = u_distancesAndEdlStrength.y;
 
-        responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(0, distY));
-        responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(distX, 0));
-        responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(0, -distY));
-        responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(-distX, 0));
+    vec2 responseAndCount = vec2(0.0);
 
-        float response = responseAndCount.x / responseAndCount.y;
-        float shade = exp(-response * 300.0 * u_distancesAndEdlStrength.z);
-        color.rgb *= shade;
-        gl_FragColor = vec4(color);
-        gl_FragDepthEXT = czm_eyeToWindowCoordinates(vec4(ecAlphaDepth.xyz, 1.0)).z;
-    }
+    responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(0, distY));
+    responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(distX, 0));
+    responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(0, -distY));
+    responseAndCount += neighborContribution(ecAlphaDepth.a, vec2(-distX, 0));
+
+    float response = responseAndCount.x / responseAndCount.y;
+    float shade = exp(-response * 300.0 * u_distancesAndEdlStrength.z);
+    color.rgb *= shade;
+    gl_FragColor = vec4(color);
+
+#ifdef LOG_DEPTH
+    czm_writeLogZ(1.0 + (czm_projection * vec4(ecAlphaDepth.xyz, 1.0)).w);
+#else
+    gl_FragDepthEXT = czm_eyeToWindowCoordinates(vec4(ecAlphaDepth.xyz, 1.0)).z;
+#endif
 }

Source/Shaders/Vector3DTilePolylinesVS.glsl

@@ -21,6 +21,6 @@ void main()
     gl_Position = czm_viewportOrthographic * positionWC;
 
 #ifdef LOG_DEPTH
-    czm_vertexLogZ(czm_projection * u_modifiedModelView * currentPosition);
+    czm_vertexLogZ(czm_projection * p);
 #endif
 }