@cesium/engine 23.0.1 → 25.0.0

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/Shaders/Voxels/convertLocalToBoxUv.glsl

@@ -1,5 +1,4 @@
 uniform vec3 u_boxLocalToShapeUvScale;
-uniform vec3 u_boxLocalToShapeUvTranslate;
 
 uniform ivec4 u_cameraTileCoordinates;
 uniform vec3 u_cameraTileUv;

package/Source/Shaders/Voxels/convertLocalToBoxUv.js

@@ -1,6 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform vec3 u_boxLocalToShapeUvScale;\n\
-uniform vec3 u_boxLocalToShapeUvTranslate;\n\
 \n\
 uniform ivec4 u_cameraTileCoordinates;\n\
 uniform vec3 u_cameraTileUv;\n\

package/Source/Shaders/Voxels/convertLocalToCylinderUv.glsl

@@ -1,6 +1,4 @@
-uniform vec2 u_cylinderLocalToShapeUvRadius; // x = scale, y = offset
-uniform vec2 u_cylinderLocalToShapeUvHeight; // x = scale, y = offset
-uniform vec2 u_cylinderLocalToShapeUvAngle; // x = scale, y = offset
+uniform vec3 u_cylinderLocalToShapeUvScale; // x = radius scale, y = angle scale, z = height scale
 uniform float u_cylinderShapeUvAngleRangeOrigin;
 uniform mat3 u_cylinderEcToRadialTangentUp;
 uniform ivec4 u_cameraTileCoordinates;
@@ -15,9 +13,9 @@ mat3 convertLocalToShapeSpaceDerivative(in vec3 position) {
 }
 
 vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
-    float radius = shapeUv.x / u_cylinderLocalToShapeUvRadius.x;
-    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvAngle.x;
-    float height = shapeUv.z / u_cylinderLocalToShapeUvHeight.x;
+    float radius = shapeUv.x / u_cylinderLocalToShapeUvScale.x;
+    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvScale.y;
+    float height = shapeUv.z / u_cylinderLocalToShapeUvScale.z;
 
     return vec3(radius, angle, height);
 }
@@ -49,7 +47,7 @@ vec3 convertEcToDeltaShape(in vec3 positionEC) {
 vec3 convertEcToDeltaTile(in vec3 positionEC) {
     vec3 deltaShape = convertEcToDeltaShape(positionEC);
     // Convert to tileset coordinates in [0, 1]
-    float dx = u_cylinderLocalToShapeUvRadius.x * deltaShape.x;
+    float dx = u_cylinderLocalToShapeUvScale.x * deltaShape.x;
     float dy = deltaShape.y / czm_twoPi;
 #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
     // Wrap to ensure dy is not crossing through the unoccupied angle range, where
@@ -60,8 +58,8 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {
     float rotation = floor(rawOutputUvAngle);
     dy -= rotation;
 #endif
-    dy *= u_cylinderLocalToShapeUvAngle.x;
-    float dz = u_cylinderLocalToShapeUvHeight.x * deltaShape.z;
+    dy *= u_cylinderLocalToShapeUvScale.y;
+    float dz = u_cylinderLocalToShapeUvScale.z * deltaShape.z;
     // Convert to tile coordinate changes
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);
 }

package/Source/Shaders/Voxels/convertLocalToCylinderUv.js

@@ -1,7 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "uniform vec2 u_cylinderLocalToShapeUvRadius; // x = scale, y = offset\n\
-uniform vec2 u_cylinderLocalToShapeUvHeight; // x = scale, y = offset\n\
-uniform vec2 u_cylinderLocalToShapeUvAngle; // x = scale, y = offset\n\
+export default "uniform vec3 u_cylinderLocalToShapeUvScale; // x = radius scale, y = angle scale, z = height scale\n\
 uniform float u_cylinderShapeUvAngleRangeOrigin;\n\
 uniform mat3 u_cylinderEcToRadialTangentUp;\n\
 uniform ivec4 u_cameraTileCoordinates;\n\
@@ -16,9 +14,9 @@ mat3 convertLocalToShapeSpaceDerivative(in vec3 position) {\n\
 }\n\
 \n\
 vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
-    float radius = shapeUv.x / u_cylinderLocalToShapeUvRadius.x;\n\
-    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvAngle.x;\n\
-    float height = shapeUv.z / u_cylinderLocalToShapeUvHeight.x;\n\
+    float radius = shapeUv.x / u_cylinderLocalToShapeUvScale.x;\n\
+    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvScale.y;\n\
+    float height = shapeUv.z / u_cylinderLocalToShapeUvScale.z;\n\
 \n\
     return vec3(radius, angle, height);\n\
 }\n\
