deeptwins-cesium-engine 0.0.6 → 0.0.10

package/Source/Shaders/BillboardCollectionVS.js

@@ -1,6 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "uniform float u_threePointDepthTestDistance;\n\
-#ifdef INSTANCED\n\
+export default "#ifdef INSTANCED\n\
 in vec2 direction;\n\
 #endif\n\
 in vec4 positionHighAndScale;\n\
@@ -11,10 +10,10 @@ in vec4 compressedAttribute2;                       // label horizontal origin,
 in vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)\n\
 in vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
 in vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale\n\
-in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistanceSq, dimensions\n\
+in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions\n\
 in vec2 sdf;                                        // sdf outline color (rgb) and width (w)\n\
 in float splitDirection;                            // splitDirection\n\
-#if defined(VS_THREE_POINT_DEPTH_CHECK) || defined(FS_THREE_POINT_DEPTH_CHECK)\n\
+#if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)\n\
 in vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates\n\
 #endif\n\
 #ifdef VECTOR_TILE\n\
@@ -22,12 +21,12 @@ in float a_batchId;\n\
 #endif\n\
 \n\
 out vec2 v_textureCoordinates;\n\
-#ifdef FS_THREE_POINT_DEPTH_CHECK\n\
+#ifdef FRAGMENT_DEPTH_CHECK\n\
 out vec4 v_textureCoordinateBounds;\n\
 out vec4 v_originTextureCoordinateAndTranslate;\n\
+out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
 out mat2 v_rotationMatrix;\n\
 #endif\n\
-out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
 \n\
 out vec4 v_pickColor;\n\
 out vec4 v_color;\n\
@@ -94,7 +93,7 @@ vec4 addScreenSpaceOffset(vec4 positionEC, vec2 imageSize, float scale, vec2 dir
     return positionEC;\n\
 }\n\
 \n\
