@cesium/engine 23.0.0 → 24.0.0

package/Source/Shaders/PolygonSignedDistanceFS.glsl

@@ -52,48 +52,79 @@ void main() {
     }
     int regionIndex = getPolygonIndex(dimension, v_textureCoordinates);
 
+    if (regionIndex >= u_extentsLength) {
+        return; // done (no polygons in this region)
+    }
+
     for (int polygonIndex = 0; polygonIndex < u_polygonsLength; polygonIndex++) {
         ivec2 positionsLengthAndExtents = getPositionsLengthAndExtentsIndex(lastPolygonIndex);
         int positionsLength = positionsLengthAndExtents.x;
         int polygonExtentsIndex = positionsLengthAndExtents.y;
         lastPolygonIndex += 1;
 
+        // Read the individual polygon extent (2 pixels: south/west, latRange/lonRange)
+        vec2 extentsSouthWest = getPolygonPosition(lastPolygonIndex);
+        vec2 extentsRange = getPolygonPosition(lastPolygonIndex + 1);
+        vec4 polygonExtent = vec4(extentsSouthWest, extentsRange);
+        lastPolygonIndex += 2;
+
+        if (polygonExtentsIndex < regionIndex) {
+            lastPolygonIndex += positionsLength;
+            continue; // skip to next (TODO: could optimize further if we knew how many polygons to skip)
+        } else if (polygonExtentsIndex > regionIndex) {
+            break; // done (we know polygons are sorted by regionIndex)
+        }
+
          // Only compute signed distance for the relevant part of the atlas
-         if (polygonExtentsIndex == regionIndex) {
-            float clipAmount = czm_infinity;
-            vec4 extents = getExtents(polygonExtentsIndex);
-            vec2 textureOffset = vec2(mod(float(polygonExtentsIndex), dimension), floor(float(polygonExtentsIndex) / dimension)) / dimension;
-            vec2 p = getCoordinates((v_textureCoordinates - textureOffset) * dimension, extents);
-            float s = 1.0;
-
-            // Check each edge for absolute distance
-            for (int i = 0, j = positionsLength - 1; i < positionsLength; j = i, i++) {
-                vec2 a = getPolygonPosition(lastPolygonIndex + i);
-                vec2 b = getPolygonPosition(lastPolygonIndex + j);
- 
-                vec2 ab = b - a;
-                vec2 pa = p - a;
-                float t = dot(pa, ab) / dot(ab, ab);
-                t = clamp(t, 0.0, 1.0);
-
-                vec2 pq = pa - t * ab;
-                float d = length(pq);
-
-                // Inside / outside computation to determine sign
-                bvec3 cond = bvec3(p.y >= a.y, 
-                            p.y < b.y, 
-                            ab.x * pa.y > ab.y * pa.x);
-                if (all(cond) || all(not(cond))) s = -s;
-                if (abs(d) < abs(clipAmount)) {
-                    clipAmount = d;
-                }
+        float clipAmount = czm_infinity;
+        vec4 extents = getExtents(polygonExtentsIndex);
+        vec2 textureOffset = vec2(mod(float(polygonExtentsIndex), dimension), floor(float(polygonExtentsIndex) / dimension)) / dimension;
+        vec2 p = getCoordinates((v_textureCoordinates - textureOffset) * dimension, extents);   // current pixel position
+
+        // Only consider polygons whos boundingbox includes current pixel (with a slight padding)
+        float padding = 0.05;   // 5% of polygon extents
+        float polygonNorth = polygonExtent.x + polygonExtent.z;
+        float polygonEast = polygonExtent.y + polygonExtent.w;
+        float latPadding = padding * polygonExtent.z; // padding as fraction of latitude range
+        float lonPadding = padding * polygonExtent.w; // padding as fraction of longitude range
+        if (p.x < polygonExtent.x - latPadding || p.x > polygonNorth + latPadding ||
+            p.y < polygonExtent.y - lonPadding || p.y > polygonEast + lonPadding) {
+            lastPolygonIndex += positionsLength;
+            continue;   // skip to next
+        }
+
+        float s = 1.0;
+
+        // Check each edge for absolute distance.
+        // Cache the previous vertex to halve the texture reads per iteration.
+        vec2 prev = getPolygonPosition(lastPolygonIndex + positionsLength - 1);
+        for (int i = 0; i < positionsLength; i++) {
+            vec2 a = getPolygonPosition(lastPolygonIndex + i);
+            vec2 b = prev;
+            prev = a;
+
+            vec2 ab = b - a;
+            vec2 pa = p - a;
+            float t = dot(pa, ab) / dot(ab, ab);
+            t = clamp(t, 0.0, 1.0);
+
+            vec2 pq = pa - t * ab;
+            float d = length(pq);
+
+            // Inside / outside computation to determine sign
+            bvec3 cond = bvec3(p.y >= a.y, 
+                        p.y < b.y, 
+                        ab.x * pa.y > ab.y * pa.x);
+            if (all(cond) || all(not(cond))) s = -s;
+            if (abs(d) < abs(clipAmount)) {
+                clipAmount = d;
             }
+        }
 
-            // Normalize the range to [0,1]
-            vec4 result = (s * vec4(clipAmount * length(extents.zw))) / 2.0 + 0.5;
-            // In the case where we've iterated through multiple polygons, take the minimum
-            out_FragColor = min(out_FragColor, result);
-         }
+        // Normalize the range to [0,1]
+        vec4 result = (s * vec4(clipAmount * length(extents.zw))) / 2.0 + 0.5;
+        // In the case where we've iterated through multiple polygons, take the minimum
+        out_FragColor = min(out_FragColor, result);
 
         lastPolygonIndex += positionsLength;
     }

package/Source/Shaders/PolygonSignedDistanceFS.js

@@ -52,49 +52,80 @@ void main() {\n\
         dimension = ceil(log2(float(u_extentsLength)));\n\
     }\n\
     int regionIndex = getPolygonIndex(dimension, v_textureCoordinates);\n\
+\n\
+    if (regionIndex >= u_extentsLength) {\n\
+        return; // done (no polygons in this region)\n\
+    }\n\
 \n\
     for (int polygonIndex = 0; polygonIndex < u_polygonsLength; polygonIndex++) {\n\
         ivec2 positionsLengthAndExtents = getPositionsLengthAndExtentsIndex(lastPolygonIndex);\n\
         int positionsLength = positionsLengthAndExtents.x;\n\
         int polygonExtentsIndex = positionsLengthAndExtents.y;\n\
         lastPolygonIndex += 1;\n\
+\n\
+        // Read the individual polygon extent (2 pixels: south/west, latRange/lonRange)\n\
+        vec2 extentsSouthWest = getPolygonPosition(lastPolygonIndex);\n\
+        vec2 extentsRange = getPolygonPosition(lastPolygonIndex + 1);\n\
+        vec4 polygonExtent = vec4(extentsSouthWest, extentsRange);\n\
+        lastPolygonIndex += 2;\n\
+\n\
+        if (polygonExtentsIndex < regionIndex) {\n\
+            lastPolygonIndex += positionsLength;\n\
+            continue; // skip to next (TODO: could optimize further if we knew how many polygons to skip)\n\
+        } else if (polygonExtentsIndex > regionIndex) {\n\
+            break; // done (we know polygons are sorted by regionIndex)\n\
+        }\n\
 \n\
          // Only compute signed distance for the relevant part of the atlas\n\
-         if (polygonExtentsIndex == regionIndex) {\n\
-            float clipAmount = czm_infinity;\n\
-            vec4 extents = getExtents(polygonExtentsIndex);\n\
-            vec2 textureOffset = vec2(mod(float(polygonExtentsIndex), dimension), floor(float(polygonExtentsIndex) / dimension)) / dimension;\n\
-            vec2 p = getCoordinates((v_textureCoordinates - textureOffset) * dimension, extents);\n\
-            float s = 1.0;\n\
-\n\
-            // Check each edge for absolute distance\n\
-            for (int i = 0, j = positionsLength - 1; i < positionsLength; j = i, i++) {\n\
-                vec2 a = getPolygonPosition(lastPolygonIndex + i);\n\
-                vec2 b = getPolygonPosition(lastPolygonIndex + j);\n\
- \n\
-                vec2 ab = b - a;\n\
-                vec2 pa = p - a;\n\
-                float t = dot(pa, ab) / dot(ab, ab);\n\
-                t = clamp(t, 0.0, 1.0);\n\
-\n\
-                vec2 pq = pa - t * ab;\n\
-                float d = length(pq);\n\
-\n\
-                // Inside / outside computation to determine sign\n\
-                bvec3 cond = bvec3(p.y >= a.y, \n\
-                            p.y < b.y, \n\
-                            ab.x * pa.y > ab.y * pa.x);\n\
-                if (all(cond) || all(not(cond))) s = -s;\n\
-                if (abs(d) < abs(clipAmount)) {\n\
-                    clipAmount = d;\n\
-                }\n\
+        float clipAmount = czm_infinity;\n\
+        vec4 extents = getExtents(polygonExtentsIndex);\n\
+        vec2 textureOffset = vec2(mod(float(polygonExtentsIndex), dimension), floor(float(polygonExtentsIndex) / dimension)) / dimension;\n\
+        vec2 p = getCoordinates((v_textureCoordinates - textureOffset) * dimension, extents);   // current pixel position\n\
+\n\
+        // Only consider polygons whos boundingbox includes current pixel (with a slight padding)\n\
+        float padding = 0.05;   // 5% of polygon extents\n\
+        float polygonNorth = polygonExtent.x + polygonExtent.z;\n\
+        float polygonEast = polygonExtent.y + polygonExtent.w;\n\
+        float latPadding = padding * polygonExtent.z; // padding as fraction of latitude range\n\
+        float lonPadding = padding * polygonExtent.w; // padding as fraction of longitude range\n\
+        if (p.x < polygonExtent.x - latPadding || p.x > polygonNorth + latPadding ||\n\
+            p.y < polygonExtent.y - lonPadding || p.y > polygonEast + lonPadding) {\n\
+            lastPolygonIndex += positionsLength;\n\
+            continue;   // skip to next\n\
+        }\n\
+\n\
+        float s = 1.0;\n\
+\n\
+        // Check each edge for absolute distance.\n\
+        // Cache the previous vertex to halve the texture reads per iteration.\n\
+        vec2 prev = getPolygonPosition(lastPolygonIndex + positionsLength - 1);\n\
+        for (int i = 0; i < positionsLength; i++) {\n\
+            vec2 a = getPolygonPosition(lastPolygonIndex + i);\n\
+            vec2 b = prev;\n\
+            prev = a;\n\
+\n\
+            vec2 ab = b - a;\n\
+            vec2 pa = p - a;\n\
+            float t = dot(pa, ab) / dot(ab, ab);\n\
+            t = clamp(t, 0.0, 1.0);\n\
+\n\
+            vec2 pq = pa - t * ab;\n\
+            float d = length(pq);\n\
+\n\
+            // Inside / outside computation to determine sign\n\
+            bvec3 cond = bvec3(p.y >= a.y, \n\
+                        p.y < b.y, \n\
+                        ab.x * pa.y > ab.y * pa.x);\n\
+            if (all(cond) || all(not(cond))) s = -s;\n\
+            if (abs(d) < abs(clipAmount)) {\n\
+                clipAmount = d;\n\
             }\n\
+        }\n\
 \n\
-            // Normalize the range to [0,1]\n\
-            vec4 result = (s * vec4(clipAmount * length(extents.zw))) / 2.0 + 0.5;\n\
-            // In the case where we've iterated through multiple polygons, take the minimum\n\
-            out_FragColor = min(out_FragColor, result);\n\
-         }\n\
+        // Normalize the range to [0,1]\n\
+        vec4 result = (s * vec4(clipAmount * length(extents.zw))) / 2.0 + 0.5;\n\
+        // In the case where we've iterated through multiple polygons, take the minimum\n\
+        out_FragColor = min(out_FragColor, result);\n\
 \n\
         lastPolygonIndex += positionsLength;\n\
     }\n\

package/Source/Shaders/PrimitiveGaussianSplatVS.glsl

@@ -142,7 +142,14 @@ highp vec4 discardVec = vec4(0.0, 0.0, 2.0, 1.0);
 
 void main() {
     uint texIdx = uint(a_splatIndex);
-    ivec2 posCoord = ivec2((texIdx & 0x3ffu) << 1, texIdx >> 10);
+    // u_splatRowMask and u_splatRowShift encode the row width of the splat
+    // attribute texture. The texture width is always maximumTextureSize, which
+    // varies by GPU, so these are passed as uniforms rather than constants.
+    //   rowMask  = maximumTextureSize/2 - 1
+    //   rowShift = log2(maximumTextureSize/2)
+    uint rowMask = uint(u_splatRowMask);
+    uint rowShift = uint(u_splatRowShift);
+    ivec2 posCoord = ivec2(int((texIdx & rowMask) << 1), int(texIdx >> rowShift));
     vec4 splatPosition = vec4( uintBitsToFloat(uvec4(texelFetch(u_splatAttributeTexture, posCoord, 0))) );
 
     vec4 splatViewPos = czm_modelView * vec4(splatPosition.xyz, 1.0);
@@ -155,7 +162,7 @@ void main() {
         return;
     }
 
-    ivec2 covCoord = ivec2(((texIdx & 0x3ffu) << 1) | 1u, texIdx >> 10);
+    ivec2 covCoord = ivec2(int(((texIdx & rowMask) << 1) | 1u), int(texIdx >> rowShift));
     uvec4 covariance = uvec4(texelFetch(u_splatAttributeTexture, covCoord, 0));
 
     gl_Position = clipPosition;

package/Source/Shaders/PrimitiveGaussianSplatVS.js

@@ -143,7 +143,14 @@ highp vec4 discardVec = vec4(0.0, 0.0, 2.0, 1.0);\n\
 \n\
 void main() {\n\
     uint texIdx = uint(a_splatIndex);\n\
-    ivec2 posCoord = ivec2((texIdx & 0x3ffu) << 1, texIdx >> 10);\n\
+    // u_splatRowMask and u_splatRowShift encode the row width of the splat\n\
+    // attribute texture. The texture width is always maximumTextureSize, which\n\
+    // varies by GPU, so these are passed as uniforms rather than constants.\n\
+    //   rowMask  = maximumTextureSize/2 - 1\n\
+    //   rowShift = log2(maximumTextureSize/2)\n\
+    uint rowMask = uint(u_splatRowMask);\n\
+    uint rowShift = uint(u_splatRowShift);\n\
+    ivec2 posCoord = ivec2(int((texIdx & rowMask) << 1), int(texIdx >> rowShift));\n\
     vec4 splatPosition = vec4( uintBitsToFloat(uvec4(texelFetch(u_splatAttributeTexture, posCoord, 0))) );\n\
 \n\
     vec4 splatViewPos = czm_modelView * vec4(splatPosition.xyz, 1.0);\n\
@@ -156,7 +163,7 @@ void main() {\n\
         return;\n\
     }\n\
 \n\
-    ivec2 covCoord = ivec2(((texIdx & 0x3ffu) << 1) | 1u, texIdx >> 10);\n\
+    ivec2 covCoord = ivec2(int(((texIdx & rowMask) << 1) | 1u), int(texIdx >> rowShift));\n\
     uvec4 covariance = uvec4(texelFetch(u_splatAttributeTexture, covCoord, 0));\n\
 \n\
     gl_Position = clipPosition;\n\

package/Source/Shaders/Voxels/VoxelFS.glsl

@@ -213,7 +213,7 @@ void main()
         if (step.w == 0.0) {
             // Shape is infinitely thin. The ray may have hit the edge of a
             // foreground voxel. Step ahead slightly to check for more voxels
-            step.w == 0.00001;
+            step.w = 0.001;
         }
 
         // Keep raymarching

package/Source/Shaders/Voxels/VoxelFS.js

@@ -214,7 +214,7 @@ void main()\n\
         if (step.w == 0.0) {\n\
             // Shape is infinitely thin. The ray may have hit the edge of a\n\
             // foreground voxel. Step ahead slightly to check for more voxels\n\
-            step.w == 0.00001;\n\
+            step.w = 0.001;\n\
         }\n\
 \n\
         // Keep raymarching\n\

package/Source/Workers/decodeDraco.js

@@ -1,3 +1,6 @@
+// Draco API uses many capitalized non-constructor methods.
+/* eslint-disable new-cap */
+
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import IndexDatatype from "../Core/IndexDatatype.js";

package/Source/Workers/decodeI3S.js

@@ -1,3 +1,6 @@
+// Draco API uses many capitalized non-constructor methods.
+/* eslint-disable new-cap */
+
 import createTaskProcessorWorker from "./createTaskProcessorWorker.js";
 import defined from "../Core/defined.js";
 import WebMercatorProjection from "../Core/WebMercatorProjection.js";
@@ -808,8 +811,8 @@ function generateGltfBuffer(
     componentType: 5126,
     count: meshPositions.length / 3,
     type: "VEC3",
-    max: [minX, minY, minZ],
-    min: [maxX, maxY, maxZ],
+    min: [minX, minY, minZ],
+    max: [maxX, maxY, maxZ],
   });
 
   // NORMALS