@cesium/engine 2.4.1 → 3.0.0

package/Source/Scene/VoxelPrimitive.js

@@ -8,7 +8,6 @@ import clone from "../Core/clone.js";
 import Color from "../Core/Color.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 Event from "../Core/Event.js";
 import JulianDate from "../Core/JulianDate.js";
@@ -422,28 +421,10 @@ function VoxelPrimitive(options) {
 
   // If the provider fails to initialize the primitive will fail too.
   const provider = this._provider;
-  this._completeLoad = function (primitive, frameState) {};
-  this._readyPromise = initialize(this, provider);
+  initialize(this, provider);
 }
 
-async function initialize(primitive, provider) {
-  const promise = new Promise(function (resolve) {
-    primitive._completeLoad = function (primitive, frameState) {
-      // Set the primitive as ready after the first frame render since the user might set up events subscribed to
-      // the post render event, and the primitive may not be ready for those past the first frame.
-      frameState.afterRender.push(function () {
-        primitive._ready = true;
-        resolve(primitive);
-        return true;
-      });
-    };
-  });
-
-  // This is here for backwards compatibility. It can be removed when readyPromise is removed.
-  if (defined(provider._readyPromise) && !provider._ready) {
-    await provider._readyPromise;
-  }
-
+function initialize(primitive, provider) {
   // Set the bounds
   const {
     shape: shapeType,
@@ -466,8 +447,6 @@ async function initialize(primitive, provider) {
     primitive._shape,
     provider
   );
-
-  return promise;
 }
 
 Object.defineProperties(VoxelPrimitive.prototype, {
@@ -484,24 +463,6 @@ Object.defineProperties(VoxelPrimitive.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the primitive is ready for use.
-   *
-   * @memberof VoxelPrimitive.prototype
-   * @type {Promise<VoxelPrimitive>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "VoxelPrimitive.readyPromise",
-        "VoxelPrimitive.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for VoxelPrimitive.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   /**
    * Gets the {@link VoxelProvider} associated with this primitive.
    *
@@ -988,19 +949,18 @@ VoxelPrimitive.prototype.update = function (frameState) {
   // Update the custom shader in case it has texture uniforms.
   this._customShader.update(frameState);
 
-  // Exit early if it's not ready yet.
-  // This is here for backward compatibility. It can be removed when readyPromise is removed.
-  if ((defined(provider._ready) && !provider._ready) || !defined(this._shape)) {
-    return;
-  }
-
   // Initialize from the ready provider. This only happens once.
   const context = frameState.context;
   if (!this._ready) {
     initFromProvider(this, provider, context);
-    this._completeLoad(this, frameState);
+    // Set the primitive as ready after the first frame render since the user might set up events subscribed to
+    // the post render event, and the primitive may not be ready for those past the first frame.
+    frameState.afterRender.push(() => {
+      this._ready = true;
+      return true;
+    });
 
-    // Don't render until the next frame after the ready promise is resolved
+    // Don't render until the next frame after ready is set to true
     return;
   }
 

package/Source/Scene/VoxelProvider.js

@@ -18,30 +18,6 @@ function VoxelProvider() {
 }
 
 Object.defineProperties(VoxelProvider.prototype, {
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   *
-   * @memberof VoxelProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * Gets the promise that will be resolved when the provider is ready for use.
-   *
-   * @memberof VoxelProvider.prototype
-   * @type {Promise<VoxelProvider>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
   /**
    * A transform from local space to global space. If undefined, the identity matrix will be used instead.
    *

package/Source/Scene/WebMapServiceImageryProvider.js

@@ -1,6 +1,5 @@
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
-import deprecationWarning from "../Core/deprecationWarning.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import GeographicTilingScheme from "../Core/GeographicTilingScheme.js";
 import Resource from "../Core/Resource.js";
@@ -266,9 +265,6 @@ function WebMapServiceImageryProvider(options) {
     ),
     enablePickFeatures: options.enablePickFeatures,
   });
-
-  this._ready = true;
-  this._readyPromise = Promise.resolve(true);
 }
 
 function requestImage(imageryProvider, col, row, level, request, interval) {
@@ -438,40 +434,6 @@ Object.defineProperties(WebMapServiceImageryProvider.prototype, {
     },
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.ready",
-        "WebMapServiceImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107."
-      );
-      return this._tileProvider.ready;
-    },
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.readyPromise",
-        "WebMapServiceImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107."
-      );
-      return this._tileProvider.readyPromise;
-    },
-  },
-
   /**
    * Gets the credit to display when this imagery provider is active.  Typically this is used to credit
    * the source of the imagery.
@@ -560,242 +522,6 @@ Object.defineProperties(WebMapServiceImageryProvider.prototype, {
       return this._getFeatureInfoUrl;
     },
   },
-
-  /**
-   * The default alpha blending value of this provider, with 0.0 representing fully transparent and
-   * 1.0 representing fully opaque.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultAlpha: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultAlpha",
-        "WebMapServiceImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
-      );
-      return this._defaultAlpha;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultAlpha",
-        "WebMapServiceImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
-      );
-      this._defaultAlpha = value;
-    },
-  },
-
-  /**
-   * The default alpha blending value on the night side of the globe of this provider, with 0.0 representing fully transparent and
-   * 1.0 representing fully opaque.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultNightAlpha: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultNightAlpha",
-        "WebMapServiceImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
-      );
-      return this._defaultNightAlpha;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultNightAlpha",
-        "WebMapServiceImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
-      );
-      this._defaultNightAlpha = value;
-    },
-  },
-
-  /**
-   * The default alpha blending value on the day side of the globe of this provider, with 0.0 representing fully transparent and
-   * 1.0 representing fully opaque.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultDayAlpha: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultDayAlpha",
-        "WebMapServiceImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
-      );
-      return this._defaultDayAlpha;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultDayAlpha",
-        "WebMapServiceImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
-      );
-      this._defaultDayAlpha = value;
-    },
-  },
-
-  /**
-   * The default brightness of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0
-   * makes the imagery darker while greater than 1.0 makes it brighter.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultBrightness: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultBrightness",
-        "WebMapServiceImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
-      );
-      return this._defaultBrightness;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultBrightness",
-        "WebMapServiceImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
-      );
-      this._defaultBrightness = value;
-    },
-  },
-
-  /**
-   * The default contrast of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0 reduces
-   * the contrast while greater than 1.0 increases it.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultContrast: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultContrast",
-        "WebMapServiceImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
-      );
-      return this._defaultContrast;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultContrast",
-        "WebMapServiceImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
-      );
-      this._defaultContrast = value;
-    },
-  },
-
-  /**
-   * The default hue of this provider in radians. 0.0 uses the unmodified imagery color.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultHue: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultHue",
-        "WebMapServiceImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.hue instead."
-      );
-      return this._defaultHue;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultHue",
-        "WebMapServiceImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.hue instead."
-      );
-      this._defaultHue = value;
-    },
-  },
-
-  /**
-   * The default saturation of this provider. 1.0 uses the unmodified imagery color. Less than 1.0 reduces the
-   * saturation while greater than 1.0 increases it.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultSaturation: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultSaturation",
-        "WebMapServiceImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
-      );
-      return this._defaultSaturation;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultSaturation",
-        "WebMapServiceImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
-      );
-      this._defaultSaturation = value;
-    },
-  },
-
-  /**
-   * The default gamma correction to apply to this provider.  1.0 uses the unmodified imagery color.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultGamma: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultGamma",
-        "WebMapServiceImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
-      );
-      return this._defaultGamma;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultGamma",
-        "WebMapServiceImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
-      );
-      this._defaultGamma = value;
-    },
-  },
-
-  /**
-   * The default texture minification filter to apply to this provider.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {TextureMinificationFilter}
-   * @deprecated
-   */
-  defaultMinificationFilter: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultMinificationFilter",
-        "WebMapServiceImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
-      );
-      return this._defaultMinificationFilter;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultMinificationFilter",
-        "WebMapServiceImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
-      );
-      this._defaultMinificationFilter = value;
-    },
-  },
-
-  /**
-   * The default texture magnification filter to apply to this provider.
-   * @memberof WebMapServiceImageryProvider.prototype
-   * @type {TextureMagnificationFilter}
-   * @deprecated
-   */
-  defaultMagnificationFilter: {
-    get: function () {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultMagnificationFilter",
-        "WebMapServiceImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
-      );
-      return this._defaultMagnificationFilter;
-    },
-    set: function (value) {
-      deprecationWarning(
-        "WebMapServiceImageryProvider.defaultMagnificationFilter",
-        "WebMapServiceImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
-      );
-      this._defaultMagnificationFilter = value;
-    },
-  },
 });
 
 /**