@cesium/engine 22.1.0 → 22.3.0

package/Source/Shaders/Voxels/Megatexture.glsl

@@ -1,104 +1,36 @@
-// See Octree.glsl for the definitions of SampleData and intMod
+// See Octree.glsl for the definitions of SampleData
 
 /* Megatexture defines (set in Scene/VoxelRenderResources.js)
 #define SAMPLE_COUNT ###
-#define NEAREST_SAMPLING
 #define PADDING
 */
 
-uniform ivec2 u_megatextureSliceDimensions; // number of slices per tile, in two dimensions
-uniform ivec2 u_megatextureTileDimensions; // number of tiles per megatexture, in two dimensions
-uniform vec2 u_megatextureVoxelSizeUv;
-uniform vec2 u_megatextureSliceSizeUv;
-uniform vec2 u_megatextureTileSizeUv;
+uniform ivec3 u_megatextureTileCounts; // number of tiles in the megatexture, along each axis
 
-// Integer min, max, clamp: For WebGL1 only
-int intMin(int a, int b) {
-    return a <= b ? a : b;
-}
-int intMax(int a, int b) {
-    return a >= b ? a : b;
-}
-int intClamp(int v, int minVal, int maxVal) {
-    return intMin(intMax(v, minVal), maxVal);
-}
-
-vec2 index1DTo2DTexcoord(int index, ivec2 dimensions, vec2 uvScale)
+vec3 index1DTo3DTexCoord(int index)
 {
-    int indexX = intMod(index, dimensions.x);
-    int indexY = index / dimensions.x;
-    return vec2(indexX, indexY) * uvScale;
+    int tilesPerZ = u_megatextureTileCounts.x * u_megatextureTileCounts.y;
+    int iz = index / tilesPerZ;
+    int remainder = index - iz * tilesPerZ;
+    int iy = remainder / u_megatextureTileCounts.x;
+    int ix = remainder - iy * u_megatextureTileCounts.x;
+    return vec3(ix, iy, iz) / vec3(u_megatextureTileCounts);
 }
 
