@cesium/engine 18.3.1-ion.1 → 20.0.0

package/Source/Scene/PrimitiveCollection.js

@@ -16,6 +16,9 @@ import Event from "../Core/Event.js";
  * @param {object} [options] Object with the following properties:
  * @param {boolean} [options.show=true] Determines if the primitives in the collection will be shown.
  * @param {boolean} [options.destroyPrimitives=true] Determines if primitives in the collection are destroyed when they are removed.
+ * @privateParam {boolean} [options.countReferences=false] Specifies whether adding and removing primitives from this collection alters their reference counts. If so, adding a
+ * primitive to this collection increments its reference count. Removing the primitive decrements its reference count and - if the count reaches zero **and** destroyPrimitives is true - destroys the primitive.
+ * This permits primitives to be shared between multiple collections.
  *
  * @example
  * const billboards = new Cesium.BillboardCollection();
@@ -71,6 +74,8 @@ function PrimitiveCollection(options) {
    * labels = labels.destroy();    // explicitly destroy
    */
   this.destroyPrimitives = options.destroyPrimitives ?? true;
+
+  this._countReferences = options.countReferences ?? false;
 }
 
 Object.defineProperties(PrimitiveCollection.prototype, {
@@ -160,6 +165,14 @@ PrimitiveCollection.prototype.add = function (primitive, index) {
     this._primitives.splice(index, 0, primitive);
   }
 
+  if (this._countReferences) {
+    if (!defined(external._referenceCount)) {
+      external._referenceCount = 1;
+    } else {
+      ++external._referenceCount;
+    }
+  }
+
   this._primitiveAdded.raiseEvent(primitive);
 
   return primitive;
@@ -188,8 +201,14 @@ PrimitiveCollection.prototype.remove = function (primitive) {
       this._primitives.splice(index, 1);
 
       delete primitive._external._composites[this._guid];
+      if (this._countReferences) {
+        primitive._external._referenceCount--;
+      }
 
-      if (this.destroyPrimitives) {
+      if (
+        this.destroyPrimitives &&
+        (!this._countReferences || primitive._external._referenceCount <= 0)
+      ) {
         primitive.destroy();
       }
 
@@ -204,7 +223,7 @@ PrimitiveCollection.prototype.remove = function (primitive) {
 };
 
 /**
- * Removes and destroys a primitive, regardless of destroyPrimitives setting.
+ * Removes and destroys a primitive, regardless of destroyPrimitives or countReferences setting.
  * @private
  */
 PrimitiveCollection.prototype.removeAndDestroy = function (primitive) {
@@ -226,13 +245,20 @@ PrimitiveCollection.prototype.removeAll = function () {
   const primitives = this._primitives;
   const length = primitives.length;
   for (let i = 0; i < length; ++i) {
-    delete primitives[i]._external._composites[this._guid];
+    const primitive = primitives[i];
+    delete primitive._external._composites[this._guid];
+    if (this._countReferences) {
+      primitive._external._referenceCount--;
+    }
 
-    if (this.destroyPrimitives) {
-      primitives[i].destroy();
+    if (
+      this.destroyPrimitives &&
+      (!this._countReferences || primitive._external._referenceCount <= 0)
+    ) {
+      primitive.destroy();
     }
 
-    this._primitiveRemoved.raiseEvent(primitives[i]);
+    this._primitiveRemoved.raiseEvent(primitive);
   }
   this._primitives = [];
 };

package/Source/Scene/PrimitiveLoadPlan.js

@@ -7,8 +7,6 @@ import BufferUsage from "../Renderer/BufferUsage.js";
 import AttributeType from "./AttributeType.js";
 import ModelComponents from "./ModelComponents.js";
 import PrimitiveOutlineGenerator from "./Model/PrimitiveOutlineGenerator.js";
-import VertexAttributeSemantic from "./VertexAttributeSemantic.js";
-import ModelUtility from "./Model/ModelUtility.js";
 
 /**
  * Simple struct for tracking whether an attribute will be loaded as a buffer
@@ -162,7 +160,7 @@ function PrimitiveLoadPlan(primitive) {
 
   /**
    * Set this true to indicate that the primitive has the
-   * KHR_gaussian_splatting extension and needs to be post-processed
+   * KHR_gaussian_splatting and KHR_gaussian_splatting_compression_spz_2 extension and needs to be post-processed
    *
    * @type {boolean}
    * @private
@@ -187,7 +185,6 @@ PrimitiveLoadPlan.prototype.postProcess = function (context) {
   }
 
   if (this.needsGaussianSplats) {
-    prepareSpzData(this, context);
     setupGaussianSplatBuffers(this, context);
   }
 };
@@ -242,39 +239,6 @@ function makeOutlineCoordinatesAttribute(outlineCoordinatesTypedArray) {
   return attribute;
 }
 
-function prepareSpzData(loadPlan, context) {
-  const position = ModelUtility.getAttributeBySemantic(
-    loadPlan.primitive,
-    VertexAttributeSemantic.POSITION,
-  );
-
-  for (let i = 0; i < position.typedArray.length; i += 3) {
-    position.typedArray[i + 1] = -position.typedArray[i + 1];
-    position.typedArray[i + 2] = -position.typedArray[i + 2];
-  }
-
-  const rotations = ModelUtility.getAttributeBySemantic(
-    loadPlan.primitive,
-    VertexAttributeSemantic.ROTATION,
-  );
-
-  //180* rotation around X.
-  //Temporary until we can get SPZ supporting Z-up assets natively
-  const rots = rotations.typedArray;
-  for (let q = 0; q < rots.length; q += 4) {
-    const w = rots[q];
-    const x = -rots[q + 3];
-    const y = rots[q + 2];
-    const z = -rots[q + 1];
-
-    rots[q] = y;
-    rots[q + 1] = -x;
-    rots[q + 2] = w;
-    rots[q + 3] = -z;
-  }
-  rotations.typedArray = rots;
-}
-
 function setupGaussianSplatBuffers(loadPlan, context) {
   const attributePlans = loadPlan.attributePlans;
   const attrLen = attributePlans.length;

package/Source/Scene/PropertyTable.js

@@ -3,6 +3,7 @@ import Frozen from "../Core/Frozen.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import defined from "../Core/defined.js";
 import JsonMetadataTable from "./JsonMetadataTable.js";
+import addAllToArray from "../Core/addAllToArray.js";
 
 /**
  * A property table for use with the <code>EXT_structural_metadata</code> extension or
@@ -296,24 +297,18 @@ PropertyTable.prototype.getPropertyIds = function (index, results) {
 
   if (defined(this._metadataTable)) {
     // concat in place to avoid unnecessary array allocation
-    results.push.apply(
-      results,
-      this._metadataTable.getPropertyIds(scratchResults),
-    );
+    const ids = this._metadataTable.getPropertyIds(scratchResults);
+    addAllToArray(results, ids);
   }
 
   if (defined(this._batchTableHierarchy)) {
-    results.push.apply(
-      results,
-      this._batchTableHierarchy.getPropertyIds(index, scratchResults),
-    );
+    const ids = this._batchTableHierarchy.getPropertyIds(index, scratchResults);
+    addAllToArray(results, ids);
   }
 
   if (defined(this._jsonMetadataTable)) {
-    results.push.apply(
-      results,
-      this._jsonMetadataTable.getPropertyIds(scratchResults),
-    );
+    const ids = this._jsonMetadataTable.getPropertyIds(scratchResults);
+    addAllToArray(results, ids);
   }
 
   return results;

package/Source/Scene/Scene.js

@@ -68,6 +68,7 @@ import SceneTransforms from "./SceneTransforms.js";
 import SceneTransitioner from "./SceneTransitioner.js";
 import ScreenSpaceCameraController from "./ScreenSpaceCameraController.js";
 import ShadowMap from "./ShadowMap.js";
+import SharedContext from "../Renderer/SharedContext.js";
 import SpecularEnvironmentCubeMap from "./SpecularEnvironmentCubeMap.js";
 import StencilConstants from "./StencilConstants.js";
 import SunLight from "./SunLight.js";
@@ -132,15 +133,22 @@ function Scene(options) {
   let creditContainer = options.creditContainer;
   let creditViewport = options.creditViewport;
 
-  const contextOptions = clone(options.contextOptions);
-
   //>>includeStart('debug', pragmas.debug);
   if (!defined(canvas)) {
     throw new DeveloperError("options and options.canvas are required.");
   }
   //>>includeEnd('debug');
+
+  const countReferences = options.contextOptions instanceof SharedContext;
+  if (countReferences) {
+    this._context = options.contextOptions.createSceneContext(canvas);
+  } else {
+    const contextOptions = clone(options.contextOptions);
+    this._context = new Context(canvas, contextOptions);
+  }
+  const context = this._context;
+
   const hasCreditContainer = defined(creditContainer);
-  const context = new Context(canvas, contextOptions);
   if (!hasCreditContainer) {
     creditContainer = document.createElement("div");
     creditContainer.style.position = "absolute";
@@ -167,14 +175,13 @@ function Scene(options) {
   this._creditContainer = creditContainer;
 
   this._canvas = canvas;
-  this._context = context;
   this._computeEngine = new ComputeEngine(context);
 
   this._ellipsoid = options.ellipsoid ?? Ellipsoid.default;
   this._globe = undefined;
   this._globeTranslucencyState = new GlobeTranslucencyState();
-  this._primitives = new PrimitiveCollection();
-  this._groundPrimitives = new PrimitiveCollection();
+  this._primitives = new PrimitiveCollection({ countReferences });
+  this._groundPrimitives = new PrimitiveCollection({ countReferences });
 
   this._globeHeight = undefined;
   this._globeHeightDirty = true;
@@ -276,7 +283,7 @@ function Scene(options) {
   /**
    * The {@link SkyBox} used to draw the stars.
    *
-   * @type {SkyBox}
+   * @type {SkyBox | undefined}
    * @default undefined
    *
    * @see Scene#backgroundColor
@@ -286,7 +293,7 @@ function Scene(options) {
   /**
    * The sky atmosphere drawn around the globe.
    *
-   * @type {SkyAtmosphere}
+   * @type {SkyAtmosphere | undefined}
    * @default undefined
    */
   this.skyAtmosphere = undefined;
@@ -294,7 +301,7 @@ function Scene(options) {
   /**
    * The {@link Sun}.
    *
-   * @type {Sun}
+   * @type {Sun | undefined}
    * @default undefined
    */
   this.sun = undefined;
@@ -311,13 +318,13 @@ function Scene(options) {
   /**
    * The {@link Moon}
    *
-   * @type Moon
+   * @type {Moon | undefined}
    * @default undefined
    */
   this.moon = undefined;
 
   /**
-   * The background color, which is only visible if there is no sky box, i.e., {@link Scene#skyBox} is undefined.
+   * The background color, which is only visible if there is no sky box, i.e., {@link Scene#skyBox} is <code>undefined</code>.
    *
    * @type {Color}
    * @default {@link Color.BLACK}
@@ -406,7 +413,7 @@ function Scene(options) {
    * The default is <code>undefined</code>, indicating that all commands are executed.
    * </p>
    *
-   * @type Function
+   * @type {Function | undefined}
    *
    * @default undefined
    *
@@ -1306,11 +1313,11 @@ Object.defineProperties(Scene.prototype, {
   },
 
   /**
-   * Gets the simulation time when the scene was last rendered. Returns undefined if the scene has not yet been
-   * rendered.
+   * Gets the simulation time when the scene was last rendered. Returns <code>undefined</code>
+   * if the scene has not yet been rendered.
    * @memberof Scene.prototype
    *
-   * @type {JulianDate}
+   * @type {JulianDate | undefined}
    * @readonly
    */
   lastRenderTime: {
@@ -1343,7 +1350,7 @@ Object.defineProperties(Scene.prototype, {
    *
    * @memberof Scene.prototype
    *
-   * @type {object}
+   * @type {Object | undefined}
    * @readonly
    *
    * @default undefined
@@ -4202,6 +4209,8 @@ function render(scene) {
   passState.scissorTest = undefined;
   passState.viewport = BoundingRectangle.clone(viewport, passState.viewport);
 
+  context.beginFrame();
+
   if (defined(scene.globe)) {
     scene.globe.beginFrame(frameState);
   }
@@ -4371,8 +4380,8 @@ Scene.prototype.clampLineWidth = function (width) {
 };
 
 /**
- * Returns an object with a `primitive` property that contains the first (top) primitive in the scene
- * at a particular window coordinate or undefined if nothing is at the location. Other properties may
+ * Returns an object with a <code>primitive</code> property that contains the first (top) primitive in the scene
+ * at a particular window coordinate or <code>undefined</code> if nothing is at the location. Other properties may
  * potentially be set depending on the type of primitive and may be used to further identify the picked object.
  * <p>
  * When a feature of a 3D Tiles tileset is picked, <code>pick</code> returns a {@link Cesium3DTileFeature} object.
@@ -4390,7 +4399,7 @@ Scene.prototype.clampLineWidth = function (width) {
  * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
  * @param {number} [width=3] Width of the pick rectangle.
  * @param {number} [height=3] Height of the pick rectangle.
- * @returns {object} Object containing the picked primitive.
+ * @returns {Object | undefined} Object containing the picked primitive or <code>undefined</code> if nothing is at the location.
  */
 Scene.prototype.pick = function (windowPosition, width, height) {
   return this._picking.pick(this, windowPosition, width, height);
@@ -4398,7 +4407,7 @@ Scene.prototype.pick = function (windowPosition, width, height) {
 
 /**
  * Returns a {@link VoxelCell} for the voxel sample rendered at a particular window coordinate,
- * or undefined if no voxel is rendered at that position.
+ * or <code>undefined</code> if no voxel is rendered at that position.
  *
  * @example
  * On left click, report the value of the "color" property at that voxel sample.
@@ -4412,7 +4421,7 @@ Scene.prototype.pick = function (windowPosition, width, height) {
  * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
  * @param {number} [width=3] Width of the pick rectangle.
  * @param {number} [height=3] Height of the pick rectangle.
- * @returns {VoxelCell|undefined} Information about the voxel cell rendered at the picked position.
+ * @returns {VoxelCell|undefined} Information about the voxel cell rendered at the picked position or <code>undefined</code> if no voxel is rendered at that position.
  *
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
  */
@@ -4454,13 +4463,13 @@ Scene.prototype.pickVoxel = function (windowPosition, width, height) {
  *
  * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
  * @param {string|undefined} schemaId The ID of the metadata schema to pick values
- * from. If this is `undefined`, then it will pick the values from the object
+ * from. If this is <code>undefined</code>, then it will pick the values from the object
  * that match the given class- and property name, regardless of the schema ID.
  * @param {string} className The name of the metadata class to pick
  * values from
  * @param {string} propertyName The name of the metadata property to pick
  * values from
- * @returns {MetadataValue|undefined} The metadata value, or `undefined` when
+ * @returns {MetadataValue|undefined} The metadata value, or <code>undefined</code> when
  * no matching metadata was found at the given position
  *
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
@@ -4529,7 +4538,7 @@ Scene.prototype.pickMetadata = function (
  * Pick the schema of the metadata of the object at the given position
  *
  * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
- * @returns {MetadataSchema} The metadata schema, or `undefined` if there is no object with
+ * @returns {MetadataSchema | undefined} The metadata schema, or <code>undefined</code> if there is no object with
  * associated metadata at the given position.
  *
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
@@ -4598,7 +4607,7 @@ Scene.prototype.pickPosition = function (windowPosition, result) {
 };
 
 /**
- * Returns a list of objects, each containing a `primitive` property, for all primitives at
+ * Returns a list of objects, each containing a <code>primitive</code> property, for all primitives at
  * a particular window coordinate position. Other properties may also be set depending on the
  * type of primitive and may be used to further identify the picked object. The primitives in
  * the list are ordered by their visual order in the scene (front to back).
@@ -4667,7 +4676,7 @@ function updateRequestRenderModeDeferCheckPass(scene) {
  * @param {Ray} ray The ray.
  * @param {Object[]} [objectsToExclude] A list of primitives, entities, or 3D Tiles features to exclude from the ray intersection.
  * @param {number} [width=0.1] Width of the intersection volume in meters.
- * @returns {object} An object containing the object and position of the first intersection.
+ * @returns {object | undefined} An object containing the object and position of the first intersection or <code>undefined</code> if there are no intersections.
  *
  * @exception {DeveloperError} Ray intersections are only supported in 3D mode.
  */
@@ -4778,7 +4787,7 @@ Scene.prototype.drillPickFromRayMostDetailed = function (
  * @param {Cartographic} position The cartographic position to sample height from.
  * @param {Object[]} [objectsToExclude] A list of primitives, entities, or 3D Tiles features to not sample height from.
  * @param {number} [width=0.1] Width of the intersection volume in meters.
- * @returns {number} The height. This may be <code>undefined</code> if there was no scene geometry to sample height from.
+ * @returns {number | undefined} The height. This may be <code>undefined</code> if there was no scene geometry to sample height from.
  *
  * @example
  * const position = new Cesium.Cartographic(-1.31968, 0.698874);
@@ -4809,7 +4818,7 @@ Scene.prototype.sampleHeight = function (position, objectsToExclude, width) {
  * @param {Object[]} [objectsToExclude] A list of primitives, entities, or 3D Tiles features to not clamp to.
  * @param {number} [width=0.1] Width of the intersection volume in meters.
  * @param {Cartesian3} [result] An optional object to return the clamped position.
- * @returns {Cartesian3} The modified result parameter or a new Cartesian3 instance if one was not provided. This may be <code>undefined</code> if there was no scene geometry to clamp to.
+ * @returns {Cartesian3 | undefined} The modified result parameter or a new Cartesian3 instance if one was not provided. This may be <code>undefined</code> if there was no scene geometry to clamp to.
  *
  * @example
  * // Clamp an entity to the underlying scene geometry
@@ -4843,12 +4852,12 @@ Scene.prototype.clampToHeight = function (
  * using the maximum level of detail for 3D Tilesets in the scene. The height of the input positions is ignored.
  * Returns a promise that is resolved when the query completes. Each point height is modified in place.
  * If a height cannot be determined because no geometry can be sampled at that location, or another error occurs,
- * the height is set to undefined.
+ * the height is set to <code>undefined</code>.
  *
  * @param {Cartographic[]} positions The cartographic positions to update with sampled heights.
  * @param {Object[]} [objectsToExclude] A list of primitives, entities, or 3D Tiles features to not sample height from.
  * @param {number} [width=0.1] Width of the intersection volume in meters.
- * @returns {Promise<Cartographic[]>} A promise that resolves to the provided list of positions when the query has completed.
+ * @returns {Promise<Array<Cartographic | undefined>>} A promise that resolves to the provided list of positions when the query has completed. Positions may become <code>undefined</code> if the height cannot be determined.
  *
  * @example
  * const positions = [
@@ -4888,7 +4897,7 @@ Scene.prototype.sampleHeightMostDetailed = function (
  * @param {Cartesian3[]} cartesians The cartesian positions to update with clamped positions.
  * @param {Object[]} [objectsToExclude] A list of primitives, entities, or 3D Tiles features to not clamp to.
  * @param {number} [width=0.1] Width of the intersection volume in meters.
- * @returns {Promise<Cartesian3[]>} A promise that resolves to the provided list of positions when the query has completed.
+ * @returns {Promise<Array<Cartesian3 | undefined>>} A promise that resolves to the provided list of positions when the query has completed. Positions may become <code>undefined</code> if they cannot be clamped.
  *
  * @example
  * const cartesians = [
@@ -4925,7 +4934,7 @@ Scene.prototype.clampToHeightMostDetailed = function (
  *
  * @param {Cartesian3} position The position in cartesian coordinates.
  * @param {Cartesian2} [result] An optional object to return the input position transformed to canvas coordinates.
- * @returns {Cartesian2} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
+ * @returns {Cartesian2 | undefined} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
  *
  * @example
  * // Output the canvas position of longitude/latitude (0, 0) every time the mouse moves.

package/Source/Scene/ScreenSpaceCameraController.js

@@ -266,6 +266,8 @@ function ScreenSpaceCameraController(scene) {
   this._minimumTrackBallHeight = this.minimumTrackBallHeight;
   /**
    * When disabled, the values of <code>maximumZoomDistance</code> and <code>minimumZoomDistance</code> are ignored.
+   * Also used in conjunction with {@link Cesium3DTileset#enableCollision} to prevent the camera from moving through or below a 3D Tileset surface.
+   * This may also affect clamping behavior when using {@link HeightReference.CLAMP_TO_GROUND} on 3D Tiles.
    * @type {boolean}
    * @default true
    */

package/Source/Scene/VertexAttributeSemantic.js

@@ -79,14 +79,14 @@ const VertexAttributeSemantic = {
    * @type {string}
    * @constant
    */
-  SCALE: "_SCALE",
+  SCALE: "KHR_gaussian_splatting:SCALE",
   /**
    * Gaussian Splat Rotation
    *
    * @type {string}
    * @constant
    */
-  ROTATION: "_ROTATION",
+  ROTATION: "KHR_gaussian_splatting:ROTATION",
 };
 
 function semanticToVariableName(semantic) {
@@ -192,8 +192,10 @@ VertexAttributeSemantic.fromGltfSemantic = function (gltfSemantic) {
       return VertexAttributeSemantic.WEIGHTS;
     case "_FEATURE_ID":
       return VertexAttributeSemantic.FEATURE_ID;
+    case "KHR_gaussian_splatting:SCALE":
     case "_SCALE":
       return VertexAttributeSemantic.SCALE;
+    case "KHR_gaussian_splatting:ROTATION":
     case "_ROTATION":
       return VertexAttributeSemantic.ROTATION;
   }

package/Source/Scene/WebMapServiceImageryProvider.js

@@ -88,12 +88,13 @@ const excludesReverseAxis = [
  * @see WebMapTileServiceImageryProvider
  * @see UrlTemplateImageryProvider
  *
- * @see {@link http://resources.esri.com/help/9.3/arcgisserver/apis/rest/|ArcGIS Server REST API}
+ * @see {@link https://enterprise.arcgis.com/en/server/latest/publish-services/linux/wms-services.htm|ArcGIS Server WMS Services}
  * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing}
  *
  * @example
+ * // WMS servers operated by the US government https://apps.nationalmap.gov/services/
  * const provider = new Cesium.WebMapServiceImageryProvider({
- *     url : 'https://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer',
+ *     url : 'https://basemap.nationalmap.gov:443/arcgis/services/USGSHydroCached/MapServer/WMSServer',
  *     layers : '0',
  *     proxy: new Cesium.DefaultProxy('/proxy/')
  * });

package/Source/Scene/WebMapTileServiceImageryProvider.js

@@ -4,7 +4,6 @@ import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Event from "../Core/Event.js";
-import Rectangle from "../Core/Rectangle.js";
 import Resource from "../Core/Resource.js";
 import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js";
 import ImageryProvider from "./ImageryProvider.js";
@@ -208,27 +207,6 @@ function WebMapTileServiceImageryProvider(options) {
     });
   }
 
-  // Check the number of tiles at the minimum level.  If it's more than four,
-  // throw an exception, because starting at the higher minimum
-  // level will cause too many tiles to be downloaded and rendered.
-  const swTile = this._tilingScheme.positionToTileXY(
-    Rectangle.southwest(this._rectangle),
-    this._minimumLevel,
-  );
-  const neTile = this._tilingScheme.positionToTileXY(
-    Rectangle.northeast(this._rectangle),
-    this._minimumLevel,
-  );
-  const tileCount =
-    (Math.abs(neTile.x - swTile.x) + 1) * (Math.abs(neTile.y - swTile.y) + 1);
-  //>>includeStart('debug', pragmas.debug);
-  if (tileCount > 4) {
-    throw new DeveloperError(
-      `The imagery provider's rectangle and minimumLevel indicate that there are ${tileCount} tiles at the minimum level. Imagery providers with more than four tiles at the minimum level are not supported.`,
-    );
-  }
-  //>>includeEnd('debug');
-
   this._errorEvent = new Event();
 
   const credit = options.credit;

package/Source/Scene/getMeshPrimitives.js

@@ -0,0 +1,72 @@
+import addAllToArray from "../Core/addAllToArray.js";
+import defined from "../Core/defined.js";
+import Frozen from "../Core/Frozen.js";
+import WebGLConstants from "../Core/WebGLConstants.js";
+
+/**
+ * Get an array of primitives for a given mesh. If the EXT_mesh_primitive_restart extension is present, use it to combine groups of primitives.
+ * If the extension is not present or its spec is violated, return the original mesh.primitives.
+ * @param {object} mesh A mesh from the glTF meshes array
+ * @returns {object[]} An array of mesh primitives
+ * @private
+ */
+function getMeshPrimitives(mesh) {
+  const meshExtensions = mesh.extensions ?? Frozen.EMPTY_OBJECT;
+  const primitiveRestartExtension = meshExtensions.EXT_mesh_primitive_restart;
+  const meshPrimitives = mesh.primitives;
+
+  if (!defined(primitiveRestartExtension)) {
+    return meshPrimitives;
+  }
+
+  // Note: per the spec, any violation of the extension's specification should cause us to fall back to mesh.primitives, if detecting the violation is feasible.
+
+  // Start with a copy of mesh.primitives. For each group, replace the first primitive in the group with a primitive representing the entire group,
+  // and set the rest of the primitives in the group to `undefined`.
+  // This allows us to identify which remaining primitives do not use primitive restart, and any errors involving a primitive appearing in more than one group.
+  const primitives = [];
+  addAllToArray(primitives, meshPrimitives);
+  for (const group of primitiveRestartExtension.primitiveGroups) {
+    // Spec: the group must not be empty and all indices must be valid array indices into mesh.primitives.
+    const firstPrimitiveIndex = group.primitives[0];
+    if (!defined(firstPrimitiveIndex) || !meshPrimitives[firstPrimitiveIndex]) {
+      return meshPrimitives;
+    }
+
+    const primitive = {
+      ...meshPrimitives[firstPrimitiveIndex],
+      indices: group.indices,
+    };
+
+    // Spec: primitive restart only supported for these topologies.
+    switch (primitive.mode) {
+      case WebGLConstants.TRIANGLE_FAN:
+      case WebGLConstants.TRIANGLE_STRIP:
+      case WebGLConstants.LINE_STRIP:
+      case WebGLConstants.LINE_LOOP:
+        break;
+      default:
+        return meshPrimitives;
+    }
+
+    for (const primitiveIndex of group.primitives) {
+      const thisPrimitive = primitives[primitiveIndex];
+
+      // Spec: all primitives must use indexed geometry and a given primitive may appear in at most one group.
+      // Spec: all primitives must have same topology.
+      if (
+        !defined(thisPrimitive?.indices) ||
+        thisPrimitive.mode !== primitive.mode
+      ) {
+        return meshPrimitives;
+      }
+
+      primitives[primitiveIndex] = undefined;
+    }
+
+    primitives[firstPrimitiveIndex] = primitive;
+  }
+
+  return primitives.filter(defined);
+}
+export default getMeshPrimitives;

package/Source/Shaders/Builtin/Functions/modelToWindowCoordinates.glsl

@@ -30,7 +30,8 @@
  */
 vec4 czm_modelToWindowCoordinates(vec4 position)
 {
-    vec4 q = czm_modelViewProjection * position;                // clip coordinates
+    vec4 positionEC = czm_modelView * position;
+    vec4 q = czm_projection * positionEC;
     q.xyz /= q.w;                                                // normalized device coordinates
     q.xyz = (czm_viewportTransformation * vec4(q.xyz, 1.0)).xyz; // window coordinates
     return q;

package/Source/Shaders/Builtin/Functions/modelToWindowCoordinates.js

@@ -31,7 +31,8 @@ export default "/**\n\
  */\n\
 vec4 czm_modelToWindowCoordinates(vec4 position)\n\
 {\n\
-    vec4 q = czm_modelViewProjection * position;                // clip coordinates\n\
+    vec4 positionEC = czm_modelView * position;\n\
+    vec4 q = czm_projection * positionEC;\n\
     q.xyz /= q.w;                                                // normalized device coordinates\n\
     q.xyz = (czm_viewportTransformation * vec4(q.xyz, 1.0)).xyz; // window coordinates\n\
     return q;\n\

package/Source/Shaders/EllipsoidVS.glsl

@@ -11,10 +11,10 @@ void main()
     // but doing it here allows us to change the radii without rewriting the vertex data, and
     // allows all ellipsoids to reuse the same vertex data.
     vec4 p = vec4(u_radii * position, 1.0);
-
-    v_positionEC = (czm_modelView * p).xyz;     // position in eye coordinates
-    gl_Position = czm_modelViewProjection * p;  // position in clip coordinates
-
+    
+    vec4 pEC = czm_modelView * p;
+    v_positionEC = pEC.xyz;     // position in eye coordinates
+    gl_Position = czm_projection * pEC;
     // With multi-frustum, when the ellipsoid primitive is positioned on the intersection of two frustums
     // and close to terrain, the terrain (writes depth) in the closest frustum can overwrite part of the
     // ellipsoid (does not write depth) that was rendered in the farther frustum.