@cesium/engine 2.3.0 → 2.4.1

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/ModelVisualizer.js

@@ -454,7 +454,12 @@ ModelVisualizer.prototype.getBoundingSphere = function (entity, result) {
     // 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) {
+    if (
+      defined(terrainProvider) &&
+      (defined(terrainProvider._ready)
+        ? !terrainProvider._ready
+        : defined(terrainProvider.ready) && !terrainProvider.ready)
+    ) {
       return BoundingSphereState.PENDING;
     }
 

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`);

package/Source/Scene/ArcGisMapServerImageryProvider.js

@@ -371,7 +371,7 @@ function ArcGisMapServerImageryProvider(options) {
   if (defined(options.url)) {
     deprecationWarning(
       "ArcGisMapServerImageryProvider options.url",
-      "options.url was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
+      "options.url was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
     );
     const resource = Resource.createIfNeeded(options.url);
     resource.appendForwardSlash();
@@ -706,7 +706,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.ready",
-        "ArcGisMapServerImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
+        "ArcGisMapServerImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
       );
       return this._ready;
     },
@@ -723,7 +723,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.readyPromise",
-        "ArcGisMapServerImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
+        "ArcGisMapServerImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ArcGisMapServerImageryProvider.fromUrl instead."
       );
       return this._readyPromise;
     },
@@ -798,14 +798,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultAlpha",
-        "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultAlpha",
-        "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
+        "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
       );
       this._defaultAlpha = value;
     },
@@ -822,14 +822,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultNightAlpha",
-        "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultNightAlpha",
-        "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
+        "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
       );
       this._defaultNightAlpha = value;
     },
@@ -846,14 +846,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultDayAlpha",
-        "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultDayAlpha",
-        "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
+        "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
       );
       this._defaultDayAlpha = value;
     },
@@ -870,14 +870,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultBrightness",
-        "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultBrightness",
-        "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
+        "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
       );
       this._defaultBrightness = value;
     },
@@ -894,14 +894,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultContrast",
-        "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultContrast",
-        "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
+        "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
       );
       this._defaultContrast = value;
     },
@@ -917,14 +917,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultHue",
-        "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.hue instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultHue",
-        "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.hue instead."
+        "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.hue instead."
       );
       this._defaultHue = value;
     },
@@ -941,14 +941,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultSaturation",
-        "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultSaturation",
-        "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
+        "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
       );
       this._defaultSaturation = value;
     },
@@ -964,14 +964,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultGamma",
-        "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultGamma",
-        "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
+        "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
       );
       this._defaultGamma = value;
     },
@@ -987,14 +987,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultMinificationFilter",
-        "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultMinificationFilter",
-        "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
+        "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
       );
       this._defaultMinificationFilter = value;
     },
@@ -1010,14 +1010,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "ArcGisMapServerImageryProvider.defaultMagnificationFilter",
-        "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
+        "ArcGisMapServerImageryProvider.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(
         "ArcGisMapServerImageryProvider.defaultMagnificationFilter",
-        "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
+        "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
       );
       this._defaultMagnificationFilter = value;
     },

package/Source/Scene/ArcGisMapService.js

@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPKd815e334cb774973b7245e23a67f4d08Js7A8e8xvfBpgnZIzp1jbL3FWJTmx7AKG8wa87OwDcWEu4CxQCNiydpPbGpALiTf";
+  "AAPKac82a6d80f1340a4aa9587f789d07e96a_Jj1a4fbA59cggYHArDizxxA2U4QDofLUm36VivpUsSRyK7O1JjRPwy916Y-7ld";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *
@@ -76,6 +76,7 @@ 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

@@ -1169,13 +1169,6 @@ Billboard.prototype._loadImage = function () {
   }
 
   if (defined(image)) {
-    // No need to wait on imageIndexPromise since these have already been added to the atlas
-    const index = atlas.getImageIndex(imageId);
-    if (defined(index)) {
-      completeImageLoad(index);
-      return;
-    }
-
     imageIndexPromise = atlas.addImage(imageId, image);
   }
   if (defined(imageSubRegion)) {

package/Source/Scene/BingMapsImageryProvider.js

@@ -245,7 +245,7 @@ function BingMapsImageryProvider(options) {
   if (defined(options.url)) {
     deprecationWarning(
       "BingMapsImageryProvider options.url",
-      "options.url was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
+      "options.url was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
     );
 
     //>>includeStart('debug', pragmas.debug);
@@ -467,7 +467,7 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.ready",
-        "BingMapsImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
+        "BingMapsImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
       );
       return this._ready;
     },
@@ -484,7 +484,7 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.readyPromise",
-        "BingMapsImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
+        "BingMapsImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
       );
       return this._readyPromise;
     },
@@ -530,14 +530,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultAlpha",
-        "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultAlpha",
-        "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
+        "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.alpha instead."
       );
       this._defaultAlpha = value;
     },
@@ -554,14 +554,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultNightAlpha",
-        "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultNightAlpha",
-        "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
+        "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.nightAlpha instead."
       );
       this.defaultNightAlpha = value;
     },
@@ -578,14 +578,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultDayAlpha",
-        "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultDayAlpha",
-        "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
+        "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.dayAlpha instead."
       );
       this._defaultDayAlpha = value;
     },
@@ -602,14 +602,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultBrightness",
-        "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultBrightness",
-        "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
+        "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.brightness instead."
       );
       this._defaultBrightness = value;
     },
@@ -626,14 +626,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultContrast",
-        "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultContrast",
-        "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
+        "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.contrast instead."
       );
       this._defaultContrast = value;
     },
@@ -649,14 +649,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultHue",
-        "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.hue instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultHue",
-        "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.hue instead."
+        "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.hue instead."
       );
       this._defaultHue = value;
     },
@@ -673,14 +673,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultSaturation",
-        "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultSaturation",
-        "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
+        "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.saturation instead."
       );
       this._defaultSaturation = value;
     },
@@ -696,14 +696,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultGamma",
-        "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultGamma",
-        "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
+        "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.gamma instead."
       );
       this._defaultGamma = value;
     },
@@ -719,14 +719,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultMinificationFilter",
-        "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultMinificationFilter",
-        "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
+        "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.minificationFilter instead."
       );
       this._defaultMinificationFilter = value;
     },
@@ -742,14 +742,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     get: function () {
       deprecationWarning(
         "BingMapsImageryProvider.defaultMagnificationFilter",
-        "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
+        "BingMapsImageryProvider.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(
         "BingMapsImageryProvider.defaultMagnificationFilter",
-        "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
+        "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be removed in CesiumJS 1.107.  Use ImageryLayer.magnificationFilter instead."
       );
       this._defaultMagnificationFilter = value;
     },

package/Source/Scene/Cesium3DTileBatchTable.js

@@ -1050,9 +1050,6 @@ function getLogDepthPolygonOffsetFragmentShaderProgram(context, shaderProgram) {
     fs.defines = defined(fs.defines) ? fs.defines.slice(0) : [];
     fs.defines.push("POLYGON_OFFSET");
 
-    fs.sources.unshift(
-      "#ifdef GL_OES_standard_derivatives\n#extension GL_OES_standard_derivatives : enable\n#endif\n"
-    );
     shader = context.shaderCache.createDerivedShaderProgram(
       shaderProgram,
       "zBackfaceLogDepth",

package/Source/Scene/Cesium3DTileset.js

@@ -3211,7 +3211,8 @@ 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.showOnScreen =
+          tileset._showCreditsOnScreen || credit._isDefaultToken;
         frameState.creditDisplay.addCreditToNextFrame(credit);
       }
     }

package/Source/Scene/Globe.js

@@ -983,12 +983,16 @@ Globe.prototype.beginFrame = function (frameState) {
   const surface = this._surface;
   const tileProvider = surface.tileProvider;
   const terrainProvider = this.terrainProvider;
+  // ready is deprecated; This is here for backwards compatibility
+  const terrainReady =
+    defined(terrainProvider) &&
+    (defined(terrainProvider._ready)
+      ? terrainProvider._ready
+      : !defined(terrainProvider.ready) || terrainProvider.ready);
   const hasWaterMask =
     this.showWaterEffect &&
-    defined(terrainProvider) &&
+    terrainReady &&
     terrainProvider.hasWaterMask &&
-    // ready is deprecated; This is here for backwards compatibility
-    terrainProvider._ready &&
     terrainProvider.hasWaterMask;
 
   if (hasWaterMask && this._oceanNormalMapResourceDirty) {

package/Source/Scene/GlobeSurfaceTile.js

@@ -346,7 +346,13 @@ GlobeSurfaceTile.prototype.processImagery = function (
     if (tileImagery.loadingImagery.state === ImageryState.PLACEHOLDER) {
       const imageryLayer = tileImagery.loadingImagery.imageryLayer;
       // ImageryProvider.ready is deprecated. This is here for backwards compatibility
-      if (imageryLayer.ready && imageryLayer.imageryProvider._ready) {
+      const imageryProvider = imageryLayer.imageryProvider;
+      if (
+        imageryLayer.ready &&
+        (defined(imageryProvider._ready)
+          ? imageryProvider._ready
+          : !defined(imageryProvider.ready) || imageryProvider.ready)
+      ) {
         // Remove the placeholder and add the actual skeletons (if any)
         // at the same position.  Then continue the loop at the same index.
         tileImagery.freeResources();

package/Source/Scene/GlobeSurfaceTileProvider.js

@@ -237,15 +237,32 @@ Object.defineProperties(GlobeSurfaceTileProvider.prototype, {
    */
   ready: {
     get: function () {
-      return (
-        defined(this._terrainProvider) &&
+      const terrainProvider = this._terrainProvider;
+      if (
+        !defined(terrainProvider) ||
         // TerrainProvider.ready is deprecated; This is here for backwards compatibility
-        this._terrainProvider._ready &&
-        (this._imageryLayers.length === 0 ||
-          // ImageryProvider.ready is deprecated; This is here for backwards compatibility
-          (this._imageryLayers.get(0).ready &&
-            this._imageryLayers.get(0).imageryProvider._ready))
-      );
+        (defined(terrainProvider._ready)
+          ? !terrainProvider._ready
+          : defined(terrainProvider.ready) && !terrainProvider.ready)
+      ) {
+        return false;
+      }
+
+      if (this._imageryLayers.length === 0) {
+        return true;
+      }
+
+      const imageryLayer = this._imageryLayers.get(0);
+      if (!imageryLayer.ready) {
+        return false;
+      }
+
+      // ImageryProvider.ready is deprecated; This is here for backwards compatibility
+      const imageryProvider = imageryLayer.imageryProvider;
+      const imageryProviderReady = defined(imageryProvider._ready)
+        ? imageryProvider._ready
+        : !defined(imageryProvider.ready) || imageryProvider.ready;
+      return imageryProviderReady;
     },
   },
 
@@ -346,25 +363,30 @@ GlobeSurfaceTileProvider.prototype.update = function (frameState) {
 
 function updateCredits(surface, frameState) {
   const creditDisplay = frameState.creditDisplay;
+  const terrainProvider = surface._terrainProvider;
   if (
-    defined(surface._terrainProvider) &&
+    defined(terrainProvider) &&
     // ready is deprecated; This is here for backwards compatibility
-    surface._terrainProvider._ready &&
-    defined(surface._terrainProvider.credit)
+    (defined(terrainProvider._ready)
+      ? terrainProvider._ready
+      : !defined(terrainProvider.ready) || terrainProvider.ready) &&
+    defined(terrainProvider.credit)
   ) {
-    creditDisplay.addCreditToNextFrame(surface._terrainProvider.credit);
+    creditDisplay.addCreditToNextFrame(terrainProvider.credit);
   }
 
   const imageryLayers = surface._imageryLayers;
   for (let i = 0, len = imageryLayers.length; i < len; ++i) {
     const layer = imageryLayers.get(i);
-    // ImageryProvider.ready is deprecated; This is here for backwards compatibility
-    if (
-      layer.ready &&
-      layer.imageryProvider._ready &&
-      defined(layer.imageryProvider.credit)
-    ) {
-      creditDisplay.addCreditToNextFrame(layer.imageryProvider.credit);
+    if (layer.ready) {
+      // ImageryProvider.ready is deprecated; This is here for backwards compatibility
+      const imageryProvider = layer.imageryProvider;
+      const imageryProviderReady = defined(imageryProvider._ready)
+        ? imageryProvider._ready
+        : !defined(imageryProvider.ready) || imageryProvider.ready;
+      if (imageryProviderReady && defined(layer.imageryProvider.credit)) {
+        creditDisplay.addCreditToNextFrame(layer.imageryProvider.credit);
+      }
     }
   }
 }
@@ -2144,10 +2166,13 @@ function addDrawCommandsForTile(tileProvider, tile, frameState) {
     tileProvider.hasWaterMask && defined(waterMaskTexture);
   const oceanNormalMap = tileProvider.oceanNormalMap;
   const showOceanWaves = showReflectiveOcean && defined(oceanNormalMap);
+  const terrainProvider = tileProvider.terrainProvider;
   const hasVertexNormals =
-    defined(tileProvider.terrainProvider) &&
+    defined(terrainProvider) &&
     // ready is deprecated; This is here for backwards compatibility
-    tileProvider.terrainProvider._ready &&
+    (defined(terrainProvider._ready)
+      ? terrainProvider._ready
+      : !defined(terrainProvider.ready) || terrainProvider.ready) &&
     tileProvider.terrainProvider.hasVertexNormals;
   const enableFog =
     frameState.fog.enabled && frameState.fog.renderable && !cameraUnderground;