-/*
-    How is 3D data stored in a 2D megatexture?
-
-    In this example there is only one loaded tile and it has 2x2x2 voxels (8 voxels total).
-    The data is sliced by Z. The data at Z = 0 is placed in texels (0,0), (0,1), (1,0), (1,1) and
-    the data at Z = 1 is placed in texels (2,0), (2,1), (3,0), (3,1).
-    Note that there could be empty space in the megatexture because it's a power of two.
-
-      0   1   2   3
-    +---+---+---+---+
-    |   |   |   |   | 3
-    +---+---+---+---+
-    |   |   |   |   | 2
-    +-------+-------+
-    |010|110|011|111| 1
-    |--- ---|--- ---|
-    |000|100|001|101| 0
-    +-------+-------+
-
-    When doing linear interpolation the megatexture needs to be sampled twice: once for
-    the Z slice above the voxel coordinate and once for the slice below. The two slices
-    are interpolated with fract(coord.z - 0.5). For example, a Z coordinate of 1.0 is
-    halfway between two Z slices so the interpolation factor is 0.5. Below is a side view
-    of the 3D voxel grid with voxel coordinates on the left side.
-
-    2 +---+
-      |001|
-    1 +-z-+
-      |000|
-    0 +---+
-
-    When doing nearest neighbor the megatexture only needs to be sampled once at the closest Z slice.
-*/
-
 Properties getPropertiesFromMegatexture(in SampleData sampleData) {
     int tileIndex = sampleData.megatextureIndex;
 
     vec3 voxelCoord = sampleData.inputCoordinate;
-    #if defined(NEAREST_SAMPLING)
-        // Round to the center of the nearest voxel
-        voxelCoord = floor(voxelCoord) + vec3(0.5);
-    #endif
 
-    // Tile location
-    vec2 tileUvOffset = index1DTo2DTexcoord(tileIndex, u_megatextureTileDimensions, u_megatextureTileSizeUv);
-
-    // Slice location
-    float slice = voxelCoord.z - 0.5;
-    int sliceIndex = int(floor(slice));
-    int sliceIndex0 = intClamp(sliceIndex, 0, u_inputDimensions.z - 1);
-    vec2 sliceUvOffset0 = index1DTo2DTexcoord(sliceIndex0, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);
+    // UV coordinate of the lower corner of the tile in the megatexture
+    vec3 tileUvOffset = index1DTo3DTexCoord(tileIndex);
 
     // Voxel location
-    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(u_inputDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;
-
-    // Final location in the megatexture
-    vec2 uv0 = tileUvOffset + sliceUvOffset0 + voxelUvOffset;
+    vec3 tileDimensions = vec3(u_inputDimensions);
+    vec3 clampedVoxelCoord = clamp(voxelCoord, vec3(0.5), tileDimensions - vec3(0.5));
+    vec3 voxelUv = clampedVoxelCoord / tileDimensions / vec3(u_megatextureTileCounts);
 
-    #if defined(NEAREST_SAMPLING)
-        return getPropertiesFromMegatextureAtUv(uv0);
-    #else
-        float sliceLerp = fract(slice);
-        int sliceIndex1 = intMin(sliceIndex + 1, u_inputDimensions.z - 1);
-        vec2 sliceUvOffset1 = index1DTo2DTexcoord(sliceIndex1, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);
-        vec2 uv1 = tileUvOffset + sliceUvOffset1 + voxelUvOffset;
-        Properties properties0 = getPropertiesFromMegatextureAtUv(uv0);
-        Properties properties1 = getPropertiesFromMegatextureAtUv(uv1);
-        return mixProperties(properties0, properties1, sliceLerp);
-    #endif
+    return getPropertiesFromMegatextureAtUv(tileUvOffset + voxelUv);
 }
 
 // Convert an array of sample datas to a final weighted properties.

package/Source/Shaders/Voxels/Megatexture.js

@@ -1,105 +1,37 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "// See Octree.glsl for the definitions of SampleData and intMod\n\
+export default "// See Octree.glsl for the definitions of SampleData\n\
 \n\
 /* Megatexture defines (set in Scene/VoxelRenderResources.js)\n\
 #define SAMPLE_COUNT ###\n\
-#define NEAREST_SAMPLING\n\
 #define PADDING\n\
 */\n\
 \n\
-uniform ivec2 u_megatextureSliceDimensions; // number of slices per tile, in two dimensions\n\
-uniform ivec2 u_megatextureTileDimensions; // number of tiles per megatexture, in two dimensions\n\
-uniform vec2 u_megatextureVoxelSizeUv;\n\
-uniform vec2 u_megatextureSliceSizeUv;\n\
-uniform vec2 u_megatextureTileSizeUv;\n\
+uniform ivec3 u_megatextureTileCounts; // number of tiles in the megatexture, along each axis\n\
 \n\
-// Integer min, max, clamp: For WebGL1 only\n\
-int intMin(int a, int b) {\n\
-    return a <= b ? a : b;\n\
-}\n\
-int intMax(int a, int b) {\n\
-    return a >= b ? a : b;\n\
-}\n\
-int intClamp(int v, int minVal, int maxVal) {\n\
-    return intMin(intMax(v, minVal), maxVal);\n\
-}\n\
-\n\
-vec2 index1DTo2DTexcoord(int index, ivec2 dimensions, vec2 uvScale)\n\
+vec3 index1DTo3DTexCoord(int index)\n\
 {\n\
-    int indexX = intMod(index, dimensions.x);\n\
-    int indexY = index / dimensions.x;\n\
-    return vec2(indexX, indexY) * uvScale;\n\
+    int tilesPerZ = u_megatextureTileCounts.x * u_megatextureTileCounts.y;\n\
+    int iz = index / tilesPerZ;\n\
+    int remainder = index - iz * tilesPerZ;\n\
+    int iy = remainder / u_megatextureTileCounts.x;\n\
+    int ix = remainder - iy * u_megatextureTileCounts.x;\n\
+    return vec3(ix, iy, iz) / vec3(u_megatextureTileCounts);\n\
 }\n\
 \n\
-/*\n\
-    How is 3D data stored in a 2D megatexture?\n\
-\n\
-    In this example there is only one loaded tile and it has 2x2x2 voxels (8 voxels total).\n\
-    The data is sliced by Z. The data at Z = 0 is placed in texels (0,0), (0,1), (1,0), (1,1) and\n\
-    the data at Z = 1 is placed in texels (2,0), (2,1), (3,0), (3,1).\n\
-    Note that there could be empty space in the megatexture because it's a power of two.\n\
-\n\
-      0   1   2   3\n\
-    +---+---+---+---+\n\
-    |   |   |   |   | 3\n\
-    +---+---+---+---+\n\
-    |   |   |   |   | 2\n\
-    +-------+-------+\n\
-    |010|110|011|111| 1\n\
-    |--- ---|--- ---|\n\
-    |000|100|001|101| 0\n\
-    +-------+-------+\n\
-\n\
-    When doing linear interpolation the megatexture needs to be sampled twice: once for\n\
-    the Z slice above the voxel coordinate and once for the slice below. The two slices\n\
-    are interpolated with fract(coord.z - 0.5). For example, a Z coordinate of 1.0 is\n\
-    halfway between two Z slices so the interpolation factor is 0.5. Below is a side view\n\
-    of the 3D voxel grid with voxel coordinates on the left side.\n\
-\n\
-    2 +---+\n\
-      |001|\n\
-    1 +-z-+\n\
-      |000|\n\
-    0 +---+\n\
-\n\
-    When doing nearest neighbor the megatexture only needs to be sampled once at the closest Z slice.\n\
-*/\n\
-\n\
 Properties getPropertiesFromMegatexture(in SampleData sampleData) {\n\
     int tileIndex = sampleData.megatextureIndex;\n\
 \n\
     vec3 voxelCoord = sampleData.inputCoordinate;\n\
-    #if defined(NEAREST_SAMPLING)\n\
-        // Round to the center of the nearest voxel\n\
-        voxelCoord = floor(voxelCoord) + vec3(0.5);\n\
-    #endif\n\
 \n\
-    // Tile location\n\
-    vec2 tileUvOffset = index1DTo2DTexcoord(tileIndex, u_megatextureTileDimensions, u_megatextureTileSizeUv);\n\
-\n\
-    // Slice location\n\
-    float slice = voxelCoord.z - 0.5;\n\
-    int sliceIndex = int(floor(slice));\n\
-    int sliceIndex0 = intClamp(sliceIndex, 0, u_inputDimensions.z - 1);\n\
-    vec2 sliceUvOffset0 = index1DTo2DTexcoord(sliceIndex0, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);\n\
+    // UV coordinate of the lower corner of the tile in the megatexture\n\
+    vec3 tileUvOffset = index1DTo3DTexCoord(tileIndex);\n\
 \n\
     // Voxel location\n\
-    vec2 voxelUvOffset = clamp(voxelCoord.xy, vec2(0.5), vec2(u_inputDimensions.xy) - vec2(0.5)) * u_megatextureVoxelSizeUv;\n\
-\n\
-    // Final location in the megatexture\n\
-    vec2 uv0 = tileUvOffset + sliceUvOffset0 + voxelUvOffset;\n\
+    vec3 tileDimensions = vec3(u_inputDimensions);\n\
+    vec3 clampedVoxelCoord = clamp(voxelCoord, vec3(0.5), tileDimensions - vec3(0.5));\n\
+    vec3 voxelUv = clampedVoxelCoord / tileDimensions / vec3(u_megatextureTileCounts);\n\
 \n\
-    #if defined(NEAREST_SAMPLING)\n\
-        return getPropertiesFromMegatextureAtUv(uv0);\n\
-    #else\n\
-        float sliceLerp = fract(slice);\n\
-        int sliceIndex1 = intMin(sliceIndex + 1, u_inputDimensions.z - 1);\n\
-        vec2 sliceUvOffset1 = index1DTo2DTexcoord(sliceIndex1, u_megatextureSliceDimensions, u_megatextureSliceSizeUv);\n\
-        vec2 uv1 = tileUvOffset + sliceUvOffset1 + voxelUvOffset;\n\
-        Properties properties0 = getPropertiesFromMegatextureAtUv(uv0);\n\
-        Properties properties1 = getPropertiesFromMegatextureAtUv(uv1);\n\
-        return mixProperties(properties0, properties1, sliceLerp);\n\
-    #endif\n\
+    return getPropertiesFromMegatextureAtUv(tileUvOffset + voxelUv);\n\
 }\n\
 \n\
 // Convert an array of sample datas to a final weighted properties.\n\

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);

