@hztxi/cesium-engine 25.0.3 → 25.0.6

package/Source/Shaders/GlobeFS.js

@@ -27,6 +27,39 @@ uniform float u_dayTextureBrightness[TEXTURE_UNITS];\n\
 uniform float u_dayTextureContrast[TEXTURE_UNITS];\n\
 #endif\n\
 \n\
+#ifdef APPLY_TONE_MATCH\n\
+uniform vec3 u_dayTextureToneGain[TEXTURE_UNITS];\n\
+uniform vec3 u_dayTextureToneBias[TEXTURE_UNITS];\n\
+#endif\n\
+\n\
+#ifdef APPLY_TONE_MATCH_EDGE\n\
+// Per-texture fade targets at the four geographic edges of the surface tile\n\
+// (index order: 0 = south, 1 = east, 2 = north, 3 = west).\n\
+// u_dayTextureToneEdgeBlend holds one band width per geographic edge as a\n\
+// fraction of the tile extent; only edges with a coarser neighbor get a\n\
+// positive width, so same-level/finer edges never participate in the fade\n\
+// (an edge that faded toward the texture's own correction would reset the\n\
+// fade contributed by another edge near their corner).\n\
+uniform vec3 u_dayTextureToneEdgeGain[TEXTURE_UNITS * 4];\n\
+uniform vec3 u_dayTextureToneEdgeBias[TEXTURE_UNITS * 4];\n\
+uniform float u_dayTextureToneEdgeBlend[TEXTURE_UNITS * 4];\n\
+#endif\n\
+\n\
+#ifdef APPLY_TONE_MATCH_CROSS\n\
+// Per-texture ancestor imagery for content cross-fading at edges facing a\n\
+// coarser neighbor: near such an edge the tile blends its full rendered result\n\
+// with the ancestor's rendering (ancestor texture sampled with the ancestor\n\
+// level's correction), making both sides of the boundary identical at the\n\
+// shared edge. u_dayTextureCrossBlend holds one band width per geographic edge\n\
+// (0 = south, 1 = east, 2 = north, 3 = west); an edge only fades when its\n\
+// neighbor's imagery level matches the bound ancestor's level.\n\
+uniform sampler2D u_dayTextureCrossTexture[TEXTURE_UNITS];\n\
+uniform vec4 u_dayTextureCrossTranslationAndScale[TEXTURE_UNITS];\n\
+uniform vec3 u_dayTextureCrossGain[TEXTURE_UNITS];\n\
+uniform vec3 u_dayTextureCrossBias[TEXTURE_UNITS];\n\
+uniform float u_dayTextureCrossBlend[TEXTURE_UNITS * 4];\n\
+#endif\n\
+\n\
 #ifdef APPLY_HUE\n\
 uniform float u_dayTextureHue[TEXTURE_UNITS];\n\
 #endif\n\
@@ -200,6 +233,8 @@ vec4 sampleAndBlend(\n\
     float textureHue,\n\
     float textureSaturation,\n\
     float textureOneOverGamma,\n\
+    vec3 textureToneGain,\n\
+    vec3 textureToneBias,\n\
     float split,\n\
     vec4 colorToAlpha,\n\
     float nightBlend)\n\
@@ -228,6 +263,13 @@ vec4 sampleAndBlend(\n\
     vec3 color = value.rgb;\n\
     float alpha = value.a;\n\
 \n\
+#ifdef APPLY_TONE_MATCH\n\
+    // Applied directly after sampling so the affine correction, which is fitted\n\
+    // in source-image color space, commutes with the identical transforms that\n\
+    // follow for both the tile and the imagery it replaces.\n\
+    color = color * textureToneGain + textureToneBias;\n\
+#endif\n\
+\n\
 #ifdef APPLY_COLOR_TO_ALPHA\n\
     vec3 colorDiff = abs(color.rgb - colorToAlpha.rgb);\n\
     colorDiff.r = czm_maximumComponent(colorDiff);\n\
@@ -691,4 +733,5 @@ vec4 computeWaterColor(vec3 positionEyeCoordinates, vec2 textureCoordinates, mat
 }\n\
 \n\
 #endif // #ifdef SHOW_REFLECTIVE_OCEAN\n\
+\n\
 ";

package/Source/Shaders/PolylineShadowVolumeMorphVS.glsl

@@ -104,11 +104,24 @@ void main()
 
 #ifdef WIDTH_VARYING
     float width = czm_batchTable_width(batchId);
+    // HZ patch: negative batch width encodes metric sizing (world meters).
+    if (width < 0.0)
+    {
+        vec4 metricPosEC = czm_modelViewRelativeToEye * czm_translateRelativeToEye(position3DHigh, position3DLow);
+        width = clamp((-width) / czm_metersPerPixel(metricPosEC), 1.0, 4096.0);
+    }
     float halfWidth = width * 0.5;
     v_width = width;
     v_texcoordNormalizationAndHalfWidth.z = halfWidth;
 #else
-    float halfWidth = 0.5 * czm_batchTable_width(batchId);
+    float width = czm_batchTable_width(batchId);
+    // HZ patch: negative batch width encodes metric sizing (world meters).
+    if (width < 0.0)
+    {
+        vec4 metricPosEC = czm_modelViewRelativeToEye * czm_translateRelativeToEye(position3DHigh, position3DLow);
+        width = clamp((-width) / czm_metersPerPixel(metricPosEC), 1.0, 4096.0);
+    }
+    float halfWidth = width * 0.5;
     v_texcoordNormalizationAndHalfWidth.z = halfWidth;
 #endif
 

package/Source/Shaders/PolylineShadowVolumeMorphVS.js

@@ -105,11 +105,24 @@ void main()\n\
 \n\
 #ifdef WIDTH_VARYING\n\
     float width = czm_batchTable_width(batchId);\n\
+    // HZ patch: negative batch width encodes metric sizing (world meters).\n\
+    if (width < 0.0)\n\
+    {\n\
+        vec4 metricPosEC = czm_modelViewRelativeToEye * czm_translateRelativeToEye(position3DHigh, position3DLow);\n\
+        width = clamp((-width) / czm_metersPerPixel(metricPosEC), 1.0, 4096.0);\n\
+    }\n\
     float halfWidth = width * 0.5;\n\
     v_width = width;\n\
     v_texcoordNormalizationAndHalfWidth.z = halfWidth;\n\
 #else\n\
-    float halfWidth = 0.5 * czm_batchTable_width(batchId);\n\
+    float width = czm_batchTable_width(batchId);\n\
+    // HZ patch: negative batch width encodes metric sizing (world meters).\n\
+    if (width < 0.0)\n\
+    {\n\
+        vec4 metricPosEC = czm_modelViewRelativeToEye * czm_translateRelativeToEye(position3DHigh, position3DLow);\n\
+        width = clamp((-width) / czm_metersPerPixel(metricPosEC), 1.0, 4096.0);\n\
+    }\n\
+    float halfWidth = width * 0.5;\n\
     v_texcoordNormalizationAndHalfWidth.z = halfWidth;\n\
 #endif\n\
 \n\

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\