@cesium/engine 2.4.0 → 3.0.0

package/Source/Scene/Model/Model.js

@@ -6,7 +6,6 @@ import Credit from "../../Core/Credit.js";
 import Color from "../../Core/Color.js";
 import defined from "../../Core/defined.js";
 import defaultValue from "../../Core/defaultValue.js";
-import deprecationWarning from "../../Core/deprecationWarning.js";
 import DeveloperError from "../../Core/DeveloperError.js";
 import destroyObject from "../../Core/destroyObject.js";
 import DistanceDisplayCondition from "../../Core/DistanceDisplayCondition.js";
@@ -457,62 +456,6 @@ function Model(options) {
   this._skipLevelOfDetail = false;
   this._ignoreCommands = defaultValue(options.ignoreCommands, false);
 
-  this._texturesLoadedPromise = undefined;
-
-  this._completeLoad = undefined;
-  this._rejectLoad = undefined;
-  this._completeTexturesLoad = undefined;
-  this._rejectTexturesLoad = undefined;
-
-  // This is for backward compatibility. When readyPromise is removed, this block can be too
-  if (!defined(this._loader._promise)) {
-    this._readyPromise = new Promise((resolve, reject) => {
-      this._completeLoad = () => {
-        resolve(this);
-        return false;
-      };
-      this._rejectLoad = (error) => {
-        reject(error);
-        return false;
-      };
-    });
-
-    // Transcoded .pnts models do not have textures
-    if (this._loader instanceof PntsLoader) {
-      this._texturesLoadedPromise = Promise.resolve(this);
-    } else {
-      this._texturesLoadedPromise = new Promise((resolve, reject) => {
-        this._completeTexturesLoad = () => {
-          resolve(this);
-          return false;
-        };
-        this._rejectTexturesLoad = (error) => {
-          reject(error);
-          return false;
-        };
-      });
-    }
-
-    this._loader.load().catch((error) => {
-      // If the model is destroyed before the promise resolves, then
-      // the loader will have been destroyed as well. Return early.
-      if (
-        this.isDestroyed() ||
-        !defined(this._loader) ||
-        this._loader.isDestroyed()
-      ) {
-        return;
-      }
-
-      this._rejectLoad = this._rejectLoad(
-        ModelUtility.getError("model", this._resource, error)
-      );
-    });
-  } else {
-    this._readyPromise = Promise.resolve(this);
-    this._texturesLoadedPromise = Promise.resolve(this);
-  }
-
   this._errorEvent = new Event();
   this._readyEvent = new Event();
   this._texturesReadyEvent = new Event();
@@ -682,7 +625,7 @@ Object.defineProperties(Model.prototype, {
   /**
    * Returns true if textures are loaded separately from the other glTF resources.
    *
-   * @memberof GltfLoader.prototype
+   * @memberof Model.prototype
    *
    * @type {boolean}
    * @readonly
@@ -709,52 +652,6 @@ Object.defineProperties(Model.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when this model is ready to render, i.e. when the external resources
-   * have been downloaded and the WebGL resources are created.
-   * <p>
-   * This promise is resolved at the end of the frame before the first frame the model is rendered in.
-   * </p>
-   *
-   * @memberof Model.prototype
-   *
-   * @type {Promise<Model>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Model.readyPromise",
-        "Model.readyPromise was deprecated in CesiumJS 1.104.  It will be removed in 1.107. Use Model.fromGltfAsync and Model.readyEvent instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
-  /**
-   * A promise that resolves when all textures are loaded.
-   * When <code>incrementallyLoadTextures</code> is true this may resolve after
-   * <code>promise</code> resolves.
-   *
-   * @memberof Model.prototype
-   *
-   * @type {Promise<void>}
-   * @readonly
-   * @deprecated
-   *
-   * @private
-   */
-  texturesLoadedPromise: {
-    get: function () {
-      deprecationWarning(
-        "Model.texturesLoadedPromise",
-        "Model.texturesLoadedPromise was deprecated in CesiumJS 1.104.  It will be removed in 1.107. Use Model.fromGltfAsync and Model.texturesReadyEvent instead."
-      );
-      return this._texturesLoadedPromise;
-    },
-  },
-
   /**
    * @private
    */
@@ -1820,22 +1717,11 @@ Model.prototype.update = function (frameState) {
     // are processed.
     finishedProcessing = processLoader(this, frameState);
   } catch (error) {
-    if (!this._loader.incrementallyLoadTextures) {
-      const runtimeError = ModelUtility.getError(
-        "model",
-        this._resource,
-        error
-      );
-      handleError(this, runtimeError);
-
-      this._rejectLoad = this._rejectLoad && this._rejectLoad(runtimeError);
-      this._rejectTexturesLoad =
-        this._rejectTexturesLoad && this._rejectTexturesLoad(runtimeError);
-    } else if (error.name === "TextureError") {
+    if (
+      !this._loader.incrementallyLoadTextures &&
+      error.name === "TextureError"
+    ) {
       handleError(this, error);
-
-      this._rejectTexturesLoad =
-        this._rejectTexturesLoad && this._rejectTexturesLoad(error);
     } else {
       const runtimeError = ModelUtility.getError(
         "model",
@@ -1843,8 +1729,6 @@ Model.prototype.update = function (frameState) {
         error
       );
       handleError(this, runtimeError);
-
-      this._rejectLoad = this._rejectLoad && this._rejectLoad(runtimeError);
     }
   }
 
@@ -1926,17 +1810,9 @@ Model.prototype.update = function (frameState) {
     frameState.afterRender.push(() => {
       this._ready = true;
       this._readyEvent.raiseEvent(this);
-      // This is here for backwards compatibility and can be removed when readyPromise is removed.
-      this._completeLoad = this._completeLoad && this._completeLoad();
-      if (!this._loader.incrementallyLoadTextures) {
-        this._texturesLoaded = true;
-        this._texturesReadyEvent.raiseEvent(this);
-        this._completeTexturesLoad =
-          this._completeTexturesLoad && this._completeTexturesLoad();
-      }
     });
 
-    // Don't render until the next frame after the ready promise is resolved
+    // Don't render until the next frame after the ready event has been raised.
     return;
   }
 
@@ -1950,8 +1826,6 @@ Model.prototype.update = function (frameState) {
 
     this._texturesLoaded = true;
     this._texturesReadyEvent.raiseEvent(this);
-    this._completeTexturesLoad =
-      this._completeTexturesLoad && this._completeTexturesLoad();
   }
 
   updatePickIds(this);
@@ -2718,123 +2592,6 @@ Model.prototype.destroyModelResources = function () {
   this._modelResources.length = 0;
 };
 
-/**
- * <p>
- * Creates a model from a glTF asset.  When the model is ready to render, i.e., when the external binary, image,
- * and shader files are downloaded and the WebGL resources are created, the {@link Model#readyPromise} is resolved.
- * </p>
- * <p>
- * The model can be a traditional glTF asset with a .gltf extension or a Binary glTF using the .glb extension.
- *
- * @param {object} options Object with the following properties:
- * @param {string|Resource} options.url The url to the .gltf or .glb file.
- * @param {string|Resource} [options.basePath=''] The base path that paths in the glTF JSON are relative to.
- * @param {boolean} [options.show=true] Whether or not to render the model.
- * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 transformation matrix that transforms the model from model to world coordinates.
- * @param {number} [options.scale=1.0] A uniform scale applied to this model.
- * @param {number} [options.minimumPixelSize=0.0] The approximate minimum pixel size of the model regardless of zoom.
- * @param {number} [options.maximumScale] The maximum scale size of a model. An upper limit for minimumPixelSize.
- * @param {object} [options.id] A user-defined object to return when the model is picked with {@link Scene#pick}.
- * @param {boolean} [options.allowPicking=true] When <code>true</code>, each primitive is pickable with {@link Scene#pick}.
- * @param {boolean} [options.incrementallyLoadTextures=true] Determine if textures may continue to stream in after the model is loaded.
- * @param {boolean} [options.asynchronous=true] Determines if model WebGL resource creation will be spread out over several frames or block until completion once all glTF files are loaded.
- * @param {boolean} [options.clampAnimations=true] Determines if the model's animations should hold a pose over frames where no keyframes are specified.
- * @param {ShadowMode} [options.shadows=ShadowMode.ENABLED] Determines whether the model casts or receives shadows from light sources.
- * @param {boolean} [options.releaseGltfJson=false] When true, the glTF JSON is released once the glTF is loaded. This is is especially useful for cases like 3D Tiles, where each .gltf model is unique and caching the glTF JSON is not effective.
- * @param {boolean} [options.debugShowBoundingVolume=false] For debugging only. Draws the bounding sphere for each draw command in the model.
- * @param {boolean} [options.enableDebugWireframe=false] For debugging only. This must be set to true for debugWireframe to work in WebGL1. This cannot be set after the model has loaded.
- * @param {boolean} [options.debugWireframe=false] For debugging only. Draws the model in wireframe. Will only work for WebGL1 if enableDebugWireframe is set to true.
- * @param {boolean} [options.cull=true]  Whether or not to cull the model using frustum/horizon culling. If the model is part of a 3D Tiles tileset, this property will always be false, since the 3D Tiles culling system is used.
- * @param {boolean} [options.opaquePass=Pass.OPAQUE] The pass to use in the {@link DrawCommand} for the opaque portions of the model.
- * @param {Axis} [options.upAxis=Axis.Y] The up-axis of the glTF model.
- * @param {Axis} [options.forwardAxis=Axis.Z] The forward-axis of the glTF model.
- * @param {CustomShader} [options.customShader] A custom shader. This will add user-defined GLSL code to the vertex and fragment shaders. Using custom shaders with a {@link Cesium3DTileStyle} may lead to undefined behavior.
- * @param {Cesium3DTileContent} [options.content] The tile content this model belongs to. This property will be undefined if model is not loaded as part of a tileset.
- * @param {HeightReference} [options.heightReference=HeightReference.NONE] Determines how the model is drawn relative to terrain.
- * @param {Scene} [options.scene] Must be passed in for models that use the height reference property.
- * @param {DistanceDisplayCondition} [options.distanceDisplayCondition] The condition specifying at what distance from the camera that this model will be displayed.
- * @param {Color} [options.color] A color that blends with the model's rendered color.
- * @param {ColorBlendMode} [options.colorBlendMode=ColorBlendMode.HIGHLIGHT] Defines how the color blends with the model.
- * @param {number} [options.colorBlendAmount=0.5] Value used to determine the color strength when the <code>colorBlendMode</code> is <code>MIX</code>. A value of 0.0 results in the model's rendered color while a value of 1.0 results in a solid color, with any value in-between resulting in a mix of the two.
- * @param {Color} [options.silhouetteColor=Color.RED] The silhouette color. If more than 256 models have silhouettes enabled, there is a small chance that overlapping models will have minor artifacts.
- * @param {number} [options.silhouetteSize=0.0] The size of the silhouette in pixels.
- * @param {boolean} [options.enableShowOutline=true] Whether to enable outlines for models using the {@link https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/CESIUM_primitive_outline|CESIUM_primitive_outline} extension. This can be set false to avoid post-processing geometry at load time. When false, the showOutlines and outlineColor options are ignored.
- * @param {boolean} [options.showOutline=true] Whether to display the outline for models using the {@link https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/CESIUM_primitive_outline|CESIUM_primitive_outline} extension. When true, outlines are displayed. When false, outlines are not displayed.
- * @param {Color} [options.outlineColor=Color.BLACK] The color to use when rendering outlines.
- * @param {ClippingPlaneCollection} [options.clippingPlanes] The {@link ClippingPlaneCollection} used to selectively disable rendering the model.
- * @param {Cartesian3} [options.lightColor] The light color when shading the model. When <code>undefined</code> the scene's light color is used instead.
- * @param {ImageBasedLighting} [options.imageBasedLighting] The properties for managing image-based lighting on this model.
- * @param {boolean} [options.backFaceCulling=true] Whether to cull back-facing geometry. When true, back face culling is determined by the material's doubleSided property; when false, back face culling is disabled. Back faces are not culled if the model's color is translucent.
- * @param {Credit|string} [options.credit] A credit for the data source, which is displayed on the canvas.
- * @param {boolean} [options.showCreditsOnScreen=false] Whether to display the credits of this model on screen.
- * @param {SplitDirection} [options.splitDirection=SplitDirection.NONE] The {@link SplitDirection} split to apply to this model.
- * @param {boolean} [options.projectTo2D=false] Whether to accurately project the model's positions in 2D. If this is true, the model will be projected accurately to 2D, but it will use more memory to do so. If this is false, the model will use less memory and will still render in 2D / CV mode, but its positions may be inaccurate. This disables minimumPixelSize and prevents future modification to the model matrix. This also cannot be set after the model has loaded.
- * @param {string|number} [options.featureIdLabel="featureId_0"] Label of the feature ID set to use for picking and styling. For EXT_mesh_features, this is the feature ID's label property, or "featureId_N" (where N is the index in the featureIds array) when not specified. EXT_feature_metadata did not have a label field, so such feature ID sets are always labeled "featureId_N" where N is the index in the list of all feature Ids, where feature ID attributes are listed before feature ID textures. If featureIdLabel is an integer N, it is converted to the string "featureId_N" automatically. If both per-primitive and per-instance feature IDs are present, the instance feature IDs take priority.
- * @param {string|number} [options.instanceFeatureIdLabel="instanceFeatureId_0"] Label of the instance feature ID set used for picking and styling. If instanceFeatureIdLabel is set to an integer N, it is converted to the string "instanceFeatureId_N" automatically. If both per-primitive and per-instance feature IDs are present, the instance feature IDs take priority.
- * @param {object} [options.pointCloudShading] Options for constructing a {@link PointCloudShading} object to control point attenuation and lighting.
- * @param {ClassificationType} [options.classificationType] Determines whether terrain, 3D Tiles or both will be classified by this model. This cannot be set after the model has loaded.
- *
- * @returns {Model} The newly created model.
- */
-Model.fromGltf = function (options) {
-  deprecationWarning(
-    "Model.fromGltf",
-    "Model.fromGltf was deprecated in CesiumJS 1.104.  It will be removed in 1.107. Use Model.fromGltfAsync instead."
-  );
-
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-
-  //>>includeStart('debug', pragmas.debug);
-  if (!defined(options.url) && !defined(options.gltf)) {
-    throw new DeveloperError("options.url is required.");
-  }
-  //>>includeEnd('debug');
-
-  // options.gltf is used internally for 3D Tiles. It can be a Resource, a URL
-  // to a glTF/glb file, a binary glTF buffer, or a JSON object containing the
-  // glTF contents.
-  const gltf = defaultValue(options.url, options.gltf);
-
-  const loaderOptions = {
-    releaseGltfJson: options.releaseGltfJson,
-    asynchronous: options.asynchronous,
-    incrementallyLoadTextures: options.incrementallyLoadTextures,
-    upAxis: options.upAxis,
-    forwardAxis: options.forwardAxis,
-    loadAttributesFor2D: options.projectTo2D,
-    loadIndicesForWireframe: options.enableDebugWireframe,
-    loadPrimitiveOutline: options.enableShowOutline,
-    loadForClassification: defined(options.classificationType),
-  };
-
-  const basePath = defaultValue(options.basePath, "");
-  const baseResource = Resource.createIfNeeded(basePath);
-
-  if (defined(gltf.asset)) {
-    loaderOptions.gltfJson = gltf;
-    loaderOptions.baseResource = baseResource;
-    loaderOptions.gltfResource = baseResource;
-  } else if (gltf instanceof Uint8Array) {
-    loaderOptions.typedArray = gltf;
-    loaderOptions.baseResource = baseResource;
-    loaderOptions.gltfResource = baseResource;
-  } else {
-    loaderOptions.gltfResource = Resource.createIfNeeded(gltf);
-  }
-
-  const loader = new GltfLoader(loaderOptions);
-
-  const is3DTiles = defined(options.content);
-  const type = is3DTiles ? ModelType.TILE_GLTF : ModelType.GLTF;
-
-  const modelOptions = makeModelOptions(loader, type, options);
-  modelOptions.resource = loaderOptions.gltfResource;
-
-  const model = new Model(modelOptions);
-
-  return model;
-};
-
 /**
  * <p>
  * Asynchronously creates a model from a glTF asset. This function returns a promise that resolves when the model is ready to render, i.e., when the external binary, image,

package/Source/Scene/Model/Model3DTileContent.js

@@ -2,7 +2,6 @@ import Color from "../../Core/Color.js";
 import combine from "../../Core/combine.js";
 import defined from "../../Core/defined.js";
 import destroyObject from "../../Core/destroyObject.js";
-import deprecationWarning from "../../Core/deprecationWarning.js";
 import DeveloperError from "../../Core/DeveloperError.js";
 import Pass from "../../Renderer/Pass.js";
 import ModelAnimationLoop from "../ModelAnimationLoop.js";
@@ -30,9 +29,6 @@ function Model3DTileContent(tileset, tile, resource) {
   this._metadata = undefined;
   this._group = undefined;
   this._ready = false;
-
-  this._resolveContent = undefined;
-  this._readyPromise = undefined;
 }
 
 Object.defineProperties(Model3DTileContent.prototype, {
@@ -104,26 +100,6 @@ Object.defineProperties(Model3DTileContent.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the tile's content is ready to render.
-   *
-   * @memberof Model3DTileContent.prototype
-   *
-   * @type {Promise<Model3DTileContent>}
-   * @readonly
-   * @deprecated
-   * @private
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Model3DTileContent.readyPromise",
-        "Model3DTileContent.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Model3DTileContent.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   tileset: {
     get: function () {
       return this._tileset;
@@ -287,7 +263,6 @@ Model3DTileContent.prototype.update = function (tileset, frameState) {
     });
 
     this._ready = true;
-    this._resolveContent = this._resolveContent && this._resolveContent(this);
   }
 };
 
@@ -324,11 +299,6 @@ Model3DTileContent.fromGltf = async function (tileset, tile, resource, gltf) {
   const model = await Model.fromGltfAsync(modelOptions);
   content._model = model;
 
-  // This is for backwards compatibility. It can be removed once readyPromise is removed.
-  content._readyPromise = new Promise((resolve) => {
-    content._resolveContent = resolve;
-  });
-
   return content;
 };
 
@@ -363,11 +333,6 @@ Model3DTileContent.fromB3dm = async function (
   const model = await Model.fromB3dm(modelOptions);
   content._model = model;
 
-  // This is for backwards compatibility. It can be removed once readyPromise is removed.
-  content._readyPromise = new Promise((resolve) => {
-    content._resolveContent = resolve;
-  });
-
   return content;
 };
 
@@ -396,11 +361,6 @@ Model3DTileContent.fromI3dm = async function (
   const model = await Model.fromI3dm(modelOptions);
   content._model = model;
 
-  // This is for backwards compatibility. It can be removed once readyPromise is removed.
-  content._readyPromise = new Promise((resolve) => {
-    content._resolveContent = resolve;
-  });
-
   return content;
 };
 
@@ -428,11 +388,6 @@ Model3DTileContent.fromPnts = async function (
   const model = await Model.fromPnts(modelOptions);
   content._model = model;
 
-  // This is for backwards compatibility. It can be removed once readyPromise is removed.
-  content._readyPromise = new Promise((resolve) => {
-    content._resolveContent = resolve;
-  });
-
   return content;
 };
 
@@ -458,11 +413,6 @@ Model3DTileContent.fromGeoJson = async function (
   const model = await Model.fromGeoJson(modelOptions);
   content._model = model;
 
-  // This is for backwards compatibility. It can be removed once readyPromise is removed.
-  content._readyPromise = new Promise((resolve) => {
-    content._resolveContent = resolve;
-  });
-
   return content;
 };
 

package/Source/Scene/Model/ModelAnimationCollection.js

@@ -241,7 +241,7 @@ ModelAnimationCollection.prototype.add = function (options) {
  * @param {ModelAnimation.AnimationTimeCallback} [options.animationTime=undefined] If defined, computes the local animation time for all of the animations.
  * @returns {ModelAnimation[]} An array of {@link ModelAnimation} objects, one for each animation added to the collection.  If there are no glTF animations, the array is empty.
  *
- * @exception {DeveloperError} Animations are not loaded. Wait for the {@link Model#readyPromise} to resolve.
+ * @exception {DeveloperError} Animations are not loaded. Wait for the {@link Model#ready} to return true.
  * @exception {DeveloperError} options.multiplier must be greater than zero.
  *
  * @example

package/Source/Scene/Model/PointCloudStylingPipelineStage.js

@@ -161,7 +161,7 @@ PointCloudStylingPipelineStage.process = function (
     if (is3DTiles) {
       defaultPointSize = usesAddRefinement
         ? 5.0
-        : content.tileset.maximumScreenSpaceError;
+        : content.tileset.memoryAdjustedScreenSpaceError;
     }
     vec4.x = defaultValue(
       pointCloudShading.maximumAttenuation,

package/Source/Scene/Multiple3DTileContent.js

@@ -1,5 +1,4 @@
 import defined from "../Core/defined.js";
-import deprecationWarning from "../Core/deprecationWarning.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Request from "../Core/Request.js";
@@ -57,11 +56,6 @@ function Multiple3DTileContent(tileset, tile, tilesetResource, contentsJson) {
   this._requests = new Array(contentCount);
   this._ready = false;
 
-  this._resolveContent = undefined;
-  this._readyPromise = new Promise((resolve) => {
-    this._resolveContent = resolve;
-  });
-
   this._innerContentResources = new Array(contentCount);
   this._serverKeys = new Array(contentCount);
 
@@ -236,26 +230,6 @@ Object.defineProperties(Multiple3DTileContent.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the tile's content is ready to render.
-   *
-   * @memberof Multiple3DTileContent.prototype
-   *
-   * @type {Promise<Multiple3DTileContent>}
-   * @readonly
-   * @deprecated
-   * @private
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Multiple3DTileContent.readyPromise",
-        "Multiple3DTileContent.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Multiple3DTileContent.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   tileset: {
     get: function () {
       return this._tileset;
@@ -673,7 +647,6 @@ Multiple3DTileContent.prototype.update = function (tileset, frameState) {
 
   if (!this._ready && ready) {
     this._ready = true;
-    this._resolveContent(this);
   }
 };
 

package/Source/Scene/Primitive.js

@@ -9,7 +9,6 @@ import combine from "../Core/combine.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
-import deprecationWarning from "../Core/deprecationWarning.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import EncodedCartesian3 from "../Core/EncodedCartesian3.js";
@@ -350,25 +349,6 @@ function Primitive(options) {
   this._createGeometryResults = undefined;
   this._ready = false;
 
-  const primitive = this;
-  // This is here for backwards compatibility. This promise wrapper can be removed once readyPromise is removed.
-  this._readyPromise = new Promise((resolve, reject) => {
-    primitive._completeLoad = (frameState, state, error) => {
-      this._error = error;
-      this._state = state;
-      frameState.afterRender.push(function () {
-        primitive._ready =
-          primitive._state === PrimitiveState.COMPLETE ||
-          primitive._state === PrimitiveState.FAILED;
-        if (!defined(error)) {
-          resolve(primitive);
-          return true;
-        }
-        reject(error);
-      });
-    };
-  });
-
   this._batchTable = undefined;
   this._batchTableAttributeIndices = undefined;
   this._offsetInstanceExtend = undefined;
@@ -507,23 +487,6 @@ Object.defineProperties(Primitive.prototype, {
       return this._ready;
     },
   },
-
-  /**
-   * Gets a promise that resolves when the primitive is ready to render.
-   * @memberof Primitive.prototype
-   * @type {Promise<Primitive>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Primitive.readyPromise",
-        "Primitive.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Primitive.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
 });
 
 function getCommonPerInstanceAttributeNames(instances) {
@@ -2542,6 +2505,15 @@ Primitive.prototype.destroy = function () {
 };
 
 function setReady(primitive, frameState, state, error) {
-  primitive._completeLoad(frameState, state, error);
+  primitive._error = error;
+  primitive._state = state;
+  frameState.afterRender.push(function () {
+    primitive._ready =
+      primitive._state === PrimitiveState.COMPLETE ||
+      primitive._state === PrimitiveState.FAILED;
+    if (!defined(error)) {
+      return true;
+    }
+  });
 }
 export default Primitive;

package/Source/Scene/QuadtreePrimitive.js

@@ -520,8 +520,8 @@ function selectTilesForRendering(primitive, frameState) {
   let i;
   const tileProvider = primitive._tileProvider;
   if (!defined(primitive._levelZeroTiles)) {
-    // ready is deprecated. This is here for backwards compatibility
-    if (tileProvider.ready) {
+    const tilingScheme = tileProvider.tilingScheme;
+    if (defined(tilingScheme)) {
       const tilingScheme = tileProvider.tilingScheme;
       primitive._levelZeroTiles = QuadtreeTile.createLevelZeroTiles(
         tilingScheme
@@ -536,7 +536,6 @@ function selectTilesForRendering(primitive, frameState) {
         }
       }
     } else {
-      // Nothing to do until the provider is ready.
       return;
     }
   }
@@ -1389,8 +1388,7 @@ const scratchPosition = new Cartesian3();
 const scratchArray = [];
 
 function updateHeights(primitive, frameState) {
-  // ready is deprecated. This is here for backwards compatibility.
-  if (!primitive.tileProvider.ready) {
+  if (!defined(primitive.tileProvider.tilingScheme)) {
     return;
   }
 

package/Source/Scene/QuadtreeTileProvider.js

@@ -42,16 +42,6 @@ Object.defineProperties(QuadtreeTileProvider.prototype, {
     set: DeveloperError.throwInstantiationError,
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof QuadtreeTileProvider.prototype
-   * @type {boolean}
-   * @deprecated
-   */
-  ready: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
   /**
    * Gets the tiling scheme used by the provider.
    * @memberof QuadtreeTileProvider.prototype

package/Source/Scene/Scene.js

@@ -754,13 +754,13 @@ Object.defineProperties(Scene.prototype, {
   },
 
   /**
-   * The drawingBufferHeight of the underlying GL context.
+   * The drawingBufferWidth of the underlying GL context.
    * @memberof Scene.prototype
    *
    * @type {number}
    * @readonly
    *
-   * @see {@link https://www.khronos.org/registry/webgl/specs/1.0/#DOM-WebGLRenderingContext-drawingBufferHeight|drawingBufferHeight}
+   * @see {@link https://www.khronos.org/registry/webgl/specs/1.0/#DOM-WebGLRenderingContext-drawingBufferWidth|drawingBufferWidth}
    */
   drawingBufferWidth: {
     get: function () {
@@ -3867,7 +3867,7 @@ Scene.prototype.render = function (time) {
   updateDebugShowFramesPerSecond(this, shouldRender);
   tryAndCatchError(this, postPassesUpdate);
 
-  // Often used to trigger events (so don't want in trycatch) that the user might be subscribed to. Things like the tile load events, ready promises, etc.
+  // Often used to trigger events (so don't want in trycatch) that the user might be subscribed to. Things like the tile load events, promises, etc.
   // We don't want those events to resolve during the render loop because the events might add new primitives
   callAfterRenderFunctions(this);