@@ -50,7 +48,7 @@ vec3 convertEcToDeltaShape(in vec3 positionEC) {\n\
 vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     vec3 deltaShape = convertEcToDeltaShape(positionEC);\n\
     // Convert to tileset coordinates in [0, 1]\n\
-    float dx = u_cylinderLocalToShapeUvRadius.x * deltaShape.x;\n\
+    float dx = u_cylinderLocalToShapeUvScale.x * deltaShape.x;\n\
     float dy = deltaShape.y / czm_twoPi;\n\
 #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
     // Wrap to ensure dy is not crossing through the unoccupied angle range, where\n\
@@ -61,8 +59,8 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     float rotation = floor(rawOutputUvAngle);\n\
     dy -= rotation;\n\
 #endif\n\
-    dy *= u_cylinderLocalToShapeUvAngle.x;\n\
-    float dz = u_cylinderLocalToShapeUvHeight.x * deltaShape.z;\n\
+    dy *= u_cylinderLocalToShapeUvScale.y;\n\
+    float dz = u_cylinderLocalToShapeUvScale.z * deltaShape.z;\n\
     // Convert to tile coordinate changes\n\
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);\n\
 }\n\

package/Source/Shaders/Voxels/convertLocalToEllipsoidUv.glsl

@@ -1,8 +1,5 @@
 /* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE
 */
 
@@ -12,17 +9,10 @@ uniform mat3 u_ellipsoidEcToEastNorthUp;
 uniform vec3 u_ellipsoidRadii;
 uniform vec2 u_evoluteScale; // (radii.x ^ 2 - radii.z ^ 2) * vec2(1.0, -1.0) / radii;
 uniform vec3 u_ellipsoidInverseRadiiSquared;
-#if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY) || defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED)
-    uniform vec3 u_ellipsoidShapeUvLongitudeMinMaxMid;
-#endif
 #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
-    uniform vec2 u_ellipsoidLocalToShapeUvLongitude; // x = scale, y = offset
     uniform float u_ellipsoidShapeUvLongitudeRangeOrigin;
 #endif
-#if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
-    uniform vec2 u_ellipsoidLocalToShapeUvLatitude; // x = scale, y = offset
-#endif
-uniform float u_ellipsoidInverseHeightDifference;
+uniform vec3 u_ellipsoidLocalToShapeUvScale; // x = longitude scale, y = latitude scale, z = height scale
 
 uniform ivec4 u_cameraTileCoordinates;
 uniform vec3 u_cameraTileUv;
@@ -82,16 +72,16 @@ vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
     // Convert from [0, 1] to radians [-pi, pi]
     float longitude = shapeUv.x * czm_twoPi;
     #if defined (ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
-        longitude /= u_ellipsoidLocalToShapeUvLongitude.x;
+        longitude /= u_ellipsoidLocalToShapeUvScale.x;
     #endif
 
     // Convert from [0, 1] to radians [-pi/2, pi/2]
     float latitude = shapeUv.y * czm_pi;
     #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
-        latitude /= u_ellipsoidLocalToShapeUvLatitude.x;
+        latitude /= u_ellipsoidLocalToShapeUvScale.y;
     #endif
 
-    float height = shapeUv.z / u_ellipsoidInverseHeightDifference;
+    float height = shapeUv.z / u_ellipsoidLocalToShapeUvScale.z;
 
     return vec3(longitude, latitude, height);
 }
@@ -149,15 +139,15 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {
     float rawOutputUvLongitude = cameraUvLongitudeShift + dx;
     float rotation = floor(rawOutputUvLongitude);
     dx -= rotation;
-    dx *= u_ellipsoidLocalToShapeUvLongitude.x;
+    dx *= u_ellipsoidLocalToShapeUvScale.x;
 #endif
 
     float dy = deltaShape.y / czm_pi;
 #if (defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE))
-    dy *= u_ellipsoidLocalToShapeUvLatitude.x;
+    dy *= u_ellipsoidLocalToShapeUvScale.y;
 #endif
 
-    float dz = u_ellipsoidInverseHeightDifference * deltaShape.z;
+    float dz = u_ellipsoidLocalToShapeUvScale.z * deltaShape.z;
     // Convert to tile coordinate changes
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);
 }

package/Source/Shaders/Voxels/convertLocalToEllipsoidUv.js

@@ -1,9 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)\n\
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY\n\
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE\n\
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE\n\
 */\n\
 \n\
@@ -13,17 +10,10 @@ uniform mat3 u_ellipsoidEcToEastNorthUp;\n\
 uniform vec3 u_ellipsoidRadii;\n\
 uniform vec2 u_evoluteScale; // (radii.x ^ 2 - radii.z ^ 2) * vec2(1.0, -1.0) / radii;\n\
 uniform vec3 u_ellipsoidInverseRadiiSquared;\n\
-#if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY) || defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED)\n\
-    uniform vec3 u_ellipsoidShapeUvLongitudeMinMaxMid;\n\
-#endif\n\
 #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)\n\
-    uniform vec2 u_ellipsoidLocalToShapeUvLongitude; // x = scale, y = offset\n\
     uniform float u_ellipsoidShapeUvLongitudeRangeOrigin;\n\
 #endif\n\
-#if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)\n\
-    uniform vec2 u_ellipsoidLocalToShapeUvLatitude; // x = scale, y = offset\n\
-#endif\n\
-uniform float u_ellipsoidInverseHeightDifference;\n\
+uniform vec3 u_ellipsoidLocalToShapeUvScale; // x = longitude scale, y = latitude scale, z = height scale\n\
 \n\
 uniform ivec4 u_cameraTileCoordinates;\n\
 uniform vec3 u_cameraTileUv;\n\
