@hztxi/cesium-engine 25.0.4 → 25.0.7

package/Source/Shaders/PolylineShadowVolumeVS.glsl

@@ -136,6 +136,13 @@ void main()
     //       o---------- polyline segment ---->
     //
     float width = czm_batchTable_width(batchId);
+    // HZ patch: negative batch width encodes metric sizing (world meters).
+    // Convert to a pixel-equivalent here so the metersPerPixel multiply below
+    // restores the metric world width every frame, with no CPU involvement.
+    if (width < 0.0)
+    {
+        width = clamp((-width) / czm_metersPerPixel(positionEC), 1.0, 4096.0);
+    }
 #ifdef WIDTH_VARYING
     v_width = width;
 #endif

package/Source/Shaders/PolylineShadowVolumeVS.js

@@ -137,6 +137,13 @@ void main()\n\
     //       o---------- polyline segment ---->\n\
     //\n\
     float width = czm_batchTable_width(batchId);\n\
+    // HZ patch: negative batch width encodes metric sizing (world meters).\n\
+    // Convert to a pixel-equivalent here so the metersPerPixel multiply below\n\
+    // restores the metric world width every frame, with no CPU involvement.\n\
+    if (width < 0.0)\n\
+    {\n\
+        width = clamp((-width) / czm_metersPerPixel(positionEC), 1.0, 4096.0);\n\
+    }\n\
 #ifdef WIDTH_VARYING\n\
     v_width = width;\n\
 #endif\n\

package/Source/Shaders/PolylineVS.glsl

@@ -25,14 +25,9 @@ void main()
     float batchTableIndex = texCoordExpandAndBatchIndex.w;
 
     vec2 widthAndShow = batchTable_getWidthAndShow(batchTableIndex);
-    float width = widthAndShow.x + 0.5;
+    float width = widthAndShow.x;
     float show = widthAndShow.y;
 
-    if (width < 1.0)
-    {
-        show = 0.0;
-    }
-
     vec4 pickColor = batchTable_getPickColor(batchTableIndex);
 
     vec4 p, prev, next;
@@ -64,6 +59,21 @@ void main()
                 czm_morphTime);
     }
 
+    // HZ patch: negative batch width encodes metric sizing (world meters).
+    // Convert to pixels per frame on the GPU so metric width tracks zoom
+    // without CPU property updates or geometry rebuilds.
+    if (width < 0.0)
+    {
+        vec4 posEC = czm_modelViewRelativeToEye * p;
+        width = clamp((-width) / czm_metersPerPixel(posEC), 1.0, 4096.0);
+    }
+    width += 0.5;
+
+    if (width < 1.0)
+    {
+        show = 0.0;
+    }
+
     #ifdef DISTANCE_DISPLAY_CONDITION
         vec3 centerHigh = batchTable_getCenterHigh(batchTableIndex);
         vec4 centerLowAndRadius = batchTable_getCenterLowAndRadius(batchTableIndex);

package/Source/Shaders/PolylineVS.js

@@ -26,13 +26,8 @@ void main()\n\
     float batchTableIndex = texCoordExpandAndBatchIndex.w;\n\
 \n\
     vec2 widthAndShow = batchTable_getWidthAndShow(batchTableIndex);\n\
-    float width = widthAndShow.x + 0.5;\n\
+    float width = widthAndShow.x;\n\
     float show = widthAndShow.y;\n\
-\n\
-    if (width < 1.0)\n\
-    {\n\
-        show = 0.0;\n\
-    }\n\
 \n\
     vec4 pickColor = batchTable_getPickColor(batchTableIndex);\n\
 \n\
@@ -64,6 +59,21 @@ void main()\n\
                 czm_translateRelativeToEye(nextPosition3DHigh.xyz, nextPosition3DLow.xyz),\n\
                 czm_morphTime);\n\
     }\n\
+\n\
+    // HZ patch: negative batch width encodes metric sizing (world meters).\n\
+    // Convert to pixels per frame on the GPU so metric width tracks zoom\n\
+    // without CPU property updates or geometry rebuilds.\n\
+    if (width < 0.0)\n\
+    {\n\
+        vec4 posEC = czm_modelViewRelativeToEye * p;\n\
+        width = clamp((-width) / czm_metersPerPixel(posEC), 1.0, 4096.0);\n\
+    }\n\
+    width += 0.5;\n\
+\n\
+    if (width < 1.0)\n\
+    {\n\
+        show = 0.0;\n\
+    }\n\
 \n\
     #ifdef DISTANCE_DISPLAY_CONDITION\n\
         vec3 centerHigh = batchTable_getCenterHigh(batchTableIndex);\n\

package/Source/Shaders/RestoreDepth.glsl

@@ -0,0 +1,8 @@
+uniform highp sampler2D u_depthTexture;
+
+in vec2 v_textureCoordinates;
+
+void main()
+{
+    gl_FragDepth = czm_unpackDepth(texture(u_depthTexture, v_textureCoordinates));
+}

package/Source/Shaders/RestoreDepth.js

@@ -0,0 +1,10 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "uniform highp sampler2D u_depthTexture;\n\
+\n\
+in vec2 v_textureCoordinates;\n\
+\n\
+void main()\n\
+{\n\
+    gl_FragDepth = czm_unpackDepth(texture(u_depthTexture, v_textureCoordinates));\n\
+}\n\
+";