-#ifdef VS_THREE_POINT_DEPTH_CHECK\n\
+#ifdef VERTEX_DEPTH_CHECK\n\
 float getGlobeDepth(vec4 positionEC)\n\
 {\n\
     vec4 posWC = czm_eyeToWindowCoordinates(positionEC);\n\
@@ -139,7 +138,7 @@ void main()\n\
     origin.y = floor(compressed * SHIFT_RIGHT3);\n\
     compressed -= origin.y * SHIFT_LEFT3;\n\
 \n\
-#ifdef FS_THREE_POINT_DEPTH_CHECK\n\
+#ifdef FRAGMENT_DEPTH_CHECK\n\
     vec2 depthOrigin = origin.xy;\n\
 #endif\n\
     origin -= vec2(1.0);\n\
@@ -167,21 +166,19 @@ void main()\n\
 \n\
     temp = compressedAttribute0.z * SHIFT_RIGHT8;\n\
     translate.x = floor(temp) - UPPER_BOUND;\n\
-    translate.x *= SHIFT_RIGHT2; // undo translateX scaling (helps preserve subpixel precision, see BillboardCollection.js attribute writer for more info)\n\
 \n\
     translate.y += (temp - floor(temp)) * SHIFT_LEFT8;\n\
     translate.y -= UPPER_BOUND;\n\
-    translate.y *= SHIFT_RIGHT2;\n\
 \n\
     temp = compressedAttribute1.x * SHIFT_RIGHT8;\n\
     float temp2 = floor(compressedAttribute2.w * SHIFT_RIGHT2);\n\
 \n\
     vec2 imageSize = vec2(floor(temp), temp2);\n\
 \n\
-#ifdef FS_THREE_POINT_DEPTH_CHECK\n\
+#ifdef FRAGMENT_DEPTH_CHECK\n\
     float labelHorizontalOrigin = floor(compressedAttribute2.w - (temp2 * SHIFT_LEFT2));\n\
     float applyTranslate = 0.0;\n\
-    if (labelHorizontalOrigin != 0.0) // is a label, so set apply translate to true\n\
+    if (labelHorizontalOrigin != 0.0) // is a billboard, so set apply translate to false\n\
     {\n\
         applyTranslate = 1.0;\n\
         labelHorizontalOrigin -= 2.0;\n\
@@ -202,7 +199,7 @@ void main()\n\
     translucencyByDistance.w = ((temp - floor(temp)) * SHIFT_LEFT8) / 255.0;\n\
 #endif\n\
 \n\
-#if defined(VS_THREE_POINT_DEPTH_CHECK) || defined(FS_THREE_POINT_DEPTH_CHECK)\n\
+#if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)\n\
     temp = compressedAttribute3.w;\n\
     temp = temp * SHIFT_RIGHT12;\n\
 \n\
@@ -251,6 +248,10 @@ void main()\n\
 \n\
     vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);\n\
     vec4 positionEC = czm_modelViewRelativeToEye * p;\n\
+\n\
+#if defined(FRAGMENT_DEPTH_CHECK) || defined(VERTEX_DEPTH_CHECK)\n\
+    float eyeDepth = positionEC.z;\n\
+#endif\n\
 \n\
     positionEC = czm_eyeOffset(positionEC, eyeOffset.xyz);\n\
     positionEC.xyz *= show;\n\
@@ -309,56 +310,35 @@ void main()\n\
     mat2 rotationMatrix;\n\
     float mpp;\n\
 \n\
-    float enableDepthCheck = 1.0;\n\
 #ifdef DISABLE_DEPTH_DISTANCE\n\
-    float disableDepthTestDistanceSq = compressedAttribute3.z;\n\
-    if (disableDepthTestDistanceSq == 0.0 && czm_minimumDisableDepthTestDistance != 0.0)\n\
-    {\n\
-        disableDepthTestDistanceSq = czm_minimumDisableDepthTestDistance;\n\
-    }\n\
-\n\
-    if (lengthSq < disableDepthTestDistanceSq || disableDepthTestDistanceSq < 0.0)\n\
-    {\n\
-        enableDepthCheck = 0.0;\n\
-    }\n\
+    float disableDepthTestDistance = compressedAttribute3.z;\n\
 #endif\n\
 \n\
-    v_compressed.y = enableDepthCheck;\n\
-\n\
-#ifdef VS_THREE_POINT_DEPTH_CHECK\n\
-if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) && (enableDepthCheck == 1.0)) {\n\
+#ifdef VERTEX_DEPTH_CHECK\n\
+if (lengthSq < disableDepthTestDistance) {\n\
     float depthsilon = 10.0;\n\
-    vec2 depthOrigin;\n\
-    // Horizontal origin for labels comes from a special attribute. If that value is 0, this is a billboard - use the regular origin. \n\
-    // Otherwise, transform the label origin to -1, 0, 1 (right, center, left).\n\
-    depthOrigin.x = floor(compressedAttribute2.w - (temp2 * SHIFT_LEFT2));\n\
-    depthOrigin.x = czm_branchFreeTernary(depthOrigin.x == 0.0, origin.x, depthOrigin.x - 2.0);\n\
-    depthOrigin.y = origin.y;\n\
-\n\
-    vec4 pEC1 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(0.0), depthOrigin, vec2(0.0), pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
+\n\
+    vec2 labelTranslate = textureCoordinateBoundsOrLabelTranslate.xy;\n\
+    vec4 pEC1 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(0.0), origin, labelTranslate, pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
     float globeDepth1 = getGlobeDepth(pEC1);\n\
 \n\
     if (globeDepth1 != 0.0 && pEC1.z + depthsilon < globeDepth1)\n\
     {\n\
-        vec4 pEC2 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(0.0, 1.0), depthOrigin, vec2(0.0), pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
+        vec4 pEC2 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(0.0, 1.0), origin, labelTranslate, pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
         float globeDepth2 = getGlobeDepth(pEC2);\n\
 \n\
         if (globeDepth2 != 0.0 && pEC2.z + depthsilon < globeDepth2)\n\
         {\n\
-            vec4 pEC3 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(1.0), depthOrigin, vec2(0.0), pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
+            vec4 pEC3 = addScreenSpaceOffset(positionEC, dimensions, scale, vec2(1.0), origin, labelTranslate, pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
             float globeDepth3 = getGlobeDepth(pEC3);\n\
             if (globeDepth3 != 0.0 && pEC3.z + depthsilon < globeDepth3)\n\
             {\n\
-                // \"Discard\" this vertex, as three key points fail depth test.\n\
                 positionEC.xyz = vec3(0.0);\n\
             }\n\
         }\n\
     }\n\
 }\n\
 #endif\n\
-    // Write out the eyespace depth before applying the screen space offset, but after potentially \"discarding\" the vertex\n\
-    // by setting its eyespace position to zero, via the three-point depth test above.\n\
-    v_compressed.x = positionEC.z;\n\
 \n\
     positionEC = addScreenSpaceOffset(positionEC, imageSize, scale, direction, origin, translate, pixelOffset, alignedAxis, validAlignedAxis, rotation, sizeInMeters, rotationMatrix, mpp);\n\
     gl_Position = czm_projection * positionEC;\n\
@@ -369,14 +349,17 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 #endif\n\
 \n\
 #ifdef DISABLE_DEPTH_DISTANCE\n\
+    if (disableDepthTestDistance == 0.0 && czm_minimumDisableDepthTestDistance != 0.0)\n\
+    {\n\
+        disableDepthTestDistance = czm_minimumDisableDepthTestDistance;\n\
+    }\n\
 \n\
-    if (disableDepthTestDistanceSq != 0.0)\n\
+    if (disableDepthTestDistance != 0.0)\n\
     {\n\
         // Don't try to \"multiply both sides\" by w.  Greater/less-than comparisons won't work for negative values of w.\n\
         float zclip = gl_Position.z / gl_Position.w;\n\
         bool clipped = (zclip < -1.0 || zclip > 1.0);\n\
-        // disableDepthTestDistanceSq can be less than zero if it's explicitly set to -1 in JS (as a sentinel value equivalent to infinity)\n\
-        if (!clipped && (disableDepthTestDistanceSq < 0.0 || (lengthSq > 0.0 && lengthSq < disableDepthTestDistanceSq)))\n\
+        if (!clipped && (disableDepthTestDistance < 0.0 || (lengthSq > 0.0 && lengthSq < disableDepthTestDistance)))\n\
         {\n\
             // Position z on the near plane.\n\
             gl_Position.z = -gl_Position.w;\n\
@@ -387,7 +370,7 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
     }\n\
 #endif\n\
 \n\
-#ifdef FS_THREE_POINT_DEPTH_CHECK\n\
+#ifdef FRAGMENT_DEPTH_CHECK\n\
     if (sizeInMeters) {\n\
         translate /= mpp;\n\
         dimensions /= mpp;\n\
@@ -399,13 +382,21 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 #else\n\
     v_rotationMatrix = mat2(1.0, 0.0, 0.0, 1.0);\n\
 #endif\n\
+\n\
+    float enableDepthCheck = 0.0;\n\
+    if (lengthSq < disableDepthTestDistance)\n\
+    {\n\
+        enableDepthCheck = 1.0;\n\
+    }\n\
+\n\
     float dw = floor(clamp(dimensions.x, 0.0, SHIFT_LEFT12));\n\
     float dh = floor(clamp(dimensions.y, 0.0, SHIFT_LEFT12));\n\
 \n\
     float iw = floor(clamp(imageSize.x, 0.0, SHIFT_LEFT12));\n\
     float ih = floor(clamp(imageSize.y, 0.0, SHIFT_LEFT12));\n\
 \n\
-    v_compressed.y += applyTranslate * SHIFT_LEFT1;\n\
+    v_compressed.x = eyeDepth;\n\
+    v_compressed.y = applyTranslate * SHIFT_LEFT1 + enableDepthCheck;\n\
     v_compressed.z = dw * SHIFT_LEFT12 + dh;\n\
     v_compressed.w = iw * SHIFT_LEFT12 + ih;\n\
     v_originTextureCoordinateAndTranslate.xy = depthOrigin;\n\

package/Source/Shaders/Builtin/Constants/passCesium3DTile.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passCesium3DTile = 5.0;
+const float czm_passCesium3DTile = 4.0;

package/Source/Shaders/Builtin/Constants/passCesium3DTile.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passCesium3DTile = 5.0;\n\
+const float czm_passCesium3DTile = 4.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passCesium3DTileClassification.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passCesium3DTileClassification = 6.0;
+const float czm_passCesium3DTileClassification = 5.0;

package/Source/Shaders/Builtin/Constants/passCesium3DTileClassification.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passCesium3DTileClassification = 6.0;\n\
+const float czm_passCesium3DTileClassification = 5.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passCesium3DTileClassificationIgnoreShow.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passCesium3DTileClassificationIgnoreShow = 7.0;
+const float czm_passCesium3DTileClassificationIgnoreShow = 6.0;

package/Source/Shaders/Builtin/Constants/passCesium3DTileClassificationIgnoreShow.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passCesium3DTileClassificationIgnoreShow = 7.0;\n\
+const float czm_passCesium3DTileClassificationIgnoreShow = 6.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passOpaque.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passOpaque = 8.0;
+const float czm_passOpaque = 7.0;

package/Source/Shaders/Builtin/Constants/passOpaque.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passOpaque = 8.0;\n\
+const float czm_passOpaque = 7.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passOverlay.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passOverlay = 12.0;
+const float czm_passOverlay = 10.0;

package/Source/Shaders/Builtin/Constants/passOverlay.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passOverlay = 12.0;\n\
+const float czm_passOverlay = 10.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passTranslucent.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passTranslucent = 9.0;
+const float czm_passTranslucent = 8.0;

package/Source/Shaders/Builtin/Constants/passTranslucent.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passTranslucent = 9.0;\n\
+const float czm_passTranslucent = 8.0;\n\
 ";

package/Source/Shaders/Builtin/Constants/passVoxels.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passVoxels = 10.0;
+const float czm_passVoxels = 9.0;

package/Source/Shaders/Builtin/Constants/passVoxels.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passVoxels = 10.0;\n\
+const float czm_passVoxels = 9.0;\n\
 ";

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -14,11 +14,9 @@ import czm_oneOverTwoPi from './Constants/oneOverTwoPi.js'
 import czm_passCesium3DTile from './Constants/passCesium3DTile.js'
 import czm_passCesium3DTileClassification from './Constants/passCesium3DTileClassification.js'
 import czm_passCesium3DTileClassificationIgnoreShow from './Constants/passCesium3DTileClassificationIgnoreShow.js'
-import czm_passCesium3DTileEdges from './Constants/passCesium3DTileEdges.js'
 import czm_passClassification from './Constants/passClassification.js'
 import czm_passCompute from './Constants/passCompute.js'
 import czm_passEnvironment from './Constants/passEnvironment.js'
-import czm_passGaussianSplats from './Constants/passGaussianSplats.js'
 import czm_passGlobe from './Constants/passGlobe.js'
 import czm_passOpaque from './Constants/passOpaque.js'
 import czm_passOverlay from './Constants/passOverlay.js'
@@ -154,11 +152,9 @@ export default {
     czm_passCesium3DTile : czm_passCesium3DTile,
     czm_passCesium3DTileClassification : czm_passCesium3DTileClassification,
     czm_passCesium3DTileClassificationIgnoreShow : czm_passCesium3DTileClassificationIgnoreShow,
-    czm_passCesium3DTileEdges : czm_passCesium3DTileEdges,
     czm_passClassification : czm_passClassification,
     czm_passCompute : czm_passCompute,
     czm_passEnvironment : czm_passEnvironment,
-    czm_passGaussianSplats : czm_passGaussianSplats,
     czm_passGlobe : czm_passGlobe,
     czm_passOpaque : czm_passOpaque,
     czm_passOverlay : czm_passOverlay,

package/Source/Shaders/Builtin/Functions/modelToWindowCoordinates.glsl

@@ -30,8 +30,7 @@
  */
 vec4 czm_modelToWindowCoordinates(vec4 position)
 {
-    vec4 positionEC = czm_modelView * position;
-    vec4 q = czm_projection * positionEC;
+    vec4 q = czm_modelViewProjection * position;                // clip coordinates
     q.xyz /= q.w;                                                // normalized device coordinates
     q.xyz = (czm_viewportTransformation * vec4(q.xyz, 1.0)).xyz; // window coordinates
     return q;

package/Source/Shaders/Builtin/Functions/modelToWindowCoordinates.js

@@ -31,8 +31,7 @@ export default "/**\n\
  */\n\
 vec4 czm_modelToWindowCoordinates(vec4 position)\n\
 {\n\
-    vec4 positionEC = czm_modelView * position;\n\
-    vec4 q = czm_projection * positionEC;\n\
+    vec4 q = czm_modelViewProjection * position;                // clip coordinates\n\
     q.xyz /= q.w;                                                // normalized device coordinates\n\
     q.xyz = (czm_viewportTransformation * vec4(q.xyz, 1.0)).xyz; // window coordinates\n\
     return q;\n\

package/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.glsl

@@ -76,6 +76,7 @@ vec4 czm_screenToEyeCoordinates(vec2 screenCoordinateXY, float depthOrLogDepth)
     vec4 screenCoord = vec4(screenCoordinateXY, far * (1.0 - near / depthFromCamera) / (far - near), 1.0);
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);
     eyeCoordinate.w = 1.0 / depthFromCamera; // Better precision
+    return eyeCoordinate;
 #else
     vec4 screenCoord = vec4(screenCoordinateXY, depthOrLogDepth, 1.0);
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);

package/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.js

@@ -77,6 +77,7 @@ vec4 czm_screenToEyeCoordinates(vec2 screenCoordinateXY, float depthOrLogDepth)\
     vec4 screenCoord = vec4(screenCoordinateXY, far * (1.0 - near / depthFromCamera) / (far - near), 1.0);\n\
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);\n\
     eyeCoordinate.w = 1.0 / depthFromCamera; // Better precision\n\
+    return eyeCoordinate;\n\
 #else\n\
     vec4 screenCoord = vec4(screenCoordinateXY, depthOrLogDepth, 1.0);\n\
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);\n\

package/Source/Shaders/EllipsoidVS.glsl

@@ -11,10 +11,10 @@ void main()
     // but doing it here allows us to change the radii without rewriting the vertex data, and
     // allows all ellipsoids to reuse the same vertex data.
     vec4 p = vec4(u_radii * position, 1.0);
-    
-    vec4 pEC = czm_modelView * p;
-    v_positionEC = pEC.xyz;     // position in eye coordinates
-    gl_Position = czm_projection * pEC;
+
+    v_positionEC = (czm_modelView * p).xyz;     // position in eye coordinates
+    gl_Position = czm_modelViewProjection * p;  // position in clip coordinates
+
     // With multi-frustum, when the ellipsoid primitive is positioned on the intersection of two frustums
     // and close to terrain, the terrain (writes depth) in the closest frustum can overwrite part of the
     // ellipsoid (does not write depth) that was rendered in the farther frustum.

package/Source/Shaders/EllipsoidVS.js

@@ -12,10 +12,10 @@ void main()\n\
     // but doing it here allows us to change the radii without rewriting the vertex data, and\n\
     // allows all ellipsoids to reuse the same vertex data.\n\
     vec4 p = vec4(u_radii * position, 1.0);\n\
-    \n\
-    vec4 pEC = czm_modelView * p;\n\
-    v_positionEC = pEC.xyz;     // position in eye coordinates\n\
-    gl_Position = czm_projection * pEC;\n\
+\n\
+    v_positionEC = (czm_modelView * p).xyz;     // position in eye coordinates\n\
+    gl_Position = czm_modelViewProjection * p;  // position in clip coordinates\n\
+\n\
     // With multi-frustum, when the ellipsoid primitive is positioned on the intersection of two frustums\n\
     // and close to terrain, the terrain (writes depth) in the closest frustum can overwrite part of the\n\
     // ellipsoid (does not write depth) that was rendered in the farther frustum.\n\

package/Source/Shaders/FXAA3_11.glsl

@@ -28,9 +28,7 @@
  */
 
 // NVIDIA GameWorks Graphics Samples GitHub link: https://github.com/NVIDIAGameWorks/GraphicsSamples
-// Original source (archived): https://archive.org/details/nvidiagame-works-graphics-samples-master
 // Original FXAA 3.11 shader link: https://github.com/NVIDIAGameWorks/GraphicsSamples/blob/master/samples/es3-kepler/FXAA/FXAA3_11.h
-// Shader link in fork: https://github.com/lyntel/GraphicsSamples/blob/3d30817ebeeade64fe6a4fc3aa1fe4265c29b6fd/samples/es3-kepler/FXAA/FXAA3_11.h
 
 // Steps used to integrate into Cesium:
 // * The following defines are set:

package/Source/Shaders/FXAA3_11.js

@@ -57,9 +57,7 @@ export default "/**\n\
  */\n\
 \n\
 // NVIDIA GameWorks Graphics Samples GitHub link: https://github.com/NVIDIAGameWorks/GraphicsSamples\n\
-// Original source (archived): https://archive.org/details/nvidiagame-works-graphics-samples-master\n\
 // Original FXAA 3.11 shader link: https://github.com/NVIDIAGameWorks/GraphicsSamples/blob/master/samples/es3-kepler/FXAA/FXAA3_11.h\n\
-// Shader link in fork: https://github.com/lyntel/GraphicsSamples/blob/3d30817ebeeade64fe6a4fc3aa1fe4265c29b6fd/samples/es3-kepler/FXAA/FXAA3_11.h\n\
 \n\
 // Steps used to integrate into Cesium:\n\
 // * The following defines are set:\n\

package/Source/Shaders/GlobeFS.glsl

@@ -87,47 +87,25 @@ flat in int v_regionIndex;
 uniform float u_minimumBrightness;
 #endif
 
-// Based on colorCorrect
-// The colorCorrect flag can only be true when tileProvider.hue/saturation/brightnessShift 
-// are nonzero AND when (applyFog || showGroundAtmosphere) in the tile provider
-// - The tileProvider.hue/saturation/brightnessShift are just passed through
-//   from the Globe hue/saturation/brightness, like atmosphereBrightnessShift
-// - The applyFog depends on enableFog, and some tile distance from the viewer
-// - The showGroundAtmosphere is a flag that is passed through from the Globe,
-//   and is true by default when the ellipsoid is WGS84
 #ifdef COLOR_CORRECT
 uniform vec3 u_hsbShift; // Hue, saturation, brightness
 #endif
 
-// Based on highlightFillTile
-// This is set for terrain tiles when they are "fill" tiles, and
-// the terrainProvider.fillHighlightColor was set to a value with
-// nonzero alpha
 #ifdef HIGHLIGHT_FILL_TILE
 uniform vec4 u_fillHighlightColor;
 #endif
 
-// Based on translucent
-// This is set depending on the GlobeTranslucencyState
 #ifdef TRANSLUCENT
 uniform vec4 u_frontFaceAlphaByDistance;
 uniform vec4 u_backFaceAlphaByDistance;
 uniform vec4 u_translucencyRectangle;
 #endif
 
-// Based on showUndergroundColor
-// This is set when GlobeSurfaceTileProvider.isUndergroundVisible 
-// returns true, AND the tileProvider.undergroundColor had a value with 
-// nonzero alpha, and the tileProvider.undergroundColorAlphaByDistance
-// was in the right range
 #ifdef UNDERGROUND_COLOR
 uniform vec4 u_undergroundColor;
 uniform vec4 u_undergroundColorAlphaByDistance;
 #endif
 
-// Based on enableLighting && hasVertexNormals
-// The enableLighting flag is passed in directly from the Globe.
-// The hasVertexNormals flag is from the tileProvider
 #ifdef ENABLE_VERTEX_LIGHTING
 uniform float u_lambertDiffuseMultiplier;
 uniform float u_vertexShadowDarkness;
@@ -307,16 +285,7 @@ vec3 computeEllipsoidPosition()
     vec2 xy = gl_FragCoord.xy / czm_viewport.zw * 2.0 - vec2(1.0);
     xy *= czm_viewport.zw * mpp * 0.5;
 
-    vec3 direction;
-    if (czm_orthographicIn3D == 1.0)
-    {
-        direction = vec3(0.0, 0.0, -1.0);
-    }
-    else
-    {
-        direction = normalize(vec3(xy, -czm_currentFrustum.x));
-    }
-
+    vec3 direction = normalize(vec3(xy, -czm_currentFrustum.x));
     czm_ray ray = czm_ray(vec3(0.0), direction);
 
     vec3 ellipsoid_center = czm_view[3].xyz;

package/Source/Shaders/GlobeFS.js

@@ -88,47 +88,25 @@ flat in int v_regionIndex;\n\
 uniform float u_minimumBrightness;\n\
 #endif\n\
 \n\
-// Based on colorCorrect\n\
-// The colorCorrect flag can only be true when tileProvider.hue/saturation/brightnessShift \n\
-// are nonzero AND when (applyFog || showGroundAtmosphere) in the tile provider\n\
-// - The tileProvider.hue/saturation/brightnessShift are just passed through\n\
-//   from the Globe hue/saturation/brightness, like atmosphereBrightnessShift\n\
-// - The applyFog depends on enableFog, and some tile distance from the viewer\n\
-// - The showGroundAtmosphere is a flag that is passed through from the Globe,\n\
-//   and is true by default when the ellipsoid is WGS84\n\
 #ifdef COLOR_CORRECT\n\
 uniform vec3 u_hsbShift; // Hue, saturation, brightness\n\
 #endif\n\
 \n\
-// Based on highlightFillTile\n\
-// This is set for terrain tiles when they are \"fill\" tiles, and\n\
-// the terrainProvider.fillHighlightColor was set to a value with\n\
-// nonzero alpha\n\
 #ifdef HIGHLIGHT_FILL_TILE\n\
 uniform vec4 u_fillHighlightColor;\n\
 #endif\n\
 \n\
-// Based on translucent\n\
-// This is set depending on the GlobeTranslucencyState\n\
 #ifdef TRANSLUCENT\n\
 uniform vec4 u_frontFaceAlphaByDistance;\n\
 uniform vec4 u_backFaceAlphaByDistance;\n\
 uniform vec4 u_translucencyRectangle;\n\
 #endif\n\
 \n\
-// Based on showUndergroundColor\n\
-// This is set when GlobeSurfaceTileProvider.isUndergroundVisible \n\
-// returns true, AND the tileProvider.undergroundColor had a value with \n\
-// nonzero alpha, and the tileProvider.undergroundColorAlphaByDistance\n\
-// was in the right range\n\
 #ifdef UNDERGROUND_COLOR\n\
 uniform vec4 u_undergroundColor;\n\
 uniform vec4 u_undergroundColorAlphaByDistance;\n\
 #endif\n\
 \n\
-// Based on enableLighting && hasVertexNormals\n\
-// The enableLighting flag is passed in directly from the Globe.\n\
-// The hasVertexNormals flag is from the tileProvider\n\
 #ifdef ENABLE_VERTEX_LIGHTING\n\
 uniform float u_lambertDiffuseMultiplier;\n\
 uniform float u_vertexShadowDarkness;\n\
@@ -308,16 +286,7 @@ vec3 computeEllipsoidPosition()\n\
     vec2 xy = gl_FragCoord.xy / czm_viewport.zw * 2.0 - vec2(1.0);\n\
     xy *= czm_viewport.zw * mpp * 0.5;\n\
 \n\
-    vec3 direction;\n\
-    if (czm_orthographicIn3D == 1.0)\n\
-    {\n\
-        direction = vec3(0.0, 0.0, -1.0);\n\
-    }\n\
-    else\n\
-    {\n\
-        direction = normalize(vec3(xy, -czm_currentFrustum.x));\n\
-    }\n\
-\n\
+    vec3 direction = normalize(vec3(xy, -czm_currentFrustum.x));\n\
     czm_ray ray = czm_ray(vec3(0.0), direction);\n\
 \n\
     vec3 ellipsoid_center = czm_view[3].xyz;\n\

package/Source/Shaders/GlobeVS.glsl

@@ -114,8 +114,7 @@ vec4 getPositionMorphingMode(vec3 position, float height, vec2 textureCoordinate
     float yPositionFraction = get2DYPositionFraction(textureCoordinates);
     vec4 position2DWC = vec4(height, mix(u_tileRectangle.st, u_tileRectangle.pq, vec2(textureCoordinates.x, yPositionFraction)), 1.0);
     vec4 morphPosition = czm_columbusViewMorph(position2DWC, vec4(position3DWC, 1.0), czm_morphTime);
-    vec4 morphPositionEC = czm_modelView * morphPosition;
-    return czm_projection * morphPositionEC;
+    return czm_modelViewProjection * morphPosition;
 }
 
 #ifdef QUANTIZATION_BITS12
@@ -141,7 +140,7 @@ void main()
 #elif defined(INCLUDE_WEB_MERCATOR_Y)
     float webMercatorT = czm_decompressTextureCoordinates(compressed0.w).x;
     float encodedNormal = 0.0;
-#elif defined(ENABLE_VERTEX_LIGHTING) || defined(GENERATE_POSITION_AND_NORMAL) || defined(APPLY_MATERIAL)
+#elif defined(ENABLE_VERTEX_LIGHTING) || defined(GENERATE_POSITION_AND_NORMAL)
     float webMercatorT = textureCoordinates.y;
     float encodedNormal = compressed0.w;
 #else

package/Source/Shaders/GlobeVS.js

@@ -115,8 +115,7 @@ vec4 getPositionMorphingMode(vec3 position, float height, vec2 textureCoordinate
     float yPositionFraction = get2DYPositionFraction(textureCoordinates);\n\
     vec4 position2DWC = vec4(height, mix(u_tileRectangle.st, u_tileRectangle.pq, vec2(textureCoordinates.x, yPositionFraction)), 1.0);\n\
     vec4 morphPosition = czm_columbusViewMorph(position2DWC, vec4(position3DWC, 1.0), czm_morphTime);\n\
-    vec4 morphPositionEC = czm_modelView * morphPosition;\n\
-    return czm_projection * morphPositionEC;\n\
+    return czm_modelViewProjection * morphPosition;\n\
 }\n\
 \n\
 #ifdef QUANTIZATION_BITS12\n\
@@ -142,7 +141,7 @@ void main()\n\
 #elif defined(INCLUDE_WEB_MERCATOR_Y)\n\
     float webMercatorT = czm_decompressTextureCoordinates(compressed0.w).x;\n\
     float encodedNormal = 0.0;\n\
-#elif defined(ENABLE_VERTEX_LIGHTING) || defined(GENERATE_POSITION_AND_NORMAL) || defined(APPLY_MATERIAL)\n\
+#elif defined(ENABLE_VERTEX_LIGHTING) || defined(GENERATE_POSITION_AND_NORMAL)\n\
     float webMercatorT = textureCoordinates.y;\n\
     float encodedNormal = compressed0.w;\n\
 #else\n\

package/Source/Shaders/Model/MaterialStageFS.glsl

@@ -444,10 +444,6 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha = u_baseColorFactor;
     #endif
 
-    #ifdef HAS_IMAGERY
-    baseColorWithAlpha = blendBaseColorWithImagery(baseColorWithAlpha);
-    #endif // HAS_IMAGERY
-
     #ifdef HAS_POINT_CLOUD_COLOR_STYLE
         baseColorWithAlpha = v_pointCloudColor;
     #elif defined(HAS_COLOR_0)

package/Source/Shaders/Model/MaterialStageFS.js

@@ -444,10 +444,6 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
     #elif defined(HAS_BASE_COLOR_FACTOR)\n\
         baseColorWithAlpha = u_baseColorFactor;\n\
     #endif\n\
-\n\
-    #ifdef HAS_IMAGERY\n\
-    baseColorWithAlpha = blendBaseColorWithImagery(baseColorWithAlpha);\n\
-    #endif // HAS_IMAGERY\n\
 \n\
     #ifdef HAS_POINT_CLOUD_COLOR_STYLE\n\
         baseColorWithAlpha = v_pointCloudColor;\n\