@cesium/engine 22.2.0 → 23.0.0

package/Source/Shaders/Voxels/Octree.glsl

@@ -44,10 +44,6 @@ struct SampleData {
     #endif
 };
 
-// Integer mod: For WebGL1 only
-int intMod(in int a, in int b) {
-    return a - (b * (a / b));
-}
 int normU8_toInt(in float value) {
     return int(value * 255.0);
 }
@@ -69,14 +65,14 @@ OctreeNodeData getOctreeNodeData(in vec2 octreeUv) {
 
 OctreeNodeData getOctreeChildData(in int parentOctreeIndex, in ivec3 childCoord) {
     int childIndex = childCoord.z * 4 + childCoord.y * 2 + childCoord.x;
-    int octreeCoordX = intMod(parentOctreeIndex, u_octreeInternalNodeTilesPerRow) * 9 + 1 + childIndex;
+    int octreeCoordX = (parentOctreeIndex % u_octreeInternalNodeTilesPerRow) * 9 + 1 + childIndex;
     int octreeCoordY = parentOctreeIndex / u_octreeInternalNodeTilesPerRow;
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);
     return getOctreeNodeData(octreeUv);
 }
 
 int getOctreeParentIndex(in int octreeIndex) {
-    int octreeCoordX = intMod(octreeIndex, u_octreeInternalNodeTilesPerRow) * 9;
+    int octreeCoordX = (octreeIndex % u_octreeInternalNodeTilesPerRow) * 9;
     int octreeCoordY = octreeIndex / u_octreeInternalNodeTilesPerRow;
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);
     vec4 parentData = texture(u_octreeInternalNodeTexture, octreeUv);