package/index.d.ts

@@ -8801,7 +8801,7 @@ export namespace IntersectionTests {
     /**
      * Computes the intersection of a ray and a triangle as a parametric distance along the input ray. The result is negative when the triangle is behind the ray.
      *
-     * Implements {@link https://cadxfem.org/inf/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf|
+     * Implements {@link https://cadxfem.org/inf/Fast MinimumStorage RayTriangle Intersection.pdf|
      * Fast Minimum Storage Ray/Triangle Intersection} by Tomas Moller and Ben Trumbore.
      * @param ray - The ray.
      * @param p0 - The first vertex of the triangle.
@@ -8815,7 +8815,7 @@ export namespace IntersectionTests {
     /**
      * Computes the intersection of a ray and a triangle as a Cartesian3 coordinate.
      *
-     * Implements {@link https://cadxfem.org/inf/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf|
+     * Implements {@link https://cadxfem.org/inf/Fast MinimumStorage RayTriangle Intersection.pdf|
      * Fast Minimum Storage Ray/Triangle Intersection} by Tomas Moller and Ben Trumbore.
      * @param ray - The ray.
      * @param p0 - The first vertex of the triangle.
@@ -19065,6 +19065,15 @@ export function srgbToLinear(value: number): number;
  */
 export function subdivideArray(array: any[], numberOfArrays: number): void;
 
+/**
+ * Computes dimensions for text, based on current canvas state.
+ *
+ * Rounds metrics, excluding width, to whole pixels. This is purely to minimize
+ * rendering differences with migration to in-browser measureText(), and may be
+ * revised in the future. See: github.com/CesiumGS/cesium/pull/13081
+ */
+export function measureText(): void;
+
 /**
  * Writes the given text into a new canvas.  The canvas will be sized to fit the text.
  * If text is blank, returns undefined.
@@ -26427,27 +26436,24 @@ export enum Axis {
 export namespace Azure2DImageryProvider {
     /**
      * Initialization options for the Azure2DImageryProvider constructor
-     * @property options - Object with the following properties:
-     * @property [options.url = "https://atlas.microsoft.com/"] - The Azure server url.
-     * @property options.tilesetId - The Azure tileset ID. Valid options are {@link microsoft.imagery}, {@link microsoft.base.road}, and {@link microsoft.base.labels.road}
-     * @property options.subscriptionKey - The public subscription key for the imagery.
-     * @property [options.ellipsoid = Ellipsoid.default] - The ellipsoid.  If not specified, the default ellipsoid is used.
-     * @property [options.minimumLevel = 0] - The minimum level-of-detail supported by the imagery provider.  Take care when specifying
+     * @property subscriptionKey - The public subscription key for the imagery.
+     * @property [url = "https://atlas.microsoft.com/"] - The Azure server url.
+     * @property [tilesetId = "microsoft.imagery"] - The Azure tileset ID. Valid options are {@link microsoft.imagery}, {@link microsoft.base.road}, and {@link microsoft.base.labels.road}
+     * @property [ellipsoid = Ellipsoid.default] - The ellipsoid.  If not specified, the default ellipsoid is used.
+     * @property [minimumLevel = 0] - The minimum level-of-detail supported by the imagery provider.  Take care when specifying
      *                 this that the number of tiles at the minimum level is small, such as four or less.  A larger number is likely
      *                 to result in rendering problems.
-     * @property [options.maximumLevel = 22] - The maximum level-of-detail supported by the imagery provider.
-     * @property [options.rectangle = Rectangle.MAX_VALUE] - The rectangle, in radians, covered by the image.
+     * @property [maximumLevel = 22] - The maximum level-of-detail supported by the imagery provider.
+     * @property [rectangle = Rectangle.MAX_VALUE] - The rectangle, in radians, covered by the image.
      */
     type ConstructorOptions = {
-        options: {
-            url?: string;
-            tilesetId: string;
-            subscriptionKey: string;
-            ellipsoid?: Ellipsoid;
-            minimumLevel?: number;
-            maximumLevel?: number;
-            rectangle?: Rectangle;
-        };
+        subscriptionKey: string;
+        url?: string;
+        tilesetId?: string;
+        ellipsoid?: Ellipsoid;
+        minimumLevel?: number;
+        maximumLevel?: number;
+        rectangle?: Rectangle;
     };
 }
 
