@cesium/engine 2.4.0 → 3.0.0

package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js

@@ -2,7 +2,6 @@ import Check from "./Check.js";
 import Credit from "./Credit.js";
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
-import deprecationWarning from "./deprecationWarning.js";
 import Event from "./Event.js";
 import GeographicTilingScheme from "./GeographicTilingScheme.js";
 import GoogleEarthEnterpriseMetadata from "./GoogleEarthEnterpriseMetadata.js";
@@ -14,10 +13,8 @@ import Rectangle from "./Rectangle.js";
 import Request from "./Request.js";
 import RequestState from "./RequestState.js";
 import RequestType from "./RequestType.js";
-import Resource from "./Resource.js";
 import RuntimeError from "./RuntimeError.js";
 import TaskProcessor from "./TaskProcessor.js";
-import TileProviderError from "./TileProviderError.js";
 
 const TerrainState = {
   UNKNOWN: 0,
@@ -74,8 +71,6 @@ TerrainCache.prototype.tidy = function () {
  *
  * @property {Ellipsoid} [ellipsoid] The ellipsoid.  If not specified, the WGS84 ellipsoid is used.
  * @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
- * @property {Resource|string} [url] The url of the Google Earth Enterprise server hosting the imagery. Deprecated.
- * @property {GoogleEarthEnterpriseMetadata} [metadata] A metadata object that can be used to share metadata requests with a GoogleEarthEnterpriseImageryProvider. Deprecated.
  */
 
 /**
@@ -88,7 +83,7 @@ TerrainCache.prototype.tidy = function () {
  * @alias GoogleEarthEnterpriseTerrainProvider
  * @constructor
  *
- * @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} options An object describing initialization options
+ * @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} [options] An object describing initialization options
  *
  * @see GoogleEarthEnterpriseTerrainProvider.fromMetadata
  * @see GoogleEarthEnterpriseMetadata.fromUrl
@@ -130,65 +125,6 @@ function GoogleEarthEnterpriseTerrainProvider(options) {
   this._terrainRequests = {};
 
   this._errorEvent = new Event();
-  this._ready = false;
-
-  if (defined(options.url)) {
-    deprecationWarning(
-      "GoogleEarthEnterpriseTerrainProvider options.url",
-      "options.url was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
-    );
-    const resource = Resource.createIfNeeded(options.url);
-    const that = this;
-    let metadataError;
-    this._readyPromise = GoogleEarthEnterpriseMetadata.fromUrl(resource)
-      .then((metadata) => {
-        if (!metadata.terrainPresent) {
-          const e = new RuntimeError(
-            `The server ${metadata.url} doesn't have terrain`
-          );
-
-          return Promise.reject(e);
-        }
-
-        TileProviderError.reportSuccess(metadataError);
-        that._metadata = metadata;
-        that._ready = true;
-        return true;
-      })
-      .catch((e) => {
-        metadataError = TileProviderError.reportError(
-          metadataError,
-          that,
-          that._errorEvent,
-          e.message,
-          undefined,
-          undefined,
-          undefined,
-          e
-        );
-
-        throw e;
-      });
-  } else if (defined(options.metadata)) {
-    deprecationWarning(
-      "GoogleEarthEnterpriseTerrainProvider options.metadata",
-      "options.metadata was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
-    );
-    const metadata = options.metadata;
-    this._metadata = metadata;
-    const that = this;
-    this._readyPromise = Promise.resolve(this._metadata._readyPromise).then(
-      () => {
-        if (!metadata.terrainPresent) {
-          throw new RuntimeError(
-            `The server ${metadata.url} doesn't have terrain`
-          );
-        }
-
-        that._ready = true;
-      }
-    );
-  }
 }
 
 Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
@@ -242,40 +178,6 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
     },
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "GoogleEarthEnterpriseTerrainProvider.ready",
-        "GoogleEarthEnterpriseTerrainProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
-      );
-      return this._ready;
-    },
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "GoogleEarthEnterpriseTerrainProvider.readyPromise",
-        "GoogleEarthEnterpriseTerrainProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
-      );
-      return this._readyPromise;
-    },
-  },
-
   /**
    * Gets the credit to display when this terrain provider is active.  Typically this is used to credit
    * the source of the terrain.
@@ -359,8 +261,6 @@ GoogleEarthEnterpriseTerrainProvider.fromMetadata = function (
 
   const provider = new GoogleEarthEnterpriseTerrainProvider(options);
   provider._metadata = metadata;
-  provider._readyPromise = Promise.resolve(true);
-  provider._ready = true;
 
   return provider;
 };

package/Source/Core/GoogleMaps.js

@@ -3,7 +3,7 @@ import defined from "./defined.js";
 import Resource from "./Resource.js";
 
 let defaultKeyCredit;
-const defaultKey = "AIzaSyBESBYnp1EcqtlAcjMTJ65GjUsJtaCWVXA";
+const defaultKey = "AIzaSyCUMejKrafNiN2PiqvWNPxQJBuDRg-VqKQ";
 
 /**
  * Default settings for accessing the Google Maps API.

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwZWQ3OWFlZC1kOTg3LTRlZjctYTAyYy0xNjFmODE1MWE2NGUiLCJpZCI6MjU5LCJpYXQiOjE2ODI5NDYzODh9.DEH4GpqliH-xsDE7h-ZCICtHgnGu32wdSjt4hFqw7lU";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhYzVkMTc1ZS00NTRhLTRjY2QtYTQwZS01YmU2Mjg1ODAwN2YiLCJpZCI6MjU5LCJpYXQiOjE2ODgzOTgwMjl9.MZC_HUBRd0y5HJeB-F5QSpT-fEgTM6mI5gMaSND9FHc";
 /**
  * Default settings for accessing the Cesium ion API.
  *

package/Source/Core/TerrainProvider.js

@@ -54,28 +54,6 @@ Object.defineProperties(TerrainProvider.prototype, {
     get: DeveloperError.throwInstantiationError,
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof TerrainProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof TerrainProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
   /**
    * Gets a value indicating whether or not the provider includes a water mask.  The water mask
    * indicates which areas of the globe are water rather than land, so they can be rendered

package/Source/Core/VRTheWorldTerrainProvider.js

@@ -2,7 +2,6 @@ import Check from "./Check.js";
 import Credit from "./Credit.js";
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
-import deprecationWarning from "./deprecationWarning.js";
 import Ellipsoid from "./Ellipsoid.js";
 import Event from "./Event.js";
 import GeographicTilingScheme from "./GeographicTilingScheme.js";
@@ -27,7 +26,6 @@ function DataRectangle(rectangle, maxLevel) {
  *
  * @property {Ellipsoid} [ellipsoid] The ellipsoid.  If not specified, the WGS84 ellipsoid is used.
  * @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
- * @property {Resource|string} [url] The URL of the VR-TheWorld TileMap. Deprecated.
  */
 
 /**
@@ -53,7 +51,6 @@ TerrainProviderBuilder.prototype.build = function (provider) {
   provider._heightmapHeight = this.heightmapHeight;
   provider._levelZeroMaximumGeometricError = this.levelZeroMaximumGeometricError;
   provider._rectangles = this.rectangles;
-  provider._ready = true;
 };
 
 function metadataSuccess(terrainProviderBuilder, xml) {
@@ -160,7 +157,6 @@ function VRTheWorldTerrainProvider(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
   this._errorEvent = new Event();
-  this._ready = false;
 
   this._terrainDataStructure = {
     heightScale: 1.0 / 1000.0,
@@ -181,27 +177,6 @@ function VRTheWorldTerrainProvider(options) {
 
   this._tilingScheme = undefined;
   this._rectangles = [];
-
-  if (defined(options.url)) {
-    deprecationWarning(
-      "VRTheWorldTerrainProvider options.url",
-      "options.url was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  VRTheWorldTerrainProvider.fromUrl instead."
-    );
-    const that = this;
-    const terrainProviderBuilder = new TerrainProviderBuilder(options);
-    const resource = Resource.createIfNeeded(options.url);
-
-    this._resource = resource;
-
-    this._readyPromise = requestMetadata(
-      terrainProviderBuilder,
-      resource,
-      that
-    ).then(() => {
-      terrainProviderBuilder.build(that);
-      return true;
-    });
-  }
 }
 
 Object.defineProperties(VRTheWorldTerrainProvider.prototype, {
@@ -244,40 +219,6 @@ Object.defineProperties(VRTheWorldTerrainProvider.prototype, {
     },
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof VRTheWorldTerrainProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "VRTheWorldTerrainProvider.ready",
-        "VRTheWorldTerrainProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use VRTheWorldTerrainProvider.fromUrl instead."
-      );
-      return this._ready;
-    },
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof VRTheWorldTerrainProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "VRTheWorldTerrainProvider.readyPromise",
-        "VRTheWorldTerrainProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use VRTheWorldTerrainProvider.fromUrl instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   /**
    * Gets a value indicating whether or not the provider includes a water mask.  The water mask
    * indicates which areas of the globe are water rather than land, so they can be rendered

package/Source/Core/sampleTerrain.js

@@ -42,9 +42,6 @@ async function sampleTerrain(terrainProvider, level, positions) {
   Check.defined("positions", positions);
   //>>includeEnd('debug');
 
-  // readyPromise has been deprecated; This is here for backwards compatibility
-  await terrainProvider._readyPromise;
-
   return doSampling(terrainProvider, level, positions);
 }
 

package/Source/Core/sampleTerrainMostDetailed.js

@@ -39,9 +39,6 @@ async function sampleTerrainMostDetailed(terrainProvider, positions) {
   const byLevel = [];
   const maxLevels = [];
 
-  // readyPromise has been deprecated; This is here for backwards compatibility
-  await terrainProvider._readyPromise;
-
   const availability = terrainProvider.availability;
 
   //>>includeStart('debug', pragmas.debug);

package/Source/DataSources/Cesium3DTilesetVisualizer.js

@@ -79,16 +79,17 @@ Cesium3DTilesetVisualizer.prototype.update = function (time) {
       );
     }
 
+    const tileset = defined(tilesetData)
+      ? tilesetData.tilesetPrimitive
+      : undefined;
+
     if (!show) {
-      if (defined(tilesetData)) {
-        tilesetData.tilesetPrimitive.show = false;
+      if (defined(tileset)) {
+        tileset.show = false;
       }
       continue;
     }
 
-    const tileset = defined(tilesetData)
-      ? tilesetData.tilesetPrimitive
-      : undefined;
     if (!defined(tilesetData) || resource.url !== tilesetData.url) {
       if (defined(tileset)) {
         primitives.removeAndDestroy(tileset);

package/Source/DataSources/DataSourceDisplay.js

@@ -499,12 +499,13 @@ DataSourceDisplay.prototype._onDataSourceMoved = function (
  * @callback DataSourceDisplay.VisualizersCallback
  *
  * @param {Scene} scene The scene to create visualizers for.
+ * @param {EntityCluster} entityCluster The entity cluster to create visualizers for.
  * @param {DataSource} dataSource The data source to create visualizers for.
  * @returns {Visualizer[]} An array of visualizers used for visualization.
  *
  * @example
- * function createVisualizers(scene, dataSource) {
- *     return [new Cesium.BillboardVisualizer(scene, dataSource.entities)];
+ * function createVisualizers(scene, entityCluster, dataSource) {
+ *     return [new Cesium.BillboardVisualizer(entityCluster, dataSource.entities)];
  * }
  */
 export default DataSourceDisplay;

package/Source/DataSources/Entity.js

@@ -637,13 +637,12 @@ const positionScratch = new Cartesian3();
 const orientationScratch = new Quaternion();
 
 /**
- * Computes the model matrix for the entity's transform at specified time. Returns undefined if orientation or position
- * are undefined.
+ * Computes the model matrix for the entity's transform at specified time. Returns undefined if position is undefined
  *
  * @param {JulianDate} time The time to retrieve model matrix for.
  * @param {Matrix4} [result] The object onto which to store the result.
  *
- * @returns {Matrix4} The modified result parameter or a new Matrix4 instance if one was not provided. Result is undefined if position or orientation are undefined.
+ * @returns {Matrix4} The modified result parameter or a new Matrix4 instance if one was not provided. Result is undefined if position is undefined.
  */
 Entity.prototype.computeModelMatrix = function (time, result) {
   //>>includeStart('debug', pragmas.debug);

package/Source/DataSources/KmlTour.js

@@ -1,5 +1,4 @@
 import defined from "../Core/defined.js";
-import deprecationWarning from "../Core/deprecationWarning.js";
 import Event from "../Core/Event.js";
 /**
  * Describes a KmlTour, which uses KmlTourFlyTo, and KmlTourWait to
@@ -85,21 +84,11 @@ KmlTour.prototype.addPlaylistEntry = function (entry) {
 /**
  * Play this tour.
  *
- * @param {Viewer|CesiumWidget} widget The widget.
+ * @param {CesiumWidget} widget The widget.
  * @param {object} [cameraOptions] these options will be merged with {@link Camera#flyTo}
  * options for FlyTo playlist entries.
  */
 KmlTour.prototype.play = function (widget, cameraOptions) {
-  // We want to avoid importing the Viewer/CesiumWidget class, so we check
-  // for the presence of the .cesiumWidget property that's only available
-  // on the Viewer.
-  if (defined(widget.cesiumWidget)) {
-    deprecationWarning(
-      "viewer",
-      "The viewer parameter has been deprecated in Cesium 1.99. It will be removed in 1.100. Instead of a Viewer, pass a CesiumWidget instead."
-    );
-  }
-
   this.tourStart.raiseEvent();
 
   const tour = this;

package/Source/DataSources/ModelVisualizer.js

@@ -451,13 +451,6 @@ ModelVisualizer.prototype.getBoundingSphere = function (entity, result) {
   const hasHeightReference = model.heightReference !== HeightReference.NONE;
   if (defined(globe) && hasHeightReference) {
     const ellipsoid = globe.ellipsoid;
-    // We cannot query the availability of the terrain provider till its ready, so the
-    // bounding sphere state will remain pending till the terrain provider is ready.
-    // ready is deprecated. This is here for backwards compatibility
-    if (!terrainProvider._ready) {
-      return BoundingSphereState.PENDING;
-    }
-
     const modelMatrix = model.modelMatrix;
     scratchPosition.x = modelMatrix[12];
     scratchPosition.y = modelMatrix[13];

package/Source/Renderer/Context.js

@@ -1340,7 +1340,11 @@ function continueDraw(context, drawCommand, shaderProgram, uniformMap) {
 
   if (defined(indexBuffer)) {
     offset = offset * indexBuffer.bytesPerIndex; // offset in vertices to offset in bytes
-    count = defaultValue(count, indexBuffer.numberOfIndices);
+    if (defined(count)) {
+      count = Math.min(count, indexBuffer.numberOfIndices);
+    } else {
+      count = indexBuffer.numberOfIndices;
+    }
     if (instanceCount === 0) {
       context._gl.drawElements(
         primitiveType,
@@ -1358,7 +1362,11 @@ function continueDraw(context, drawCommand, shaderProgram, uniformMap) {
       );
     }
   } else {
-    count = defaultValue(count, va.numberOfVertices);
+    if (defined(count)) {
+      count = Math.min(count, va.numberOfVertices);
+    } else {
+      count = va.numberOfVertices;
+    }
     if (instanceCount === 0) {
       context._gl.drawArrays(primitiveType, offset, count);
     } else {

package/Source/Renderer/demodernizeShader.js

@@ -56,6 +56,9 @@ function demodernizeShader(input, isFragmentShader) {
       // Replace gl_FragDepth with gl_FragDepthEXT.
       output = output.replaceAll(/gl_FragDepth/g, `gl_FragDepthEXT`);
     }
+
+    // Enable the OES_standard_derivatives extension
+    output = `#ifdef GL_OES_standard_derivatives\n#extension GL_OES_standard_derivatives : enable\n#endif\n${output}`;
   } else {
     // Replace the in with attribute.
     output = output.replaceAll(/(in)\s+(vec\d|mat\d|float)/g, `attribute $2`);