@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/Cesium3DTile.js

@@ -138,7 +138,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * The error, in meters, introduced if this tile is rendered and its children are not.
    * This is used to compute screen space error, i.e., the error measured in pixels.
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   this.geometricError = header.geometricError;
@@ -146,7 +146,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
 
   if (!defined(this._geometricError)) {
     this._geometricError = defined(parent)
-      ? parent.geometricError
+      ? parent._geometricError
       : tileset._geometricError;
     Cesium3DTile._deprecationWarning(
       "geometricErrorUndefined",
@@ -264,7 +264,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
   /**
    * When <code>true</code>, the tile has no content.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -277,7 +277,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * This is <code>false</code> until the tile's content is loaded.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -290,7 +290,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * This is <code>false</code> until the tile's implicit content is loaded.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -305,7 +305,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * This is <code>false</code> until the tile's content is loaded.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -319,7 +319,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    *
    * @see {@link https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_multiple_contents|3DTILES_multiple_contents extension}
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -362,7 +362,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
   /**
    * The time in seconds after the tile's content is ready when the content expires and new content is requested.
    *
-   * @type {Number}
+   * @type {number}
    */
   this.expireDuration = expireDuration;
 
@@ -376,7 +376,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
   /**
    * The time when a style was last applied to this tile.
    *
-   * @type {Number}
+   * @type {number}
    *
    * @private
    */
@@ -395,7 +395,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * Tracks if the tile's relationship with a ClippingPlaneCollection has changed with regards
    * to the ClippingPlaneCollection's state.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @private
    */
@@ -405,7 +405,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) {
    * Tracks if the tile's request should be deferred until all non-deferred
    * tiles load.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @private
    */
@@ -621,7 +621,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    *
    * @memberof Cesium3DTile.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -644,7 +644,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    *
    * @memberof Cesium3DTile.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -661,7 +661,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    *
    * @memberof Cesium3DTile.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -678,7 +678,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    *
    * @memberof Cesium3DTile.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -695,7 +695,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    *
    * @memberof Cesium3DTile.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @private
@@ -714,7 +714,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    * The promise remains <code>undefined</code> until the tile's content is requested.
    * </p>
    *
-   * @type {Promise.<Cesium3DTileContent>}
+   * @type {Promise<Cesium3DTileContent>}
    * @readonly
    *
    * @private
@@ -731,7 +731,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
    * The promise remains <code>undefined</code> until the tile's content is requested.
    * </p>
    *
-   * @type {Promise.<Cesium3DTileContent>}
+   * @type {Promise<Cesium3DTileContent>}
    * @readonly
    *
    * @private
@@ -874,7 +874,7 @@ Cesium3DTile.prototype.getScreenSpaceError = function (
   const heightFraction = defaultValue(progressiveResolutionHeightFraction, 1.0);
   const parentGeometricError = defined(this.parent)
     ? this.parent.geometricError
-    : tileset._geometricError;
+    : tileset._scaledGeometricError;
   const geometricError = useParentGeometricError
     ? parentGeometricError
     : this.geometricError;
@@ -1049,7 +1049,7 @@ function createPriorityFunction(tile) {
  * The request may not be made if the Cesium Request Scheduler can't prioritize it.
  * </p>
  *
- * @return {Number} The number of requests that were attempted but not scheduled.
+ * @return {number} The number of requests that were attempted but not scheduled.
  * @private
  */
 Cesium3DTile.prototype.requestContent = function () {
@@ -1449,8 +1449,8 @@ function getContentBoundingVolume(tile, frameState) {
  * Determines whether the tile's bounding volume intersects the culling volume.
  *
  * @param {FrameState} frameState The frame state.
- * @param {Number} parentVisibilityPlaneMask The parent's plane mask to speed up the visibility check.
- * @returns {Number} A plane mask as described above in {@link CullingVolume#computeVisibilityWithPlaneMask}.
+ * @param {number} parentVisibilityPlaneMask The parent's plane mask to speed up the visibility check.
+ * @returns {number} A plane mask as described above in {@link CullingVolume#computeVisibilityWithPlaneMask}.
  *
  * @private
  */
@@ -1527,7 +1527,7 @@ Cesium3DTile.prototype.contentVisibility = function (frameState) {
  * Computes the (potentially approximate) distance from the closest point of the tile's bounding volume to the camera.
  *
  * @param {FrameState} frameState The frame state.
- * @returns {Number} The distance, in meters, or zero if the camera is inside the bounding volume.
+ * @returns {number} The distance, in meters, or zero if the camera is inside the bounding volume.
  *
  * @private
  */
@@ -1542,7 +1542,7 @@ const scratchToTileCenter = new Cartesian3();
  * Computes the distance from the center of the tile's bounding volume to the camera's plane defined by its position and view direction.
  *
  * @param {FrameState} frameState The frame state.
- * @returns {Number} The distance, in meters.
+ * @returns {number} The distance, in meters.
  *
  * @private
  */
@@ -1561,7 +1561,7 @@ Cesium3DTile.prototype.distanceToTileCenter = function (frameState) {
  * Checks if the camera is inside the viewer request volume.
  *
  * @param {FrameState} frameState The frame state.
- * @returns {Boolean} Whether the camera is inside the volume.
+ * @returns {boolean} Whether the camera is inside the volume.
  *
  * @private
  */
@@ -1687,7 +1687,7 @@ function createSphere(sphere, transform, result) {
 /**
  * Create a bounding volume from the tile's bounding volume header.
  *
- * @param {Object} boundingVolumeHeader The tile's bounding volume header.
+ * @param {object} boundingVolumeHeader The tile's bounding volume header.
  * @param {Matrix4} transform The transform to apply to the bounding volume.
  * @param {TileBoundingVolume} [result] The object onto which to store the result.
  *
@@ -1791,6 +1791,12 @@ Cesium3DTile.prototype.updateGeometricErrorScale = function () {
   const scale = Matrix4.getScale(this.computedTransform, scratchScale);
   const uniformScale = Cartesian3.maximumComponent(scale);
   this.geometricError = this._geometricError * uniformScale;
+
+  if (!defined(this.parent)) {
+    // Update the tileset's geometric error
+    const tileset = this._tileset;
+    tileset._scaledGeometricError = tileset._geometricError * uniformScale;
+  }
 };
 
 function applyDebugSettings(tile, tileset, frameState, passOptions) {

package/Source/Scene/Cesium3DTileBatchTable.js

@@ -88,7 +88,7 @@ Object.defineProperties(Cesium3DTileBatchTable.prototype, {
    * buffers and any binary properties. JSON data is not counted.
    *
    * @memberof Cesium3DTileBatchTable.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    * @private
    */
@@ -517,13 +517,13 @@ Cesium3DTileBatchTable.prototype.getVertexShaderCallback = function (
       newMain +=
         `${
           "uniform sampler2D tile_batchTexture; \n" +
-          "varying vec4 tile_featureColor; \n" +
-          "varying vec2 tile_featureSt; \n" +
+          "out vec4 tile_featureColor; \n" +
+          "out vec2 tile_featureSt; \n" +
           "void main() \n" +
           "{ \n" +
           "    vec2 st = computeSt("
         }${batchIdAttributeName}); \n` +
-        `    vec4 featureProperties = texture2D(tile_batchTexture, st); \n` +
+        `    vec4 featureProperties = texture(tile_batchTexture, st); \n` +
         `    tile_color(featureProperties); \n` +
         `    float show = ceil(featureProperties.a); \n` + // 0 - false, non-zero - true
         `    gl_Position *= show; \n`; // Per-feature show/hide
@@ -553,7 +553,7 @@ Cesium3DTileBatchTable.prototype.getVertexShaderCallback = function (
       // When VTF is not supported, color blend mode MIX will look incorrect due to the feature's color not being available in the vertex shader
       newMain =
         `${
-          "varying vec2 tile_featureSt; \n" +
+          "out vec2 tile_featureSt; \n" +
           "void main() \n" +
           "{ \n" +
           "    tile_color(vec4(1.0)); \n" +
@@ -578,22 +578,22 @@ function getDefaultShader(source, applyHighlight) {
   }
 
   // The color blend mode is intended for the RGB channels so alpha is always just multiplied.
-  // gl_FragColor is multiplied by the tile color only when tile_colorBlend is 0.0 (highlight)
+  // out_FragColor is multiplied by the tile color only when tile_colorBlend is 0.0 (highlight)
   return (
     `${source}uniform float tile_colorBlend; \n` +
     `void tile_color(vec4 tile_featureColor) \n` +
     `{ \n` +
     `    tile_main(); \n` +
     `    tile_featureColor = czm_gammaCorrect(tile_featureColor); \n` +
-    `    gl_FragColor.a *= tile_featureColor.a; \n` +
+    `    out_FragColor.a *= tile_featureColor.a; \n` +
     `    float highlight = ceil(tile_colorBlend); \n` +
-    `    gl_FragColor.rgb *= mix(tile_featureColor.rgb, vec3(1.0), highlight); \n` +
+    `    out_FragColor.rgb *= mix(tile_featureColor.rgb, vec3(1.0), highlight); \n` +
     `} \n`
   );
 }
 
 function replaceDiffuseTextureCalls(source, diffuseAttributeOrUniformName) {
-  const functionCall = `texture2D(${diffuseAttributeOrUniformName}`;
+  const functionCall = `texture(${diffuseAttributeOrUniformName}`;
 
   let fromIndex = 0;
   let startIndex = source.indexOf(functionCall, fromIndex);
@@ -668,12 +668,12 @@ function modifyDiffuse(source, diffuseAttributeOrUniformName, applyHighlight) {
     "} \n";
 
   // The color blend mode is intended for the RGB channels so alpha is always just multiplied.
-  // gl_FragColor is multiplied by the tile color only when tile_colorBlend is 0.0 (highlight)
+  // out_FragColor is multiplied by the tile color only when tile_colorBlend is 0.0 (highlight)
   const highlight =
     "    tile_featureColor = czm_gammaCorrect(tile_featureColor); \n" +
-    "    gl_FragColor.a *= tile_featureColor.a; \n" +
+    "    out_FragColor.a *= tile_featureColor.a; \n" +
     "    float highlight = ceil(tile_colorBlend); \n" +
-    "    gl_FragColor.rgb *= mix(tile_featureColor.rgb, vec3(1.0), highlight); \n";
+    "    out_FragColor.rgb *= mix(tile_featureColor.rgb, vec3(1.0), highlight); \n";
 
   let setColor;
   if (type === "vec3" || type === "vec4") {
@@ -691,8 +691,8 @@ function modifyDiffuse(source, diffuseAttributeOrUniformName, applyHighlight) {
       `    tile_main(); \n`;
   } else if (type === "sampler2D") {
     // Handles any number of nested parentheses
-    // E.g. texture2D(u_diffuse, uv)
-    // E.g. texture2D(u_diffuse, computeUV(index))
+    // E.g. texture(u_diffuse, uv)
+    // E.g. texture(u_diffuse, computeUV(index))
     source = replaceDiffuseTextureCalls(source, diffuseAttributeOrUniformName);
     setColor =
       "    tile_diffuse = tile_featureColor; \n" + "    tile_main(); \n";
@@ -727,14 +727,14 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
       // When VTF is supported, per-feature show/hide already happened in the fragment shader
       source +=
         "uniform sampler2D tile_pickTexture; \n" +
-        "varying vec2 tile_featureSt; \n" +
-        "varying vec4 tile_featureColor; \n" +
+        "in vec2 tile_featureSt; \n" +
+        "in vec4 tile_featureColor; \n" +
         "void main() \n" +
         "{ \n" +
         "    tile_color(tile_featureColor); \n";
 
       if (hasPremultipliedAlpha) {
-        source += "    gl_FragColor.rgb *= gl_FragColor.a; \n";
+        source += "    out_FragColor.rgb *= out_FragColor.a; \n";
       }
 
       source += "}";
@@ -745,10 +745,10 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
       source +=
         "uniform sampler2D tile_pickTexture; \n" +
         "uniform sampler2D tile_batchTexture; \n" +
-        "varying vec2 tile_featureSt; \n" +
+        "in vec2 tile_featureSt; \n" +
         "void main() \n" +
         "{ \n" +
-        "    vec4 featureProperties = texture2D(tile_batchTexture, tile_featureSt); \n" +
+        "    vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
         "    if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zeo - true
         "        discard; \n" +
         "    } \n";
@@ -775,7 +775,7 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
       source += "    tile_color(featureProperties); \n";
 
       if (hasPremultipliedAlpha) {
-        source += "    gl_FragColor.rgb *= gl_FragColor.a; \n";
+        source += "    out_FragColor.rgb *= out_FragColor.a; \n";
       }
 
       source += "} \n";
@@ -794,28 +794,28 @@ Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback = funct
       // When VTF is supported, per-feature show/hide already happened in the fragment shader
       source +=
         "uniform sampler2D tile_pickTexture;\n" +
-        "varying vec2 tile_featureSt; \n" +
-        "varying vec4 tile_featureColor; \n" +
+        "in vec2 tile_featureSt; \n" +
+        "in vec4 tile_featureColor; \n" +
         "void main() \n" +
         "{ \n" +
         "    tile_main(); \n" +
-        "    gl_FragColor = tile_featureColor; \n" +
-        "    gl_FragColor.rgb *= gl_FragColor.a; \n" +
+        "    out_FragColor = tile_featureColor; \n" +
+        "    out_FragColor.rgb *= out_FragColor.a; \n" +
         "}";
     } else {
       source +=
         "uniform sampler2D tile_batchTexture; \n" +
         "uniform sampler2D tile_pickTexture;\n" +
-        "varying vec2 tile_featureSt; \n" +
+        "in vec2 tile_featureSt; \n" +
         "void main() \n" +
         "{ \n" +
         "    tile_main(); \n" +
-        "    vec4 featureProperties = texture2D(tile_batchTexture, tile_featureSt); \n" +
+        "    vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
         "    if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zero - true
         "        discard; \n" +
         "    } \n" +
-        "    gl_FragColor = featureProperties; \n" +
-        "    gl_FragColor.rgb *= gl_FragColor.a; \n" +
+        "    out_FragColor = featureProperties; \n" +
+        "    out_FragColor.rgb *= out_FragColor.a; \n" +
         "} \n";
     }
     return source;
@@ -875,7 +875,7 @@ Cesium3DTileBatchTable.prototype.getUniformMapCallback = function () {
 };
 
 Cesium3DTileBatchTable.prototype.getPickId = function () {
-  return "texture2D(tile_pickTexture, tile_featureSt)";
+  return "texture(tile_pickTexture, tile_featureSt)";
 };
 
 ///////////////////////////////////////////////////////////////////////////

package/Source/Scene/Cesium3DTileColorBlendMode.js

@@ -22,13 +22,13 @@
  * }
  * </code></pre>
  *
- * @enum {Number}
+ * @enum {number}
  */
 const Cesium3DTileColorBlendMode = {
   /**
    * Multiplies the source color by the feature color.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   HIGHLIGHT: 0,
@@ -36,7 +36,7 @@ const Cesium3DTileColorBlendMode = {
   /**
    * Replaces the source color with the feature color.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   REPLACE: 1,
@@ -44,7 +44,7 @@ const Cesium3DTileColorBlendMode = {
   /**
    * Blends the source color and feature color together.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   MIX: 2,

package/Source/Scene/Cesium3DTileContent.js

@@ -22,7 +22,7 @@ function Cesium3DTileContent() {
    * not part of the public Cesium API.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @private
    */
@@ -35,7 +35,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   featuresLength: {
@@ -56,7 +56,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   pointsLength: {
@@ -71,7 +71,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   trianglesLength: {
@@ -86,7 +86,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   geometryByteLength: {
@@ -101,7 +101,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   texturesByteLength: {
@@ -118,7 +118,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   batchTableByteLength: {
@@ -150,7 +150,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    *
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {Promise.<Cesium3DTileContent>}
+   * @type {Promise<Cesium3DTileContent>}
    * @readonly
    */
   readyPromise: {
@@ -194,7 +194,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    * Gets the url of the tile's content.
    * @memberof Cesium3DTileContent.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   url: {
@@ -274,9 +274,9 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
 /**
  * Returns whether the feature has this property.
  *
- * @param {Number} batchId The batchId for the feature.
- * @param {String} name The case-sensitive name of the property.
- * @returns {Boolean} <code>true</code> if the feature has this property; otherwise, <code>false</code>.
+ * @param {number} batchId The batchId for the feature.
+ * @param {string} name The case-sensitive name of the property.
+ * @returns {boolean} <code>true</code> if the feature has this property; otherwise, <code>false</code>.
  */
 Cesium3DTileContent.prototype.hasProperty = function (batchId, name) {
   DeveloperError.throwInstantiationError();
@@ -292,7 +292,7 @@ Cesium3DTileContent.prototype.hasProperty = function (batchId, name) {
  *
  * @see {@link https://github.com/CesiumGS/3d-tiles/tree/main/specification/TileFormats/BatchTable}.
  *
- * @param {Number} batchId The batchId for the feature.
+ * @param {number} batchId The batchId for the feature.
  * @returns {Cesium3DTileFeature} The corresponding {@link Cesium3DTileFeature} object.
  *
  * @exception {DeveloperError} batchId must be between zero and {@link Cesium3DTileContent#featuresLength} - 1.
@@ -308,7 +308,7 @@ Cesium3DTileContent.prototype.getFeature = function (batchId) {
      * not part of the public Cesium API.
      * </p>
      *
-     * @param {Boolean} enabled Whether to enable or disable debug settings.
+     * @param {boolean} enabled Whether to enable or disable debug settings.
      * @returns {Cesium3DTileFeature} The corresponding {@link Cesium3DTileFeature} object.
 
      * @private
@@ -360,7 +360,7 @@ Cesium3DTileContent.prototype.update = function (tileset, frameState) {
  * not part of the public Cesium API.
  * </p>
  *
- * @returns {Boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
  *
  * @see Cesium3DTileContent#destroy
  *