@cesium/engine 4.0.0 → 6.0.0

package/Source/Core/buildModuleUrl.js

@@ -41,7 +41,7 @@ function getCesiumBaseUrl() {
   let baseUrlString;
   if (typeof CESIUM_BASE_URL !== "undefined") {
     baseUrlString = CESIUM_BASE_URL;
-  } else if (defined(import.meta) && defined(import.meta.url)) {
+  } else if (defined(import.meta?.url)) {
     // ESM
     baseUrlString = getAbsoluteUri(".", import.meta.url);
   } else if (

package/Source/Core/sampleTerrain.js

@@ -20,6 +20,7 @@ import defined from "./defined.js";
  * @param {TerrainProvider} terrainProvider The terrain provider from which to query heights.
  * @param {number} level The terrain level-of-detail from which to query terrain heights.
  * @param {Cartographic[]} positions The positions to update with terrain heights.
+ * @param {boolean} [rejectOnTileFail=false] If true, for a failed terrain tile request the promise will be rejected. If false, returned heights will be undefined.
  * @returns {Promise<Cartographic[]>} A promise that resolves to the provided list of positions when terrain the query has completed.
  *
  * @see sampleTerrainMostDetailed
@@ -34,26 +35,43 @@ import defined from "./defined.js";
  * const updatedPositions = await Cesium.sampleTerrain(terrainProvider, 11, positions);
  * // positions[0].height and positions[1].height have been updated.
  * // updatedPositions is just a reference to positions.
+ *
+ * // To handle tile errors, pass true for the rejectOnTileFail parameter.
+ * try {
+ *    const updatedPositions = await Cesium.sampleTerrain(terrainProvider, 11, positions, true);
+ * } catch (error) {
+ *   // A tile request error occurred.
+ * }
  */
-async function sampleTerrain(terrainProvider, level, positions) {
+async function sampleTerrain(
+  terrainProvider,
+  level,
+  positions,
+  rejectOnTileFail
+) {
+  if (!defined(rejectOnTileFail)) {
+    rejectOnTileFail = false;
+  }
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("terrainProvider", terrainProvider);
   Check.typeOf.number("level", level);
+  Check.typeOf.bool("rejectOnTileFail", rejectOnTileFail);
   Check.defined("positions", positions);
   //>>includeEnd('debug');
 
-  return doSampling(terrainProvider, level, positions);
+  return doSampling(terrainProvider, level, positions, rejectOnTileFail);
 }
 
 /**
  * @param {object[]} tileRequests The mutated list of requests, the first one will be attempted
  * @param {Array<Promise<void>>} results The list to put the result promises into
+ * @param {boolean} rejectOnTileFail If true, the promise will be rejected.  If false, returned heights will be undefined.
  * @returns {boolean} true if the request was made, and we are okay to attempt the next item immediately,
  *  or false if we were throttled and should wait awhile before retrying.
  *
  * @private
  */
-function attemptConsumeNextQueueItem(tileRequests, results) {
+function attemptConsumeNextQueueItem(tileRequests, results, rejectOnTileFail) {
   const tileRequest = tileRequests[0];
   const requestPromise = tileRequest.terrainProvider.requestTileGeometry(
     tileRequest.x,
@@ -66,9 +84,15 @@ function attemptConsumeNextQueueItem(tileRequests, results) {
     return false;
   }
 
-  const promise = requestPromise
-    .then(createInterpolateFunction(tileRequest))
-    .catch(createMarkFailedFunction(tileRequest));
+  let promise;
+
+  if (rejectOnTileFail) {
+    promise = requestPromise.then(createInterpolateFunction(tileRequest));
+  } else {
+    promise = requestPromise
+      .then(createInterpolateFunction(tileRequest))
+      .catch(createMarkFailedFunction(tileRequest));
+  }
 
   // remove the request we've just done from the queue
   //  and add its promise result to the result list
@@ -95,11 +119,12 @@ function delay(ms) {
  *  and a Promise of each result has been put into the results list
  * @param {object[]} tileRequests The list of requests desired to be made
  * @param {Array<Promise<void>>} results The list to put all the result promises into
+ * @param {boolean} rejectOnTileFail If true, the promise will be rejected.  If false, returned heights will be undefined.
  * @returns {Promise<void>} A promise which resolves once all requests have been started
  *
  * @private
  */
-function drainTileRequestQueue(tileRequests, results) {
+function drainTileRequestQueue(tileRequests, results, rejectOnTileFail) {
   // nothing left to do
   if (!tileRequests.length) {
     return Promise.resolve();
@@ -108,7 +133,11 @@ function drainTileRequestQueue(tileRequests, results) {
   // consume an item from the queue, which will
   //  mutate the request and result lists, and return true if we should
   //  immediately attempt to consume the next item as well
-  const success = attemptConsumeNextQueueItem(tileRequests, results);
+  const success = attemptConsumeNextQueueItem(
+    tileRequests,
+    results,
+    rejectOnTileFail
+  );
   if (success) {
     return drainTileRequestQueue(tileRequests, results);
   }
@@ -119,7 +148,7 @@ function drainTileRequestQueue(tileRequests, results) {
   });
 }
 
-function doSampling(terrainProvider, level, positions) {
+function doSampling(terrainProvider, level, positions, rejectOnTileFail) {
   const tilingScheme = terrainProvider.tilingScheme;
 
   let i;
@@ -155,7 +184,11 @@ function doSampling(terrainProvider, level, positions) {
 
   // create our list of result promises to be filled
   const tilePromises = [];
-  return drainTileRequestQueue(tileRequests, tilePromises).then(function () {
+  return drainTileRequestQueue(
+    tileRequests,
+    tilePromises,
+    rejectOnTileFail
+  ).then(function () {
     // now all the required requests have been started
     //  we just wait for them all to finish
     return Promise.all(tilePromises).then(function () {

package/Source/Core/sampleTerrainMostDetailed.js

@@ -12,6 +12,7 @@ const scratchCartesian2 = new Cartesian2();
  *
  * @param {TerrainProvider} terrainProvider The terrain provider from which to query heights.
  * @param {Cartographic[]} positions The positions to update with terrain heights.
+ * @param {boolean} [rejectOnTileFail=false] If true, for a failed terrain tile request the promise will be rejected. If false, returned heights will be undefined.
  * @returns {Promise<Cartographic[]>} A promise that resolves to the provided list of positions when terrain the query has completed.  This
  *                                     promise will reject if the terrain provider's `availability` property is undefined.
  *
@@ -25,8 +26,22 @@ const scratchCartesian2 = new Cartesian2();
  * const updatedPositions = await Cesium.sampleTerrainMostDetailed(terrainProvider, positions);
  * // positions[0].height and positions[1].height have been updated.
  * // updatedPositions is just a reference to positions.
+ *
+ * // To handle tile errors, pass true for the rejectOnTileFail parameter.
+ * try {
+ *    const updatedPositions = await Cesium.sampleTerrainMostDetailed(terrainProvider, positions, true);
+ * } catch (error) {
+ *   // A tile request error occurred.
+ * }
  */
-async function sampleTerrainMostDetailed(terrainProvider, positions) {
+async function sampleTerrainMostDetailed(
+  terrainProvider,
+  positions,
+  rejectOnTileFail
+) {
+  if (!defined(rejectOnTileFail)) {
+    rejectOnTileFail = false;
+  }
   //>>includeStart('debug', pragmas.debug);
   if (!defined(terrainProvider)) {
     throw new DeveloperError("terrainProvider is required.");
@@ -84,7 +99,12 @@ async function sampleTerrainMostDetailed(terrainProvider, positions) {
   await Promise.all(
     byLevel.map(function (positionsAtLevel, index) {
       if (defined(positionsAtLevel)) {
-        return sampleTerrain(terrainProvider, index, positionsAtLevel);
+        return sampleTerrain(
+          terrainProvider,
+          index,
+          positionsAtLevel,
+          rejectOnTileFail
+        );
       }
     })
   );
@@ -100,7 +120,11 @@ async function sampleTerrainMostDetailed(terrainProvider, positions) {
   }
 
   if (changedPositions.length > 0) {
-    await sampleTerrainMostDetailed(terrainProvider, changedPositions);
+    await sampleTerrainMostDetailed(
+      terrainProvider,
+      changedPositions,
+      rejectOnTileFail
+    );
   }
 
   return positions;

package/Source/Scene/ArcGisMapService.js

@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPK101bfb95c8624cafa30b55ec1709f9e65mp_hzhcQWdW-Km2L7Gukj--gHqZ8PQIEfih4Wa00sxBZyuTpBisCt5aJNvQm32h";
+  "AAPK4db83df15a06415e9b7d45d826eec992u0REAmuLmykhOFOk_4e61HgsO_e3C_qGUgiWNGElpjpiMfO9_Qg5ZRyy8POvB5EF";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *
@@ -76,7 +76,6 @@ ArcGisMapService.getDefaultTokenCredit = function (providedKey) {
             You can sign up for a free ArcGIS Developer account at <a href="https://developers.arcgis.com/">https://developers.arcgis.com/</a>.</b>';
 
     defaultTokenCredit = new Credit(defaultTokenMessage, true);
-    defaultTokenCredit._isDefaultToken = true;
   }
 
   return defaultTokenCredit;

package/Source/Scene/Billboard.js

@@ -1166,6 +1166,13 @@ Billboard.prototype._loadImage = function () {
     that._image = undefined;
     that._imageIndexPromise = undefined;
     makeDirty(that, IMAGE_INDEX_INDEX);
+
+    const scene = that._billboardCollection._scene;
+    if (!defined(scene)) {
+      return;
+    }
+    // Request a new render in request render mode
+    scene.frameState.afterRender.push(() => true);
   }
 
   if (defined(image)) {

package/Source/Scene/Cesium3DTilePass.js

@@ -39,7 +39,7 @@ passOptions[Cesium3DTilePass.SHADOW] = Object.freeze({
 });
 
 passOptions[Cesium3DTilePass.PRELOAD] = Object.freeze({
-  pass: Cesium3DTilePass.SHADOW,
+  pass: Cesium3DTilePass.PRELOAD,
   isRender: false,
   requestTiles: true,
   ignoreCommands: true,

package/Source/Scene/Cesium3DTileset.js

@@ -67,7 +67,6 @@ import Cesium3DTilesetSkipTraversal from "./Cesium3DTilesetSkipTraversal.js";
  * @property {Axis} [modelForwardAxis=Axis.X] Which axis is considered forward when loading models for tile contents.
  * @property {ShadowMode} [shadows=ShadowMode.ENABLED] Determines whether the tileset casts or receives shadows from light sources.
  * @property {number} [maximumScreenSpaceError=16] The maximum screen space error used to drive level of detail refinement.
- * @property {number} [maximumMemoryUsage=512] The maximum amount of memory in MB that can be used by the tileset. Deprecated.
  * @property {number} [cacheBytes=536870912] The size (in bytes) to which the tile cache will be trimmed, if the cache contains tiles not needed for the current view.
  * @property {number} [maximumCacheOverflowBytes=536870912] The maximum additional memory (in bytes) to allow for cache headroom, if more than {@link Cesium3DTileset#cacheBytes} are needed for the current view.
  * @property {boolean} [cullWithChildrenBounds=true] Optimization option. Whether to cull tiles using the union of their children bounding volumes.
@@ -224,15 +223,7 @@ function Cesium3DTileset(options) {
   );
   this._memoryAdjustedScreenSpaceError = this._maximumScreenSpaceError;
 
-  let defaultCacheBytes = 512 * 1024 * 1024;
-  if (defined(options.maximumMemoryUsage)) {
-    deprecationWarning(
-      "Cesium3DTileset.maximumMemoryUsage",
-      "Cesium3DTileset.maximumMemoryUsage was deprecated in CesiumJS 1.107.  It will be removed in CesiumJS 1.110. Use Cesium3DTileset.cacheBytes instead."
-    );
-    defaultCacheBytes = options.maximumMemoryUsage * 1024 * 1024;
-  }
-  this._cacheBytes = defaultValue(options.cacheBytes, defaultCacheBytes);
+  this._cacheBytes = defaultValue(options.cacheBytes, 512 * 1024 * 1024);
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.number.greaterThanOrEquals("cacheBytes", this._cacheBytes, 0);
   //>>includeEnd('debug');
@@ -1376,57 +1367,6 @@ Object.defineProperties(Cesium3DTileset.prototype, {
     },
   },
 
-  /**
-   * The maximum amount of GPU memory (in MB) that may be used to cache tiles. This value is estimated from
-   * geometry, textures, and batch table textures of loaded tiles. For point clouds, this value also
-   * includes per-point metadata.
-   * <p>
-   * Tiles not in view are unloaded to enforce this.
-   * </p>
-   * <p>
-   * If decreasing this value results in unloading tiles, the tiles are unloaded the next frame.
-   * </p>
-   * <p>
-   * If tiles sized more than <code>maximumMemoryUsage</code> are needed
-   * to meet the desired screen space error, determined by {@link Cesium3DTileset#maximumScreenSpaceError},
-   * for the current view, then the memory usage of the tiles loaded will exceed
-   * <code>maximumMemoryUsage</code>.  For example, if the maximum is 256 MB, but
-   * 300 MB of tiles are needed to meet the screen space error, then 300 MB of tiles may be loaded.  When
-   * these tiles go out of view, they will be unloaded.
-   * </p>
-   *
-   * @memberof Cesium3DTileset.prototype
-   *
-   * @type {number}
-   * @default 512
-   *
-   * @exception {DeveloperError} <code>maximumMemoryUsage</code> must be greater than or equal to zero.
-   * @see Cesium3DTileset#totalMemoryUsageInBytes
-   *
-   * @deprecated
-   */
-  maximumMemoryUsage: {
-    get: function () {
-      deprecationWarning(
-        "Cesium3DTileset.maximumMemoryUsage",
-        "Cesium3DTileset.maximumMemoryUsage was deprecated in CesiumJS 1.107.  It will be removed in CesiumJS 1.110. Use Cesium3DTileset.cacheBytes instead."
-      );
-      return this._maximumMemoryUsage;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "Cesium3DTileset.maximumMemoryUsage",
-        "Cesium3DTileset.maximumMemoryUsage was deprecated in CesiumJS 1.107.  It will be removed in CesiumJS 1.110. Use Cesium3DTileset.cacheBytes instead."
-      );
-      //>>includeStart('debug', pragmas.debug);
-      Check.typeOf.number.greaterThanOrEquals("value", value, 0);
-      //>>includeEnd('debug');
-
-      this._maximumMemoryUsage = value;
-      this._cacheBytes = value * 1024 * 1024;
-    },
-  },
-
   /**
    * The amount of GPU memory (in bytes) used to cache tiles. This memory usage is estimated from
    * geometry, textures, and batch table textures of loaded tiles. For point clouds, this value also
@@ -1880,6 +1820,7 @@ Object.defineProperties(Cesium3DTileset.prototype, {
     },
     set: function (value) {
       this._showCreditsOnScreen = value;
+      createCredits(this);
     },
   },
 
@@ -2068,24 +2009,7 @@ Cesium3DTileset.fromUrl = async function (url, options) {
   tileset._asset = asset;
   tileset._extras = tilesetJson.extras;
 
-  let credits = resource.credits;
-  if (!defined(credits)) {
-    credits = [];
-  }
-
-  const assetExtras = asset.extras;
-  if (
-    defined(assetExtras) &&
-    defined(assetExtras.cesium) &&
-    defined(assetExtras.cesium.credits)
-  ) {
-    const extraCredits = assetExtras.cesium.credits;
-    for (let i = 0; i < extraCredits.length; ++i) {
-      const credit = extraCredits[i];
-      credits.push(new Credit(credit.html, tileset._showCreditsOnScreen));
-    }
-  }
-  tileset._credits = credits;
+  createCredits(tileset);
 
   // Handle legacy gltfUpAxis option
   const gltfUpAxis = defined(tilesetJson.asset.gltfUpAxis)
@@ -3210,8 +3134,6 @@ function update(tileset, frameState, passStatistics, passOptions) {
     if (defined(credits) && statistics.selected !== 0) {
       for (let i = 0; i < credits.length; ++i) {
         const credit = credits[i];
-        credit.showOnScreen =
-          tileset._showCreditsOnScreen || credit._isDefaultToken;
         frameState.creditDisplay.addCreditToNextFrame(credit);
       }
     }
@@ -3220,6 +3142,41 @@ function update(tileset, frameState, passStatistics, passOptions) {
   return ready;
 }
 
+function createCredits(tileset) {
+  let credits = tileset._credits;
+  if (!defined(credits)) {
+    credits = [];
+  }
+  credits.length = 0;
+
+  if (defined(tileset.resource.credits)) {
+    tileset.resource.credits.forEach((credit) => {
+      credits.push(Credit.clone(credit));
+    });
+  }
+
+  const assetExtras = tileset.asset.extras;
+  if (
+    defined(assetExtras) &&
+    defined(assetExtras.cesium) &&
+    defined(assetExtras.cesium.credits)
+  ) {
+    const extraCredits = assetExtras.cesium.credits;
+    for (let i = 0; i < extraCredits.length; ++i) {
+      const credit = extraCredits[i];
+      credits.push(new Credit(credit.html));
+    }
+  }
+
+  credits.forEach(
+    (credit) =>
+      (credit.showOnScreen =
+        credit.showOnScreen || tileset._showCreditsOnScreen)
+  );
+
+  tileset._credits = credits;
+}
+
 /**
  * @private
  * @param {object} passOptions

package/Source/Scene/CreditDisplay.js

@@ -437,7 +437,7 @@ CreditDisplay.prototype.addCreditToNextFrame = function (credit) {
   Check.defined("credit", credit);
   //>>includeEnd('debug');
 
-  if (credit._isIon) {
+  if (credit.isIon()) {
     // If this is the an ion logo credit from the ion server
     // Just use the default credit (which is identical) to avoid blinking
     if (!defined(this._defaultCredit)) {
@@ -546,7 +546,7 @@ CreditDisplay.prototype.beginFrame = function () {
       : lightboxCredits;
 
     if (
-      staticCredit._isIon &&
+      staticCredit.isIon() &&
       Credit.equals(CreditDisplay.cesiumCredit, this._cesiumCredit)
     ) {
       // If this is an ion logo credit from the ion server,

package/Source/Scene/LabelCollection.js

@@ -56,7 +56,7 @@ function addWhitePixelCanvas(textureAtlas) {
 
   // Canvas operations take a frame to draw. Use the asynchronous add function which resolves a promise and allows the draw to complete,
   // but there's no need to wait on the promise before operation can continue
-  textureAtlas.addImage(whitePixelCanvasId, canvas);
+  return textureAtlas.addImage(whitePixelCanvasId, canvas);
 }
 
 // reusable object for calling writeTextToCanvas
@@ -911,6 +911,8 @@ LabelCollection.prototype.update = function (frameState) {
       initialSize: whitePixelSize,
     });
     backgroundBillboardCollection.textureAtlas = this._backgroundTextureAtlas;
+
+    // Request a new render in request render mode after the next frame renders
     addWhitePixelCanvas(this._backgroundTextureAtlas);
   }
 

package/Source/Scene/Model/Model.js

@@ -408,6 +408,7 @@ function Model(options) {
     credit = new Credit(credit);
   }
 
+  this._credits = [];
   this._credit = credit;
 
   // Credits to be added from the Resource (if it is an IonResource)
@@ -2258,24 +2259,29 @@ function updateShowCreditsOnScreen(model) {
     return;
   }
   model._showCreditsOnScreenDirty = false;
+  model._credits.length = 0;
 
   const showOnScreen = model._showCreditsOnScreen;
   if (defined(model._credit)) {
-    model._credit.showOnScreen = showOnScreen || model._credit._isDefaultToken;
+    const credit = Credit.clone(model._credit);
+    credit.showOnScreen = credit.showOnScreen || showOnScreen;
+    model._credits.push(credit);
   }
 
   const resourceCredits = model._resourceCredits;
   const resourceCreditsLength = resourceCredits.length;
   for (let i = 0; i < resourceCreditsLength; i++) {
-    resourceCredits[i].showOnScreen =
-      showOnScreen || resourceCredits[i]._isDefaultToken;
+    const credit = Credit.clone(resourceCredits[i]);
+    credit.showOnScreen = credit.showOnScreen || showOnScreen;
+    model._credits.push(credit);
   }
 
   const gltfCredits = model._gltfCredits;
   const gltfCreditsLength = gltfCredits.length;
   for (let i = 0; i < gltfCreditsLength; i++) {
-    gltfCredits[i].showOnScreen =
-      showOnScreen || gltfCredits[i]._isDefaultToken;
+    const credit = Credit.clone(gltfCredits[i]);
+    credit.showOnScreen = credit.showOnScreen || showOnScreen;
+    model._credits.push(credit);
   }
 }
 
@@ -2385,22 +2391,10 @@ function passesDistanceDisplayCondition(model, frameState) {
 
 function addCreditsToCreditDisplay(model, frameState) {
   const creditDisplay = frameState.creditDisplay;
-  // Add all credits to the credit display.
-  const credit = model._credit;
-  if (defined(credit)) {
-    creditDisplay.addCreditToNextFrame(credit);
-  }
-
-  const resourceCredits = model._resourceCredits;
-  const resourceCreditsLength = resourceCredits.length;
-  for (let c = 0; c < resourceCreditsLength; c++) {
-    creditDisplay.addCreditToNextFrame(resourceCredits[c]);
-  }
-
-  const gltfCredits = model._gltfCredits;
-  const gltfCreditsLength = gltfCredits.length;
-  for (let c = 0; c < gltfCreditsLength; c++) {
-    creditDisplay.addCreditToNextFrame(gltfCredits[c]);
+  const credits = model._credits;
+  const creditsLength = credits.length;
+  for (let c = 0; c < creditsLength; c++) {
+    creditDisplay.addCreditToNextFrame(credits[c]);
   }
 }
 
@@ -2795,7 +2789,7 @@ Model.fromGltfAsync = async function (options) {
   if (defined(resourceCredits)) {
     const length = resourceCredits.length;
     for (let i = 0; i < length; i++) {
-      model._resourceCredits.push(resourceCredits[i]);
+      model._resourceCredits.push(Credit.clone(resourceCredits[i]));
     }
   }
 

package/Source/Scene/PostProcessStageLibrary.js

@@ -226,16 +226,16 @@ PostProcessStageLibrary.isDepthOfFieldSupported = function (scene) {
  *
  * @example
  * // multiple silhouette effects
- * const yellowEdge = Cesium.PostProcessLibrary.createEdgeDetectionStage();
+ * const yellowEdge = Cesium.PostProcessStageLibrary.createEdgeDetectionStage();
  * yellowEdge.uniforms.color = Cesium.Color.YELLOW;
  * yellowEdge.selected = [feature0];
  *
- * const greenEdge = Cesium.PostProcessLibrary.createEdgeDetectionStage();
+ * const greenEdge = Cesium.PostProcessStageLibrary.createEdgeDetectionStage();
  * greenEdge.uniforms.color = Cesium.Color.LIME;
  * greenEdge.selected = [feature1];
  *
  * // draw edges around feature0 and feature1
- * postProcessStages.add(Cesium.PostProcessLibrary.createSilhouetteStage([yellowEdge, greenEdge]);
+ * postProcessStages.add(Cesium.PostProcessStageLibrary.createSilhouetteStage([yellowEdge, greenEdge]);
  */
 PostProcessStageLibrary.createEdgeDetectionStage = function () {
   // unique name generated on call so more than one effect can be added

package/Source/Scene/PrimitiveCollection.js

@@ -3,6 +3,7 @@ import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
+import Event from "../Core/Event.js";
 
 /**
  * A collection of primitives.  This is most often used with {@link Scene#primitives},
@@ -31,6 +32,8 @@ function PrimitiveCollection(options) {
 
   this._primitives = [];
   this._guid = createGuid();
+  this._primitiveAdded = new Event();
+  this._primitiveRemoved = new Event();
 
   // Used by the OrderedGroundPrimitiveCollection
   this._zIndex = undefined;
@@ -84,6 +87,35 @@ Object.defineProperties(PrimitiveCollection.prototype, {
       return this._primitives.length;
     },
   },
+
+  /**
+   * An event that is raised when a primitive is added to the collection.
+   * Event handlers are passed the primitive that was added.
+   * @memberof PrimitiveCollection.prototype
+   * @type {Event}
+   * @readonly
+   */
+  primitiveAdded: {
+    get: function () {
+      return this._primitiveAdded;
+    },
+  },
+
+  /**
+   * An event that is raised when a primitive is removed from the collection.
+   * Event handlers are passed the primitive that was removed.
+   * <p>
+   * Note: Depending on the destroyPrimitives constructor option, the primitive may already be destroyed.
+   * </p>
+   * @memberof PrimitiveCollection.prototype
+   * @type {Event}
+   * @readonly
+   */
+  primitiveRemoved: {
+    get: function () {
+      return this._primitiveRemoved;
+    },
+  },
 });
 
 /**
@@ -128,6 +160,8 @@ PrimitiveCollection.prototype.add = function (primitive, index) {
     this._primitives.splice(index, 0, primitive);
   }
 
+  this._primitiveAdded.raiseEvent(primitive);
+
   return primitive;
 };
 
@@ -159,6 +193,8 @@ PrimitiveCollection.prototype.remove = function (primitive) {
         primitive.destroy();
       }
 
+      this._primitiveRemoved.raiseEvent(primitive);
+
       return true;
     }
     // else ... this is not possible, I swear.
@@ -191,9 +227,12 @@ PrimitiveCollection.prototype.removeAll = function () {
   const length = primitives.length;
   for (let i = 0; i < length; ++i) {
     delete primitives[i]._external._composites[this._guid];
+
     if (this.destroyPrimitives) {
       primitives[i].destroy();
     }
+
+    this._primitiveRemoved.raiseEvent(primitives[i]);
   }
   this._primitives = [];
 };

package/Source/Scene/Scene.js

@@ -3166,7 +3166,10 @@ Scene.prototype.updateEnvironment = function () {
         );
         environmentState.isReadyForAtmosphere =
           environmentState.isReadyForAtmosphere ||
+          !globe.show ||
           globe._surface._tilesToRender.length > 0;
+      } else {
+        environmentState.isReadyForAtmosphere = true;
       }
       environmentState.skyAtmosphereCommand = skyAtmosphere.update(
         frameState,