@cesium/engine 2.4.0 → 3.0.0

package/Source/Scene/BingMapsImageryProvider.js

@@ -3,7 +3,6 @@ import Check from "../Core/Check.js";
 import Credit from "../Core/Credit.js";
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
-import deprecationWarning from "../Core/deprecationWarning.js";
 import Event from "../Core/Event.js";
 import CesiumMath from "../Core/Math.js";
 import Rectangle from "../Core/Rectangle.js";
@@ -20,7 +19,6 @@ import ImageryProvider from "./ImageryProvider.js";
  *
  * Initialization options for the BingMapsImageryProvider constructor
  *
- * @property {Resource|string} [url] The url of the Bing Maps server hosting the imagery. Deprecated.
  * @property {string} [key] The Bing Maps key for your application, which can be
  *        created at {@link https://www.bingmapsportal.com/}.
  * @property {string} [tileProtocol] The protocol to use when loading tiles, e.g. 'http' or 'https'.
@@ -106,8 +104,6 @@ ImageryProviderBuilder.prototype.build = function (provider) {
       );
     }
   }
-
-  provider._ready = true;
 };
 
 function metadataSuccess(data, imageryProviderBuilder) {
@@ -240,57 +236,6 @@ function BingMapsImageryProvider(options) {
   this._attributionList = undefined;
 
   this._errorEvent = new Event();
-
-  this._ready = false;
-  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."
-    );
-
-    //>>includeStart('debug', pragmas.debug);
-    Check.defined("options.key", options.key);
-    //>>includeEnd('debug');
-
-    let tileProtocol = options.tileProtocol;
-
-    // For backward compatibility reasons, the tileProtocol may end with
-    // a `:`. Remove it.
-    if (defined(tileProtocol)) {
-      if (
-        tileProtocol.length > 0 &&
-        tileProtocol[tileProtocol.length - 1] === ":"
-      ) {
-        tileProtocol = tileProtocol.substr(0, tileProtocol.length - 1);
-      }
-    } else {
-      // use http if the document's protocol is http, otherwise use https
-      const documentProtocol = document.location.protocol;
-      tileProtocol = documentProtocol === "http:" ? "http" : "https";
-    }
-
-    const resource = Resource.createIfNeeded(options.url);
-    this._resource = resource;
-    resource.appendForwardSlash();
-    const metadataResource = resource.getDerivedResource({
-      url: `REST/v1/Imagery/Metadata/${this._mapStyle}`,
-      queryParameters: {
-        incl: "ImageryProviders",
-        key: options.key,
-        uriScheme: tileProtocol,
-      },
-    });
-
-    const imageryProviderBuilder = new ImageryProviderBuilder(options);
-    this._readyPromise = requestMetadata(
-      metadataResource,
-      imageryProviderBuilder,
-      this
-    ).then(() => {
-      imageryProviderBuilder.build(this);
-      return true;
-    });
-  }
 }
 
 Object.defineProperties(BingMapsImageryProvider.prototype, {
@@ -456,40 +401,6 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     },
   },
 
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.ready",
-        "BingMapsImageryProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
-      );
-      return this._ready;
-    },
-  },
-
-  /**
-   * Gets a promise that resolves to true when the provider is ready for use.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {Promise<boolean>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.readyPromise",
-        "BingMapsImageryProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use BingMapsImageryProvider.fromUrl instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
   /**
    * Gets the credit to display when this imagery provider is active.  Typically this is used to credit
    * the source of the imagery.
@@ -518,242 +429,6 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
       return false;
     },
   },
-
-  /**
-   * The default alpha blending value of this provider, with 0.0 representing fully transparent and
-   * 1.0 representing fully opaque.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultAlpha: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultAlpha",
-        "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      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 BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultNightAlpha: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultNightAlpha",
-        "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      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 BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultDayAlpha: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultDayAlpha",
-        "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      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 BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultBrightness: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultBrightness",
-        "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      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 BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultContrast: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultContrast",
-        "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      this._defaultContrast = value;
-    },
-  },
-
-  /**
-   * The default hue of this provider in radians. 0.0 uses the unmodified imagery color.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultHue: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultHue",
-        "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      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 BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultSaturation: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultSaturation",
-        "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      this._defaultSaturation = value;
-    },
-  },
-
-  /**
-   * The default gamma correction to apply to this provider.  1.0 uses the unmodified imagery color.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {Number|undefined}
-   * @deprecated
-   */
-  defaultGamma: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultGamma",
-        "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      this._defaultGamma = value;
-    },
-  },
-
-  /**
-   * The default texture minification filter to apply to this provider.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {TextureMinificationFilter}
-   * @deprecated
-   */
-  defaultMinificationFilter: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultMinificationFilter",
-        "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      this._defaultMinificationFilter = value;
-    },
-  },
-
-  /**
-   * The default texture magnification filter to apply to this provider.
-   * @memberof BingMapsImageryProvider.prototype
-   * @type {TextureMagnificationFilter}
-   * @deprecated
-   */
-  defaultMagnificationFilter: {
-    get: function () {
-      deprecationWarning(
-        "BingMapsImageryProvider.defaultMagnificationFilter",
-        "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104.  It will be 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."
-      );
-      this._defaultMagnificationFilter = value;
-    },
-  },
 });
 
 /**
@@ -814,7 +489,6 @@ BingMapsImageryProvider.fromUrl = async function (url, options) {
   const imageryProviderBuilder = new ImageryProviderBuilder(options);
   await requestMetadata(metadataResource, imageryProviderBuilder);
   imageryProviderBuilder.build(provider);
-  provider._readyPromise = Promise.resolve(true);
   return provider;
 };
 

package/Source/Scene/Camera.js

@@ -44,7 +44,7 @@ import SceneMode from "./SceneMode.js";
  *
  * @property {number} [heading=0.0] The heading in radians
  * @property {number} [pitch=-CesiumMath.PI_OVER_TWO] The pitch in radians
- * @property {number} [roll=0.0] The roll in meters
+ * @property {number} [roll=0.0] The roll in radians
  **/
 
 /**

package/Source/Scene/Cesium3DTile.js

@@ -870,7 +870,7 @@ function isPriorityDeferred(tile, frameState) {
   );
   const sseRelaxation = tileset.foveatedInterpolationCallback(
     tileset.foveatedMinimumScreenSpaceErrorRelaxation,
-    tileset.maximumScreenSpaceError,
+    tileset.memoryAdjustedScreenSpaceError,
     normalizedFoveatedFactor
   );
   const sse =
@@ -878,7 +878,7 @@ function isPriorityDeferred(tile, frameState) {
       ? tile.parent._screenSpaceError * 0.5
       : tile._screenSpaceError;
 
-  return tileset.maximumScreenSpaceError - sseRelaxation <= sse;
+  return tileset.memoryAdjustedScreenSpaceError - sseRelaxation <= sse;
 }
 
 const scratchJulianDate = new JulianDate();
@@ -957,12 +957,11 @@ function isPriorityProgressiveResolution(tileset, tile) {
     return false;
   }
 
+  const maximumScreenSpaceError = tileset.memoryAdjustedScreenSpaceError;
   let isProgressiveResolutionTile =
-    tile._screenSpaceErrorProgressiveResolution >
-    tileset._maximumScreenSpaceError; // Mark non-SSE leaves
+    tile._screenSpaceErrorProgressiveResolution > maximumScreenSpaceError; // Mark non-SSE leaves
   tile._priorityProgressiveResolutionScreenSpaceErrorLeaf = false; // Needed for skipLOD
   const parent = tile.parent;
-  const maximumScreenSpaceError = tileset._maximumScreenSpaceError;
   const tilePasses =
     tile._screenSpaceErrorProgressiveResolution <= maximumScreenSpaceError;
   const parentFails =

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

@@ -160,22 +160,6 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
     },
   },
 
-  /**
-   * Gets the promise that will be resolved when the tile's content is ready to render.
-   *
-   * @memberof Cesium3DTileContent.prototype
-   *
-   * @type {Promise<Cesium3DTileContent>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    // eslint-disable-next-line getter-return
-    get: function () {
-      DeveloperError.throwInstantiationError();
-    },
-  },
-
   /**
    * Gets the tileset for this tile.
    *

package/Source/Scene/Cesium3DTilesVoxelProvider.js

@@ -2,7 +2,6 @@ import Cartesian3 from "../Core/Cartesian3.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 Ellipsoid from "../Core/Ellipsoid.js";
 import Matrix4 from "../Core/Matrix4.js";
 import OrientedBoundingBox from "../Core/OrientedBoundingBox.js";
@@ -37,7 +36,6 @@ import VoxelShapeType from "./VoxelShapeType.js";
  * @augments VoxelProvider
  *
  * @param {object} options Object with the following properties:
- * @param {Resource|string|Promise<Resource>|Promise<string>} [options.url] The URL to a tileset JSON file. Deprecated.
  *
  * @see Cesium3DTilesVoxelProvider.fromUrl
  * @see VoxelProvider
@@ -48,7 +46,6 @@ import VoxelShapeType from "./VoxelShapeType.js";
  */
 function Cesium3DTilesVoxelProvider(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  this._ready = false;
 
   /** @inheritdoc */
   this.shapeTransform = undefined;
@@ -94,125 +91,8 @@ function Cesium3DTilesVoxelProvider(options) {
 
   this._implicitTileset = undefined;
   this._subtreeCache = new ImplicitSubtreeCache();
-
-  const that = this;
-  let tilesetJson;
-
-  if (defined(options.url)) {
-    deprecationWarning(
-      "Cesium3DTilesVoxelProvider options.url",
-      "Cesium3DTilesVoxelProvider constructor parameter options.url was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use Cesium3DTilesVoxelProvider.fromUrl instead."
-    );
-
-    this._readyPromise = Promise.resolve(options.url).then(function (url) {
-      const resource = Resource.createIfNeeded(url);
-      return resource
-        .fetchJson()
-        .then(function (tileset) {
-          tilesetJson = tileset;
-          validate(tilesetJson);
-          const schemaLoader = getMetadataSchemaLoader(tilesetJson, resource);
-          return schemaLoader.load();
-        })
-        .then(function (schemaLoader) {
-          const root = tilesetJson.root;
-          const voxel = root.content.extensions["3DTILES_content_voxels"];
-          const className = voxel.class;
-
-          const metadataJson = hasExtension(tilesetJson, "3DTILES_metadata")
-            ? tilesetJson.extensions["3DTILES_metadata"]
-            : tilesetJson;
-
-          const metadataSchema = schemaLoader.schema;
-          const metadata = new Cesium3DTilesetMetadata({
-            metadataJson: metadataJson,
-            schema: metadataSchema,
-          });
-
-          addAttributeInfo(that, metadata, className);
-
-          const implicitTileset = new ImplicitTileset(
-            resource,
-            root,
-            metadataSchema
-          );
-
-          const {
-            shape,
-            minBounds,
-            maxBounds,
-            shapeTransform,
-            globalTransform,
-          } = getShape(root);
-
-          that.shape = shape;
-          that.minBounds = minBounds;
-          that.maxBounds = maxBounds;
-          that.dimensions = Cartesian3.unpack(voxel.dimensions);
-          that.shapeTransform = shapeTransform;
-          that.globalTransform = globalTransform;
-          that.maximumTileCount = getTileCount(metadata);
-
-          let paddingBefore;
-          let paddingAfter;
-
-          if (defined(voxel.padding)) {
-            paddingBefore = Cartesian3.unpack(voxel.padding.before);
-            paddingAfter = Cartesian3.unpack(voxel.padding.after);
-          }
-
-          that.paddingBefore = paddingBefore;
-          that.paddingAfter = paddingAfter;
-
-          that._implicitTileset = implicitTileset;
-
-          ResourceCache.unload(schemaLoader);
-
-          that._ready = true;
-          return that;
-        });
-    });
-  }
 }
 
-Object.defineProperties(Cesium3DTilesVoxelProvider.prototype, {
-  /**
-   * Gets the promise that will be resolved when the provider is ready for use.
-   *
-   * @memberof Cesium3DTilesVoxelProvider.prototype
-   * @type {Promise<Cesium3DTilesVoxelProvider>}
-   * @readonly
-   * @deprecated
-   */
-  readyPromise: {
-    get: function () {
-      deprecationWarning(
-        "Cesium3DTilesVoxelProvider.readyPromise",
-        "Cesium3DTilesVoxelProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use Cesium3DTilesVoxelProvider.fromUrl instead."
-      );
-      return this._readyPromise;
-    },
-  },
-
-  /**
-   * Gets a value indicating whether or not the provider is ready for use.
-   *
-   * @memberof Cesium3DTilesVoxelProvider.prototype
-   * @type {boolean}
-   * @readonly
-   * @deprecated
-   */
-  ready: {
-    get: function () {
-      deprecationWarning(
-        "Cesium3DTilesVoxelProvider.ready",
-        "Cesium3DTilesVoxelProvider.ready was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use Cesium3DTilesVoxelProvider.fromUrl instead."
-      );
-      return this._ready;
-    },
-  },
-});
-
 /**
  * Creates a {@link VoxelProvider} that fetches voxel data from a 3D Tiles tileset.
  *
@@ -289,9 +169,6 @@ Cesium3DTilesVoxelProvider.fromUrl = async function (url) {
 
   ResourceCache.unload(schemaLoader);
 
-  provider._ready = true;
-  provider._readyPromise = Promise.resolve(provider);
-
   return provider;
 };