Merge remote-tracking branch 'origin/master' into moreBingImagery

CesiumGS · Aug 10, 2017 · 616c9a1 · 616c9a1
2 parents 1b4c757 + 3958c02
commit 616c9a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,7 +6,6 @@ Change Log
 * Fixed `replaceState` bug that was causing the `CesiumViewer` demo application to crash in Safari and iOS
 * Fixed issue where `Model` and `BillboardCollection` would throw an error if the globe is undefined [#5638](https://github.com/AnalyticalGraphicsInc/cesium/issues/5638)
 * Fixed issue where the `Model` glTF cache loses reference to the model's buffer data. [#5720](https://github.com/AnalyticalGraphicsInc/cesium/issues/5720)
-* Added several new Bing Maps styles: `CANVAS_DARK`, `CANVAS_LIGHT`, and `CANVAS_GRAY`.
 
 ### 1.36 - 2017-08-01
 

diff --git a/Source/Shaders/BillboardCollectionVS.glsl b/Source/Shaders/BillboardCollectionVS.glsl
@@ -265,11 +265,12 @@ void main()
 
     if (disableDepthTestDistance != 0.0)
     {
-        gl_Position.z = min(gl_Position.z, gl_Position.w);
-
-        bool clipped = gl_Position.z < -gl_Position.w || gl_Position.z > gl_Position.w;
+        // Don't try to "multiply both sides" by w.  Greater/less-than comparisons won't work for negative values of w.
+        float zclip = gl_Position.z / gl_Position.w;
+        bool clipped = (zclip < -1.0 || zclip > 1.0);
         if (!clipped && (disableDepthTestDistance < 0.0 || (lengthSq > 0.0 && lengthSq < disableDepthTestDistance)))
         {
+            // Position z on the near plane.
             gl_Position.z = -gl_Position.w;
         }
     }

diff --git a/Source/Shaders/PointPrimitiveCollectionVS.glsl b/Source/Shaders/PointPrimitiveCollectionVS.glsl
@@ -160,11 +160,12 @@ void main()
 
     if (disableDepthTestDistance != 0.0)
     {
-        gl_Position.z = min(gl_Position.z, gl_Position.w);
-
-        bool clipped = gl_Position.z < -gl_Position.w || gl_Position.z > gl_Position.w;
+        // Don't try to "multiply both sides" by w.  Greater/less-than comparisons won't work for negative values of w.
+        float zclip = gl_Position.z / gl_Position.w;
+        bool clipped = (zclip < -1.0 || zclip > 1.0);
         if (!clipped && (disableDepthTestDistance < 0.0 || (lengthSq > 0.0 && lengthSq < disableDepthTestDistance)))
         {
+            // Position z on the near plane.
             gl_Position.z = -gl_Position.w;
         }
     }