Write depth is pick pass

CesiumGS · Sep 13, 2018 · 8bdb191 · 8bdb191
1 parent d5f1337
commit 8bdb191
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/Source/Scene/DerivedCommand.js b/Source/Scene/DerivedCommand.js
@@ -289,6 +289,7 @@ define([
         if (!defined(pickState)) {
             var rs = RenderState.getState(renderState);
             rs.blending.enabled = false;
+            rs.depthMask = true;
 
             pickState = RenderState.fromCache(rs);
             cache[renderState.id] = pickState;

diff --git a/Specs/Scene/PickSpec.js b/Specs/Scene/PickSpec.js
@@ -62,13 +62,14 @@ defineSuite([
         primitives.removeAll();
     });
 
-    function createRectangle() {
+    function createRectangle(height) {
         var e = new Primitive({
             geometryInstances: new GeometryInstance({
                 geometry: new RectangleGeometry({
                     rectangle: primitiveRectangle,
                     vertexFormat: EllipsoidSurfaceAppearance.VERTEX_FORMAT,
-                    granularity: CesiumMath.toRadians(20.0)
+                    granularity: CesiumMath.toRadians(20.0),
+                    height: height
                 })
             }),
             appearance: new EllipsoidSurfaceAppearance({
@@ -94,7 +95,7 @@ defineSuite([
             return;
         }
 
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
         expect(scene).toPickPrimitive(rectangle);
     });
 
@@ -108,7 +109,7 @@ defineSuite([
             destination : Rectangle.fromDegrees(-10.0, -10.0, 10.0, 10.0)
         });
 
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
 
         expect(scene).toPickPrimitive(rectangle, 7, 7, 5);
         expect(scene).notToPick(7, 7, 3);
@@ -124,30 +125,29 @@ defineSuite([
             destination : Rectangle.fromDegrees(-10.0, -10.0, 10.0, 10.0)
         });
 
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
 
         expect(scene).toDrillPickPrimitive(rectangle, 7, 7, 5);
         expect(scene).notToDrillPick(7, 7, 3);
     });
 
     it('does not pick primitives when show is false', function() {
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
         rectangle.show = false;
 
         expect(scene).notToPick();
     });
 
     it('does not pick primitives when alpha is zero', function() {
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
         rectangle.appearance.material.uniforms.color.alpha = 0.0;
 
         expect(scene).notToPick();
     });
 
     it('picks the top primitive', function() {
         createRectangle();
-        var rectangle2 = createRectangle();
-        rectangle2.height = 0.01;
+        var rectangle2 = createRectangle(1.0);
 
         expect(scene).toPickPrimitive(rectangle2);
     });
@@ -159,9 +159,8 @@ defineSuite([
     });
 
     it('drill picks multiple objects', function() {
-        var rectangle1 = createRectangle();
-        var rectangle2 = createRectangle();
-        rectangle2.height = 0.01;
+        var rectangle1 = createRectangle(0.0);
+        var rectangle2 = createRectangle(1.0);
 
         expect(scene).toDrillPickAndCall(function(pickedObjects) {
             expect(pickedObjects.length).toEqual(2);
@@ -171,9 +170,8 @@ defineSuite([
     });
 
     it('does not drill pick when show is false', function() {
-        var rectangle1 = createRectangle();
-        var rectangle2 = createRectangle();
-        rectangle2.height = 0.01;
+        var rectangle1 = createRectangle(0.0);
+        var rectangle2 = createRectangle(1.0);
         rectangle2.show = false;
 
         expect(scene).toDrillPickAndCall(function(pickedObjects) {
@@ -183,9 +181,8 @@ defineSuite([
     });
 
     it('does not drill pick when alpha is zero', function() {
-        var rectangle1 = createRectangle();
-        var rectangle2 = createRectangle();
-        rectangle2.height = 0.01;
+        var rectangle1 = createRectangle(0.0);
+        var rectangle2 = createRectangle(1.0);
         rectangle2.appearance.material.uniforms.color.alpha = 0.0;
 
         expect(scene).toDrillPickAndCall(function(pickedObjects) {
@@ -323,12 +320,9 @@ defineSuite([
     });
 
     it('stops drill picking when the limit is reached.', function() {
-        var rectangle2 = createRectangle();
-        var rectangle3 = createRectangle();
-        var rectangle4 = createRectangle();
-        rectangle2.height = 0.01;
-        rectangle3.height = 0.02;
-        rectangle4.height = 0.03;
+        var rectangle2 = createRectangle(1.0);
+        var rectangle3 = createRectangle(2.0);
+        var rectangle4 = createRectangle(3.0);
 
         expect(scene).toDrillPickAndCall(function(pickedObjects) {
             expect(pickedObjects.length).toEqual(3);
@@ -341,7 +335,7 @@ defineSuite([
     it('picks in 2D', function() {
         scene.morphTo2D(0.0);
         camera.setView({ destination : primitiveRectangle });
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
         scene.initializeFrame();
         expect(scene).toPickPrimitive(rectangle);
     });
@@ -356,7 +350,7 @@ defineSuite([
         expect(frustum.projectionMatrix).toBeDefined();
 
         camera.setView({ destination : primitiveRectangle });
-        var rectangle = createRectangle();
+        var rectangle = createRectangle(0.0);
         scene.initializeFrame();
         expect(scene).toPickPrimitive(rectangle);
     });