Code updates from review.

CesiumGS · Mar 9, 2017 · 620c090 · 620c090
1 parent 3937422
commit 620c090
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/Source/Shaders/Builtin/Functions/alphaWeight.glsl b/Source/Shaders/Builtin/Functions/alphaWeight.glsl
@@ -9,11 +9,7 @@ float czm_alphaWeight(float a)
     vec4 q = vec4(x, y, z, 0.0);
     q /= gl_FragCoord.w;
 
-    bool usingOrthographic = all(equal(czm_inverseProjection[0], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[1], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[2], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[3], vec4(0.0)));
-    if (!usingOrthographic) {
+    if (czm_inverseProjection != mat4(0.0)) {
         q = czm_inverseProjection * q;
     } else {
         float top = czm_frustumPlanes.x;

diff --git a/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.glsl b/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.glsl
@@ -31,11 +31,7 @@ vec4 czm_windowToEyeCoordinates(vec4 fragmentCoordinate)
     vec4 q = vec4(x, y, z, 1.0);
     q /= fragmentCoordinate.w;
 
-    bool usingOrthographic = all(equal(czm_inverseProjection[0], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[1], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[2], vec4(0.0))) &&
-                             all(equal(czm_inverseProjection[3], vec4(0.0)));
-    if (!usingOrthographic) {
+    if (czm_inverseProjection != mat4(0.0)) {
         q = czm_inverseProjection * q;
     } else {
         float top = czm_frustumPlanes.x;

diff --git a/Source/Widgets/Viewer/Viewer.js b/Source/Widgets/Viewer/Viewer.js
@@ -207,7 +207,7 @@ define([
         if(defined(sceneModePicker)) {
             sceneModePicker.container.style.visibility = visibility;
         }
-        if(defined(projectionPicker)) {
+        if (defined(projectionPicker)) {
             projectionPicker.container.style.visibility = visibility;
         }
         if(defined(baseLayerPicker)) {