Revert PickDepth

Author: lilleyse

Source/Scene/PickDepth.js

@@ -28,10 +28,7 @@ define([
 
         this._depthTexture = undefined;
         this._textureToCopy = undefined;
-        this._colorTextureMask = undefined;
         this._copyDepthCommand = undefined;
-        this._copyDepthCommandRender = undefined;
-        this._copyDepthCommandPick = undefined;
 
         this._useLogDepth = undefined;
 
@@ -115,11 +112,9 @@ define([
         }
     }
 
-    function updateCopyCommands(pickDepth, context, depthTexture, colorTextureMask) {
-        var fs;
+    function updateCopyCommands(pickDepth, context, depthTexture) {
         if (!defined(pickDepth._copyDepthCommand)) {
-            // Passthrough depth copy
-            fs =
+            var fs =
                 'uniform sampler2D u_texture;\n' +
                 'varying vec2 v_textureCoordinates;\n' +
                 'void main()\n' +
@@ -137,76 +132,17 @@ define([
             });
         }
 
-        if (!defined(pickDepth._copyDepthCommandRender)) {
-            // If alpha is less than one, use globe depth instead of scene depth. Globe depth will overwrite areas where
-            // there is translucent geometry or no geometry (like the depth plane).
-            fs =
-                'uniform sampler2D u_texture;\n' +
-                'uniform sampler2D u_colorTextureMask;\n' +
-                'varying vec2 v_textureCoordinates;\n' +
-                'void main()\n' +
-                '{\n' +
-                '    vec4 pickDepth = czm_packDepth(texture2D(u_texture, v_textureCoordinates).r);\n' +
-                '    vec4 globeDepth = texture2D(czm_globeDepthTexture, v_textureCoordinates);\n' +
-                '    bool mask = texture2D(u_colorTextureMask, v_textureCoordinates).a < 1.0;\n' +
-                '    gl_FragColor = czm_branchFreeTernary(mask, globeDepth, pickDepth);\n' +
-                '}\n';
-            pickDepth._copyDepthCommandRender = context.createViewportQuadCommand(fs, {
-                renderState : RenderState.fromCache(),
-                uniformMap : {
-                    u_texture : function() {
-                        return pickDepth._textureToCopy;
-                    },
-                    u_colorTextureMask : function() {
-                        return pickDepth._colorTextureMask;
-                    }
-                },
-                owner : pickDepth
-            });
-        }
-
-        if (!defined(pickDepth._copyDepthCommandPick)) {
-            // If color is (0,0,0,0), use globe depth instead of scene depth. Globe depth will overwrite areas where
-            // there is no geometry (like the depth plane).
-            fs =
-                'uniform sampler2D u_texture;\n' +
-                'uniform sampler2D u_colorTextureMask;\n' +
-                'varying vec2 v_textureCoordinates;\n' +
-                'void main()\n' +
-                '{\n' +
-                '    vec4 pickDepth = czm_packDepth(texture2D(u_texture, v_textureCoordinates).r);\n' +
-                '    vec4 globeDepth = texture2D(czm_globeDepthTexture, v_textureCoordinates);\n' +
-                '    bool mask = all(equal(texture2D(u_colorTextureMask, v_textureCoordinates), vec4(0.0)));\n' +
-                '    gl_FragColor = czm_branchFreeTernary(mask, globeDepth, pickDepth);\n' +
-                '}\n';
-            pickDepth._copyDepthCommandPick = context.createViewportQuadCommand(fs, {
-                renderState : RenderState.fromCache(),
-                uniformMap : {
-                    u_texture : function() {
-                        return pickDepth._textureToCopy;
-                    },
-                    u_colorTextureMask : function() {
-                        return pickDepth._colorTextureMask;
-                    }
-                },
-                owner : pickDepth
-            });
-        }
-
         pickDepth._textureToCopy = depthTexture;
-        pickDepth._colorTextureMask = colorTextureMask;
         pickDepth._copyDepthCommand.framebuffer = pickDepth._framebuffer;
-        pickDepth._copyDepthCommandRender.framebuffer = pickDepth._framebuffer;
-        pickDepth._copyDepthCommandPick.framebuffer = pickDepth._framebuffer;
     }
 
     PickDepth.prototype.executeDebugPickDepth = function(context, passState, useLogDepth) {
         executeDebugPickDepth(this, context, passState, useLogDepth);
     };
 
-    PickDepth.prototype.update = function(context, depthTexture, colorTextureMask) {
+    PickDepth.prototype.update = function(context, depthTexture) {
         updateFramebuffers(this, context, depthTexture);
-        updateCopyCommands(this, context, depthTexture, colorTextureMask);
+        updateCopyCommands(this, context, depthTexture);
     };
 
     var scratchPackedDepth = new Cartesian4();
@@ -226,14 +162,8 @@ define([
         return Cartesian4.dot(packedDepth, packedDepthScale);
     };
 
-    PickDepth.prototype.executeCopyDepth = function(context, passState, copyGlobeDepth, picking) {
-        if (!copyGlobeDepth) {
-            this._copyDepthCommand.execute(context, passState);
-        } else if (picking) {
-            this._copyDepthCommandPick.execute(context, passState);
-        } else {
-            this._copyDepthCommandRender.execute(context, passState);
-        }
+    PickDepth.prototype.executeCopyDepth = function(context, passState) {
+        this._copyDepthCommand.execute(context, passState);
     };
 
     PickDepth.prototype.isDestroyed = function() {
@@ -245,8 +175,6 @@ define([
         destroyFramebuffers(this);
 
         this._copyDepthCommand.shaderProgram = defined(this._copyDepthCommand.shaderProgram) && this._copyDepthCommand.shaderProgram.destroy();
-        this._copyDepthCommandRender.shaderProgram = defined(this._copyDepthCommandRender.shaderProgram) && this._copyDepthCommandRender.shaderProgram.destroy();
-        this._copyDepthCommandPick.shaderProgram = defined(this._copyDepthCommandPick.shaderProgram) && this._copyDepthCommandPick.shaderProgram.destroy();
 
         return destroyObject(this);
     };

Source/Scene/Scene.js

@@ -2466,10 +2466,9 @@ define([
             if (context.depthTexture && scene.useDepthPicking && (environmentState.useGlobeDepthFramebuffer || renderTranslucentDepthForPick)) {
                 // PERFORMANCE_IDEA: Use MRT to avoid the extra copy.
                 var depthStencilTexture = renderTranslucentDepthForPick ? passState.framebuffer.depthStencilTexture : globeDepth.framebuffer.depthStencilTexture;
-                var colorTexture = passState.framebuffer.getColorTexture(0);
                 var pickDepth = getPickDepth(scene, index);
-                pickDepth.update(context, depthStencilTexture, colorTexture);
-                pickDepth.executeCopyDepth(context, passState, usePrimitiveFramebuffer, picking);
+                pickDepth.update(context, depthStencilTexture);
+                pickDepth.executeCopyDepth(context, passState);
             }
 
             if (picking || !usePostProcessSelected) {

Source/Widgets/Viewer/Viewer.js

@@ -756,8 +756,8 @@ Either specify options.terrainProvider instead or set options.baseLayerPicker to
             that.selectedEntity = pickEntity(that, e);
         }
 
-        //cesiumWidget.screenSpaceEventHandler.setInputAction(pickAndSelectObject, ScreenSpaceEventType.LEFT_CLICK);
-        //cesiumWidget.screenSpaceEventHandler.setInputAction(pickAndTrackObject, ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
+        cesiumWidget.screenSpaceEventHandler.setInputAction(pickAndSelectObject, ScreenSpaceEventType.LEFT_CLICK);
+        cesiumWidget.screenSpaceEventHandler.setInputAction(pickAndTrackObject, ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
     }
 
     defineProperties(Viewer.prototype, {