@cesium/engine 2.4.0 → 3.0.0

package/Source/Scene/GroundPolylinePrimitive.js

@@ -4,7 +4,6 @@ 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 deprecationWarning from "../Core/deprecationWarning.js";
 import GeometryInstance from "../Core/GeometryInstance.js";
 import GeometryInstanceAttribute from "../Core/GeometryInstanceAttribute.js";
 import GroundPolylineGeometry from "../Core/GroundPolylineGeometry.js";
@@ -193,25 +192,6 @@ function GroundPolylinePrimitive(options) {
   this._zIndex = undefined;
 
   this._ready = false;
-  const groundPolylinePrimitive = this;
-  // This is here for backwards compatibility. This promise wrapper can be removed once readyPromise is removed.
-  this._readyPromise = new Promise((resolve, reject) => {
-    groundPolylinePrimitive._completeLoad = () => {
-      this._ready = true;
-
-      if (this.releaseGeometryInstances) {
-        this.geometryInstances = undefined;
-      }
-
-      const error = this._error;
-      if (!defined(error)) {
-        resolve(this);
-      } else {
-        reject(error);
-      }
-    };
-  });
-
   this._primitive = undefined;
 
   this._sp = undefined;
@@ -315,23 +295,6 @@ Object.defineProperties(GroundPolylinePrimitive.prototype, {
     },
   },
 
-  /**
-   * Gets a promise that resolves when the primitive is ready to render.
-   * @memberof GroundPolylinePrimitive.prototype
-   * @type {Promise<GroundPolylinePrimitive>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "GroundPolylinePrimitive.readyPromise",
-        "GroundPolylinePrimitive.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for GroundPolylinePrimitive.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   /**
    * This property is for debugging only; it is not for production use nor is it optimized.
    * <p>
@@ -849,7 +812,11 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
   this._primitive.update(frameState);
   frameState.afterRender.push(() => {
     if (!this._ready && defined(this._primitive) && this._primitive.ready) {
-      this._completeLoad();
+      this._ready = true;
+
+      if (this.releaseGeometryInstances) {
+        this.geometryInstances = undefined;
+      }
     }
   });
 };

package/Source/Scene/GroundPrimitive.js

@@ -5,7 +5,6 @@ import Cartographic from "../Core/Cartographic.js";
 import Check from "../Core/Check.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 GeometryInstance from "../Core/GeometryInstance.js";
@@ -212,30 +211,6 @@ function GroundPrimitive(options) {
   this._boundingVolumes2D = [];
 
   this._ready = false;
-
-  const groundPrimitive = this;
-  // This is here for backwards compatibility. This promise wrapper can be removed once readyPromise is removed.
-  this._readyPromise = new Promise((resolve, reject) => {
-    groundPrimitive._completeLoad = () => {
-      if (this._ready) {
-        return;
-      }
-
-      this._ready = true;
-
-      if (this.releaseGeometryInstances) {
-        this.geometryInstances = undefined;
-      }
-
-      const error = this._error;
-      if (!defined(error)) {
-        resolve(this);
-      } else {
-        reject(error);
-      }
-    };
-  });
-
   this._primitive = undefined;
 
   this._maxHeight = undefined;
@@ -384,23 +359,6 @@ Object.defineProperties(GroundPrimitive.prototype, {
       return this._ready;
     },
   },
-
-  /**
-   * Gets a promise that resolves when the primitive is ready to render.
-   * @memberof GroundPrimitive.prototype
-   * @type {Promise<GroundPrimitive>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "GroundPrimitive.readyPromise",
-        "GroundPrimitive.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for GroundPrimitive.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
 });
 
 /**
@@ -942,7 +900,11 @@ GroundPrimitive.prototype.update = function (frameState) {
 
   frameState.afterRender.push(() => {
     if (!this._ready && defined(this._primitive) && this._primitive.ready) {
-      this._completeLoad();
+      this._ready = true;
+
+      if (this.releaseGeometryInstances) {
+        this.geometryInstances = undefined;
+      }
     }
   });
 };

package/Source/Scene/I3SDataProvider.js

@@ -51,7 +51,6 @@ import Cartographic from "../Core/Cartographic.js";
 import Check from "../Core/Check.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 HeightmapEncoding from "../Core/HeightmapEncoding.js";
 import Resource from "../Core/Resource.js";
@@ -67,7 +66,6 @@ import Rectangle from "../Core/Rectangle.js";
  *
  * Initialization options for the I3SDataProvider constructor
  *
- * @property {Resource|string} [url] The url of the I3S dataset. Deprecated.
  * @property {string} [name] The name of the I3S dataset.
  * @property {boolean} [show=true] Determines if the dataset will be shown.
  * @property {ArcGISTiledElevationTerrainProvider|Promise<ArcGISTiledElevationTerrainProvider>} [geoidTiledTerrainProvider] Tiled elevation provider describing an Earth Gravitational Model. If defined, geometry will be shifted based on the offsets given by this provider. Required to position I3S data sets with gravity-related height at the correct location.
@@ -139,18 +137,6 @@ function I3SDataProvider(options) {
   this._geoidDataList = undefined;
   this._decoderTaskProcessor = undefined;
   this._taskProcessorReadyPromise = undefined;
-
-  if (defined(options.url)) {
-    deprecationWarning(
-      "I3SDataProvider options.url",
-      "I3SDataProvider constructor parameter options.url was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
-    );
-    this._readyPromise = undefined;
-    this._ready = false;
-
-    this._resource = Resource.createIfNeeded(options.url);
-    this._load();
-  }
 }
 
 Object.defineProperties(I3SDataProvider.prototype, {
@@ -255,41 +241,6 @@ Object.defineProperties(I3SDataProvider.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the I3S scene is loaded.
-   * @memberof I3SDataProvider.prototype
-   * @type {Promise<I3SDataProvider>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "I3SDataProvider.readyPromise",
-        "I3SDataProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
-  /**
-   * When <code>true</code>, the I3S scene is loaded.
-   * This is set to <code>true</code> right before {@link I3SDataProvider#readyPromise} is resolved.
-   * @memberof I3SDataProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "I3SDataProvider.ready",
-        "I3SDataProvider.ready was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
-      );
-      return this._ready;
-    },
-  },
-
   /**
    * The resource used to fetch the I3S dataset.
    * @memberof I3SDataProvider.prototype
@@ -451,57 +402,15 @@ I3SDataProvider.fromUrl = async function (url, options) {
   // Start loading all of the tiles
   const layerPromises = [];
   for (let i = 0; i < provider._layers.length; i++) {
-    layerPromises.push(provider._layers[i].load());
+    layerPromises.push(
+      provider._layers[i].load(options.cesium3dTilesetOptions)
+    );
   }
 
   await Promise.all(layerPromises);
-  provider._ready = true;
-  provider._readyPromise = Promise.resolve(provider);
   return provider;
 };
 
-/**
- * @private
- */
-I3SDataProvider.prototype._load = function () {
-  const that = this;
-  this._readyPromise = I3SDataProvider.loadJson(
-    this._resource,
-    this._traceFetches
-  ).then(function (data) {
-    // Success
-    that._data = data;
-    if (defined(data.layers)) {
-      for (let layerIndex = 0; layerIndex < data.layers.length; layerIndex++) {
-        const newLayer = new I3SLayer(
-          that,
-          data.layers[layerIndex],
-          layerIndex
-        );
-        that._layers.push(newLayer);
-      }
-    } else {
-      const newLayer = new I3SLayer(that, data, data.id);
-      that._layers.push(newLayer);
-    }
-
-    that._computeExtent();
-
-    // Start loading all of the tiles
-    const layerPromises = [];
-    for (let i = 0; i < that._layers.length; i++) {
-      layerPromises.push(that._layers[i].load());
-    }
-
-    return Promise.all(layerPromises).then(function () {
-      that._ready = true;
-      return that;
-    });
-  });
-
-  return this._readyPromise;
-};
-
 /**
  * @private
  */
@@ -609,13 +518,9 @@ I3SDataProvider.prototype.getDecoderTaskProcessor = function () {
   return this._taskProcessorReadyPromise;
 };
 
-function getCoveredTiles(terrainProvider, extent) {
-  return getTiles(terrainProvider, extent);
-}
-
 const scratchCartesian2 = new Cartesian2();
 
-function getTiles(terrainProvider, extent) {
+function getCoveredTiles(terrainProvider, extent) {
   const tilingScheme = terrainProvider.tilingScheme;
 
   // Sort points into a set of tiles

package/Source/Scene/I3SLayer.js

@@ -19,9 +19,9 @@ import I3SNode from "./I3SNode.js";
 function I3SLayer(dataProvider, layerData, index) {
   this._dataProvider = dataProvider;
 
-  if (!defined(layerData.href)) {
+  if (!defined(layerData.href) && defined(index)) {
     // assign a default layer
-    layerData.href = `./layers/${index}`;
+    layerData.href = `layers/${index}`;
   }
 
   const dataProviderUrl = this._dataProvider.resource.getUrlComponent();
@@ -165,10 +165,11 @@ Object.defineProperties(I3SLayer.prototype, {
 
 /**
  * Loads the content, including the root node definition and its children
+ * @param {Cesium3DTileset.ConstructorOptions} [cesium3dTilesetOptions] options for Cesium3dTileset constructor
  * @returns {Promise} A promise that is resolved when the layer data is loaded
  * @private
  */
-I3SLayer.prototype.load = async function () {
+I3SLayer.prototype.load = async function (cesium3dTilesetOptions) {
   if (this._data.spatialReference.wkid !== 4326) {
     throw new RuntimeError(
       `Unsupported spatial reference: ${this._data.spatialReference.wkid}`
@@ -176,8 +177,8 @@ I3SLayer.prototype.load = async function () {
   }
 
   await this._dataProvider.loadGeoidData();
-  await this._loadRootNode();
-  await this._create3DTileset();
+  await this._loadRootNode(cesium3dTilesetOptions);
+  await this._create3DTileset(cesium3dTilesetOptions);
 
   this._rootNode._tile = this._tileset._root;
   this._tileset._root._i3sNode = this._rootNode;
@@ -288,7 +289,7 @@ I3SLayer.prototype._findBestGeometryBuffers = function (
 /**
  * @private
  */
-I3SLayer.prototype._loadRootNode = function () {
+I3SLayer.prototype._loadRootNode = function (cesium3dTilesetOptions) {
   if (defined(this._data.nodePages)) {
     let rootIndex = 0;
     if (defined(this._data.nodePages.rootIndex)) {
@@ -299,7 +300,7 @@ I3SLayer.prototype._loadRootNode = function () {
     this._rootNode = new I3SNode(this, this._data.store.rootNode, true);
   }
 
-  return this._rootNode.load();
+  return this._rootNode.load(cesium3dTilesetOptions);
 };
 
 /**
@@ -308,9 +309,8 @@ I3SLayer.prototype._loadRootNode = function () {
 I3SLayer.prototype._getNodeInNodePages = function (nodeIndex) {
   const index = Math.floor(nodeIndex / this._data.nodePages.nodesPerPage);
   const offsetInPage = nodeIndex % this._data.nodePages.nodesPerPage;
-  const that = this;
-  return this._loadNodePage(index).then(function () {
-    return that._nodePages[index][offsetInPage];
+  return this._loadNodePage(index).then(function (data) {
+    return data.nodes[offsetInPage];
   });
 };
 
@@ -373,7 +373,7 @@ I3SLayer.prototype._computeExtent = function () {
 /**
  * @private
  */
-I3SLayer.prototype._create3DTileset = async function () {
+I3SLayer.prototype._create3DTileset = async function (cesium3dTilesetOptions) {
   const inPlaceTileset = {
     asset: {
       version: "1.0",
@@ -387,17 +387,10 @@ I3SLayer.prototype._create3DTileset = async function () {
   });
 
   const tilesetUrl = URL.createObjectURL(tilesetBlob);
-
-  const tilesetOptions = {};
-  if (defined(this._dataProvider._cesium3dTilesetOptions)) {
-    for (const x in this._dataProvider._cesium3dTilesetOptions) {
-      if (this._dataProvider._cesium3dTilesetOptions.hasOwnProperty(x)) {
-        tilesetOptions[x] = this._dataProvider._cesium3dTilesetOptions[x];
-      }
-    }
-  }
-
-  this._tileset = await Cesium3DTileset.fromUrl(tilesetUrl, tilesetOptions);
+  this._tileset = await Cesium3DTileset.fromUrl(
+    tilesetUrl,
+    cesium3dTilesetOptions
+  );
   this._tileset.show = this._dataProvider.show;
   this._tileset._isI3STileSet = true;
   this._tileset.tileUnload.addEventListener(function (tile) {

package/Source/Scene/Imagery.js

@@ -34,12 +34,7 @@ function Imagery(imageryLayer, x, y, level, rectangle) {
   this.credits = undefined;
   this.referenceCount = 0;
 
-  // imageryProvider._ready is deprecated; This is here for backward compatibility
-  if (
-    !defined(rectangle) &&
-    imageryLayer.ready &&
-    imageryLayer.imageryProvider._ready
-  ) {
+  if (!defined(rectangle) && imageryLayer.ready) {
     const tilingScheme = imageryLayer.imageryProvider.tilingScheme;
     rectangle = tilingScheme.tileXYToRectangle(x, y, level);
   }

package/Source/Scene/ImageryLayer.js

@@ -5,7 +5,6 @@ import createWorldImageryAsync from "../Scene/createWorldImageryAsync.js";
 import defaultValue from "../Core/defaultValue.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 Event from "../Core/Event.js";
 import FeatureDetection from "../Core/FeatureDetection.js";
@@ -667,33 +666,6 @@ const tileImageryBoundsScratch = new Rectangle();
 const clippedRectangleScratch = new Rectangle();
 const terrainRectangleScratch = new Rectangle();
 
-/**
- * Computes the intersection of this layer's rectangle with the imagery provider's availability rectangle,
- * producing the overall bounds of imagery that can be produced by this layer.
- *
- * @returns {Promise<Rectangle>} A promise to a rectangle which defines the overall bounds of imagery that can be produced by this layer.
- *
- * @example
- * // Zoom to an imagery layer.
- * imageryLayer.getViewableRectangle().then(function (rectangle) {
- *     return camera.flyTo({
- *         destination: rectangle
- *     });
- * });
- */
-ImageryLayer.prototype.getViewableRectangle = async function () {
-  deprecationWarning(
-    "ImageryLayer.getViewableRectangle",
-    "ImageryLayer.getViewableRectangle was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.getImageryRectangle instead."
-  );
-
-  const imageryProvider = this._imageryProvider;
-  const rectangle = this._rectangle;
-  // readyPromise has been deprecated. This is here for backward compatibility and can be removed with readyPromise.
-  await imageryProvider._readyPromise;
-  return Rectangle.intersection(imageryProvider.rectangle, rectangle);
-};
-
 /**
  * Computes the intersection of this layer's rectangle with the imagery provider's availability rectangle,
  * producing the overall bounds of imagery that can be produced by this layer.
@@ -751,8 +723,7 @@ ImageryLayer.prototype._createTileImagerySkeletons = function (
   }
 
   const imageryProvider = this._imageryProvider;
-  // ready is deprecated. This is here for backwards compatibility
-  if (!this.ready || !imageryProvider._ready) {
+  if (!this.ready) {
     // The imagery provider is not ready, so we can't create skeletons, yet.
     // Instead, add a placeholder so that we'll know to create
     // the skeletons once the provider is ready.

package/Source/Scene/ImageryProvider.js

@@ -47,28 +47,6 @@ function ImageryProvider() {
 }
 
 Object.defineProperties(ImageryProvider.prototype, {
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof ImageryProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof ImageryProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
   /**
    * Gets the rectangle, in radians, of the imagery provided by the instance.
    * @memberof ImageryProvider.prototype
@@ -191,122 +169,6 @@ Object.defineProperties(ImageryProvider.prototype, {
   hasAlphaChannel: {
     get: DeveloperError.throwInstantiationError,
   },
-
-  /**
-   * The default alpha blending value of this provider, with 0.0 representing fully transparent and
-   * 1.0 representing fully opaque.
-   * @memberof ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultAlpha: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * 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 ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultNightAlpha: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * 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 ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultDayAlpha: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * 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 ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultBrightness: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * 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 ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultContrast: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * The default hue of this provider in radians. 0.0 uses the unmodified imagery color.
-   * @memberof ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultHue: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * 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 ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultSaturation: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * The default gamma correction to apply to this provider.  1.0 uses the unmodified imagery color.
-   * @memberof ImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultGamma: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * The default texture minification filter to apply to this provider.
-   * @memberof ImageryProvider.prototype
-   * @type {TextureMinificationFilter}
-   * @deprecated
-   */
-  defaultMinificationFilter: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * The default texture magnification filter to apply to this provider.
-   * @memberof ImageryProvider.prototype
-   * @type {TextureMagnificationFilter}
-   * @deprecated
-   */
-  defaultMagnificationFilter: {
-    get: DeveloperError.throwInstantiationError,
-    set: DeveloperError.throwInstantiationError,
-  },
 });
 
 /**

package/Source/Scene/Implicit3DTileContent.js

@@ -4,7 +4,6 @@ import clone from "../Core/clone.js";
 import combine from "../Core/combine.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 CesiumMath from "../Core/Math.js";
@@ -74,7 +73,6 @@ function Implicit3DTileContent(tileset, tile, resource) {
   this._url = subtreeResource.getUrlComponent(true);
 
   this._ready = false;
-  this._readyPromise = undefined;
 }
 
 Object.defineProperties(Implicit3DTileContent.prototype, {
@@ -135,26 +133,6 @@ Object.defineProperties(Implicit3DTileContent.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the tile's content is ready to render.
-   *
-   * @memberof Implicit3DTileContent.prototype
-   *
-   * @type {Promise<Implicit3DTileContent>}
-   * @readonly
-   * @deprecated
-   * @private
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Implicit3DTileContent.readyPromise",
-        "Implicit3DTileContent.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Implicit3DTileContent.ready to return true instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   tileset: {
     get: function () {
       return this._tileset;
@@ -260,7 +238,6 @@ Implicit3DTileContent.fromSubtreeJson = async function (
   content._implicitSubtree = subtree;
   expandSubtree(content, subtree);
   content._ready = true;
-  content._readyPromise = Promise.resolve(content);
 
   return content;
 };