@@ -106,8 +102,9 @@ void addSampleCoordinates(in TileAndUvCoordinate tileAndUv, inout SampleData sam
 #if defined(Y_UP_METADATA_ORDER)
 #if defined(SHAPE_BOX)
     float inputY = inputCoordinate.y;
-    inputCoordinate.y = float(u_inputDimensions.y) - inputCoordinate.z;
-    inputCoordinate.z = inputY;
+    inputCoordinate.y = inputCoordinate.z;
+    // u_inputDimensions.z is the y-up dimension along the 3D Tiles y-axis.
+    inputCoordinate.z = float(u_inputDimensions.z) - inputY;
 #elif defined(SHAPE_CYLINDER)
     float angle = inputCoordinate.y;
     float height = inputCoordinate.z;
@@ -139,7 +136,7 @@ void getOctreeLeafSampleDatas(in OctreeNodeData data, in ivec4 octreeCoords, out
     int leafIndex = data.data;
     int leafNodeTexelCount = 2;
     // Adding 0.5 moves to the center of the texel
-    float leafCoordXStart = float(intMod(leafIndex, u_octreeLeafNodeTilesPerRow) * leafNodeTexelCount) + 0.5;
+    float leafCoordXStart = float((leafIndex % u_octreeLeafNodeTilesPerRow) * leafNodeTexelCount) + 0.5;
     float leafCoordY = float(leafIndex / u_octreeLeafNodeTilesPerRow) + 0.5;
 
     // Get an interpolation weight and a flag to determine whether to read the parent texture

package/Source/Shaders/Voxels/Octree.js

@@ -45,10 +45,6 @@ struct SampleData {\n\
     #endif\n\
 };\n\
 \n\
-// Integer mod: For WebGL1 only\n\
-int intMod(in int a, in int b) {\n\
-    return a - (b * (a / b));\n\
-}\n\
 int normU8_toInt(in float value) {\n\
     return int(value * 255.0);\n\
 }\n\
@@ -70,14 +66,14 @@ OctreeNodeData getOctreeNodeData(in vec2 octreeUv) {\n\
 \n\
 OctreeNodeData getOctreeChildData(in int parentOctreeIndex, in ivec3 childCoord) {\n\
     int childIndex = childCoord.z * 4 + childCoord.y * 2 + childCoord.x;\n\
-    int octreeCoordX = intMod(parentOctreeIndex, u_octreeInternalNodeTilesPerRow) * 9 + 1 + childIndex;\n\
+    int octreeCoordX = (parentOctreeIndex % u_octreeInternalNodeTilesPerRow) * 9 + 1 + childIndex;\n\
     int octreeCoordY = parentOctreeIndex / u_octreeInternalNodeTilesPerRow;\n\
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);\n\
     return getOctreeNodeData(octreeUv);\n\
 }\n\
 \n\
 int getOctreeParentIndex(in int octreeIndex) {\n\
-    int octreeCoordX = intMod(octreeIndex, u_octreeInternalNodeTilesPerRow) * 9;\n\
+    int octreeCoordX = (octreeIndex % u_octreeInternalNodeTilesPerRow) * 9;\n\
     int octreeCoordY = octreeIndex / u_octreeInternalNodeTilesPerRow;\n\
     vec2 octreeUv = u_octreeInternalNodeTexelSizeUv * vec2(float(octreeCoordX) + 0.5, float(octreeCoordY) + 0.5);\n\
     vec4 parentData = texture(u_octreeInternalNodeTexture, octreeUv);\n\
@@ -107,8 +103,9 @@ void addSampleCoordinates(in TileAndUvCoordinate tileAndUv, inout SampleData sam
 #if defined(Y_UP_METADATA_ORDER)\n\
 #if defined(SHAPE_BOX)\n\
     float inputY = inputCoordinate.y;\n\
-    inputCoordinate.y = float(u_inputDimensions.y) - inputCoordinate.z;\n\
-    inputCoordinate.z = inputY;\n\
+    inputCoordinate.y = inputCoordinate.z;\n\
+    // u_inputDimensions.z is the y-up dimension along the 3D Tiles y-axis.\n\
+    inputCoordinate.z = float(u_inputDimensions.z) - inputY;\n\
 #elif defined(SHAPE_CYLINDER)\n\
     float angle = inputCoordinate.y;\n\
     float height = inputCoordinate.z;\n\
@@ -140,7 +137,7 @@ void getOctreeLeafSampleDatas(in OctreeNodeData data, in ivec4 octreeCoords, out
     int leafIndex = data.data;\n\
     int leafNodeTexelCount = 2;\n\
     // Adding 0.5 moves to the center of the texel\n\
-    float leafCoordXStart = float(intMod(leafIndex, u_octreeLeafNodeTilesPerRow) * leafNodeTexelCount) + 0.5;\n\
+    float leafCoordXStart = float((leafIndex % u_octreeLeafNodeTilesPerRow) * leafNodeTexelCount) + 0.5;\n\
     float leafCoordY = float(leafIndex / u_octreeLeafNodeTilesPerRow) + 0.5;\n\
 \n\
     // Get an interpolation weight and a flag to determine whether to read the parent texture\n\

package/Source/Widget/CesiumWidget.js

@@ -175,7 +175,7 @@ function configureCameraFrustum(widget) {
  *
  * @exception {DeveloperError} Element with id "container" does not exist in the document.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Cesium%20Widget.html|Cesium Sandcastle Cesium Widget Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=cesium-widget|Cesium Sandcastle Cesium Widget Demo}
  *
  * @example
  * // For each example, include a link to CesiumWidget.css stylesheet in HTML head,

package/Source/Workers/incrementallyBuildTerrainPicker.js

@@ -12,6 +12,9 @@ const scratchTrianglePoints = [
 ];
 const scratchTriangleAABB = new AxisAlignedBoundingBox();
 
+const TILE_AABB_MAX = new Cartesian3(0.5, 0.5, 0.5);
+const TILE_AABB_MIN = new Cartesian3(-0.5, -0.5, -0.5);
+
 /**
  * Builds the next layer of the terrain picker's quadtree by determining which triangles intersect
  * each of the four child nodes. (Essentially distributing the parent's triangles to its children.)
@@ -42,7 +45,7 @@ function incrementallyBuildTerrainPicker(parameters, transferableObjects) {
   );
 
   const triangleIndices = new Uint32Array(parameters.triangleIndices);
-  const trianglePositions = new Float32Array(parameters.trianglePositions);
+  const trianglePositions = new Float64Array(parameters.trianglePositions);
   const intersectingTrianglesArrays = Array.from({ length: 4 }, () => []);
 
   for (let j = 0; j < triangleIndices.length; j++) {
@@ -102,7 +105,18 @@ function createAABBFromTriangle(inverseTransform, trianglePoints) {
     trianglePoints[2],
   );
 
-  return AxisAlignedBoundingBox.fromPoints(trianglePoints, scratchTriangleAABB);
+  const aabb = AxisAlignedBoundingBox.fromPoints(
+    trianglePoints,
+    scratchTriangleAABB,
+  );
+
+  // In 2D mode, sometimes the height-scale of a tile is 0. See {@link TerrainMesh#computeTransform2D}.
+  // This makes the inverseTransform degenerate, so we set the height-scale to 1 to be prevent that. However, this is artificial and
+  // can lead to the triangle's AABB extending beyond the (height) bounds of the tile's AABB.
+  // Thus, we clamp the triangle's AABB to the tile's local-space AABB.
+  Cartesian3.clamp(aabb.minimum, TILE_AABB_MIN, TILE_AABB_MAX, aabb.minimum);
+  Cartesian3.clamp(aabb.maximum, TILE_AABB_MIN, TILE_AABB_MAX, aabb.maximum);
+  return aabb;
 }
 
 export default createTaskProcessorWorker(incrementallyBuildTerrainPicker);