@@ -32285,7 +32291,7 @@ export namespace DynamicEnvironmentMapManager {
     /**
      * Options for the DynamicEnvironmentMapManager constructor
      * @property [enabled = true] - If true, the environment map and related properties will continue to update.
-     * @property [mipmapLevels = 7] - The number of mipmap levels to generate for specular maps. More mipmap levels will produce a higher resolution specular reflection.
+     * @property [mipmapLevels = 7] - The maximum desired number of mipmap levels to generate for specular maps. More mipmap levels will produce a higher resolution specular reflection. The actual number of mipmaps used will be bounded by the cubemap texture size supported on the client machine. The number of mipmaps must be at least one for the environment map to be generated.
      * @property [maximumSecondsDifference = 3600] - The maximum amount of elapsed seconds before a new environment map is created.
      * @property [maximumPositionEpsilon = 1000] - The maximum difference in position before a new environment map is created, in meters. Small differences in position will not visibly affect results.
      * @property [atmosphereScatteringIntensity = 2.0] - The intensity of the scattered light emitted from the atmosphere. This should be adjusted relative to the value of {@link Scene.light} intensity.
@@ -37316,6 +37322,11 @@ export namespace MaterialAppearance {
     }
 }
 
+/**
+ * Gets or sets the nearest sampling flag.
+ */
+export var nearestSampling: boolean;
+
 /**
  * A metadata class.
  *
@@ -41209,7 +41220,7 @@ export class PostProcessStageCollection {
     readonly length: number;
     /**
      * Specifies the tonemapping algorithm used when rendering with high dynamic range.
-     * {@link https://sandcastle.cesium.com/?src=High%20Dynamic%20Range.html|Sandcastle Demo}
+     * {@link https://sandcastle.cesium.com/?id=high-dynamic-range|Sandcastle Demo}
      * @example
      * viewer.scene.postProcessStages.tonemapper = Cesium.Tonemapper.ACES;
      */