@@ -83,16 +73,16 @@ vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
     // Convert from [0, 1] to radians [-pi, pi]\n\
     float longitude = shapeUv.x * czm_twoPi;\n\
     #if defined (ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)\n\
-        longitude /= u_ellipsoidLocalToShapeUvLongitude.x;\n\
+        longitude /= u_ellipsoidLocalToShapeUvScale.x;\n\
     #endif\n\
 \n\
     // Convert from [0, 1] to radians [-pi/2, pi/2]\n\
     float latitude = shapeUv.y * czm_pi;\n\
     #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)\n\
-        latitude /= u_ellipsoidLocalToShapeUvLatitude.x;\n\
+        latitude /= u_ellipsoidLocalToShapeUvScale.y;\n\
     #endif\n\
 \n\
-    float height = shapeUv.z / u_ellipsoidInverseHeightDifference;\n\
+    float height = shapeUv.z / u_ellipsoidLocalToShapeUvScale.z;\n\
 \n\
     return vec3(longitude, latitude, height);\n\
 }\n\
@@ -150,15 +140,15 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     float rawOutputUvLongitude = cameraUvLongitudeShift + dx;\n\
     float rotation = floor(rawOutputUvLongitude);\n\
     dx -= rotation;\n\
-    dx *= u_ellipsoidLocalToShapeUvLongitude.x;\n\
+    dx *= u_ellipsoidLocalToShapeUvScale.x;\n\
 #endif\n\
 \n\
     float dy = deltaShape.y / czm_pi;\n\
 #if (defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE))\n\
-    dy *= u_ellipsoidLocalToShapeUvLatitude.x;\n\
+    dy *= u_ellipsoidLocalToShapeUvScale.y;\n\
 #endif\n\
 \n\
-    float dz = u_ellipsoidInverseHeightDifference * deltaShape.z;\n\
+    float dz = u_ellipsoidLocalToShapeUvScale.z * deltaShape.z;\n\
     // Convert to tile coordinate changes\n\
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);\n\
 }\n\

package/Source/Widget/CesiumWidget.js

@@ -33,6 +33,7 @@ import SkyBox from "../Scene/SkyBox.js";
 import Sun from "../Scene/Sun.js";
 import TimeDynamicPointCloud from "../Scene/TimeDynamicPointCloud.js";
 import VoxelPrimitive from "../Scene/VoxelPrimitive.js";
+import BufferPrimitiveCollection from "../Scene/BufferPrimitiveCollection.js";
 
 function trackDataSourceClock(clock, dataSource) {
   if (defined(dataSource)) {
@@ -1241,7 +1242,7 @@ CesiumWidget.prototype._onDataSourceRemoved = function (
  * target will be the range. The heading will be determined from the offset. If the heading cannot be
  * determined from the offset, the heading will be north.</p>
  *
- * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
+ * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive|BufferPrimitiveCollection<BufferPrimitive>>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
  * @param {HeadingPitchRange} [offset] The offset from the center of the entity in the local east-north-up reference frame.
  * @returns {Promise<boolean>} A Promise that resolves to true if the zoom was successful or false if the target is not currently visualized in the scene or the zoom was cancelled.
  */
@@ -1267,7 +1268,7 @@ CesiumWidget.prototype.zoomTo = function (target, offset) {
  * target will be the range. The heading will be determined from the offset. If the heading cannot be
  * determined from the offset, the heading will be north.</p>
  *
- * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
+ * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive|BufferPrimitiveCollection<BufferPrimitive>>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
  * @param {object} [options] Object with the following properties:
  * @param {number} [options.duration=3.0] The duration of the flight in seconds.
  * @param {number} [options.maximumHeight] The maximum height at the peak of the flight.
@@ -1336,7 +1337,8 @@ function zoomToOrFly(that, zoomTarget, options, isFlight) {
     if (
       zoomTarget instanceof Cesium3DTileset ||
       zoomTarget instanceof TimeDynamicPointCloud ||
-      zoomTarget instanceof VoxelPrimitive
+      zoomTarget instanceof VoxelPrimitive ||
+      zoomTarget instanceof BufferPrimitiveCollection
     ) {
       that._zoomTarget = zoomTarget;
       return;
@@ -1439,7 +1441,7 @@ function updateZoomTarget(widget) {
     };
 
     if (widget._zoomIsFlight) {
-      camera.flyToBoundingSphere(target.boundingSphere, options);
+      camera.flyToBoundingSphere(boundingSphere, options);
     } else {
       camera.viewBoundingSphere(boundingSphere, zoomOptions.offset);
       camera.lookAtTransform(Matrix4.IDENTITY);
@@ -1472,6 +1474,11 @@ function updateZoomTarget(widget) {
     return;
   }
 
+  if (target instanceof BufferPrimitiveCollection) {
+    zoomToBoundingSphere(target.boundingVolume);
+    return;
+  }
+
   // If zoomTarget was an ImageryLayer
   if (target instanceof Cartographic) {
     options = {

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