@hztxi/cesium-engine 25.0.7 → 26.2.2

package/Source/Scene/Implicit3DTileContent.js

@@ -27,219 +27,225 @@ import BoundingVolumeSemantics from "./BoundingVolumeSemantics.js";
  * </p>
  * This object is normally not instantiated directly, use {@link Implicit3DTileContent.fromSubtreeJson}.
  *
- * @alias Implicit3DTileContent
- * @constructor
- *
- * @param {Cesium3DTileset} tileset The tileset this content belongs to
- * @param {Cesium3DTile} tile The tile this content belongs to.
- * @param {Resource} resource The resource for the tileset
- * @param {object} [json] The JSON object containing the subtree. Mutually exclusive with arrayBuffer.
- * @param {ArrayBuffer} [arrayBuffer] The array buffer that stores the content payload. Mutually exclusive with json.
- * @param {number} [byteOffset=0] The offset into the array buffer, if one was provided
- *
- * @exception {DeveloperError} One of json and arrayBuffer must be defined.
- *
+ * @implements Cesium3DTileContent
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
-function Implicit3DTileContent(tileset, tile, resource) {
-  //>>includeStart('debug', pragmas.debug);
-  Check.defined("tile.implicitTileset", tile.implicitTileset);
-  Check.defined("tile.implicitCoordinates", tile.implicitCoordinates);
-  //>>includeEnd('debug');
-
-  const implicitTileset = tile.implicitTileset;
-  const implicitCoordinates = tile.implicitCoordinates;
-
-  this._implicitTileset = implicitTileset;
-  this._implicitCoordinates = implicitCoordinates;
-  this._implicitSubtree = undefined;
-  this._tileset = tileset;
-  this._tile = tile;
-  this._resource = resource;
-
-  this._metadata = undefined;
-
-  this.featurePropertiesDirty = false;
-  this._group = undefined;
-
-  const templateValues = implicitCoordinates.getTemplateValues();
-  const subtreeResource = implicitTileset.subtreeUriTemplate.getDerivedResource(
-    {
-      templateValues: templateValues,
-    },
-  );
-  this._url = subtreeResource.getUrlComponent(true);
-
-  this._ready = false;
-}
+class Implicit3DTileContent {
+  /**
+   * @param {Cesium3DTileset} tileset The tileset this content belongs to
+   * @param {Cesium3DTile} tile The tile this content belongs to.
+   * @param {Resource} resource The resource for the tileset
+   * @param {object} [json] The JSON object containing the subtree. Mutually exclusive with arrayBuffer.
+   * @param {ArrayBuffer} [arrayBuffer] The array buffer that stores the content payload. Mutually exclusive with json.
+   * @param {number} [byteOffset=0] The offset into the array buffer, if one was provided
+   *
+   * @exception {DeveloperError} One of json and arrayBuffer must be defined.
+   */
+  constructor(tileset, tile, resource) {
+    //>>includeStart('debug', pragmas.debug);
+    Check.defined("tile.implicitTileset", tile.implicitTileset);
+    Check.defined("tile.implicitCoordinates", tile.implicitCoordinates);
+    //>>includeEnd('debug');
+
+    const implicitTileset = tile.implicitTileset;
+    const implicitCoordinates = tile.implicitCoordinates;
+
+    this._implicitTileset = implicitTileset;
+    this._implicitCoordinates = implicitCoordinates;
+    this._implicitSubtree = undefined;
+    this._tileset = tileset;
+    this._tile = tile;
+    this._resource = resource;
+
+    this._metadata = undefined;
+
+    this.featurePropertiesDirty = false;
+    this._group = undefined;
+
+    const templateValues = implicitCoordinates.getTemplateValues();
+    const subtreeResource =
+      implicitTileset.subtreeUriTemplate.getDerivedResource({
+        templateValues: templateValues,
+      });
+    this._url = subtreeResource.getUrlComponent(true);
+
+    this._ready = false;
+  }
 
-Object.defineProperties(Implicit3DTileContent.prototype, {
-  featuresLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get featuresLength() {
+    return 0;
+  }
 
-  pointsLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get pointsLength() {
+    return 0;
+  }
 
-  trianglesLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get trianglesLength() {
+    return 0;
+  }
 
-  geometryByteLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get geometryByteLength() {
+    return 0;
+  }
 
-  texturesByteLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get texturesByteLength() {
+    return 0;
+  }
 
-  batchTableByteLength: {
-    get: function () {
-      return 0;
-    },
-  },
+  get batchTableByteLength() {
+    return 0;
+  }
 
-  innerContents: {
-    get: function () {
-      return undefined;
-    },
-  },
+  get innerContents() {
+    return undefined;
+  }
 
   /**
    * Returns true when the tile's content is ready to render; otherwise false
    *
-   * @memberof Implicit3DTileContent.prototype
    *
    * @type {boolean}
    * @readonly
    * @private
    */
-  ready: {
-    get: function () {
-      return this._ready;
-    },
-  },
+  get ready() {
+    return this._ready;
+  }
 
-  tileset: {
-    get: function () {
-      return this._tileset;
-    },
-  },
+  get tileset() {
+    return this._tileset;
+  }
 
-  tile: {
-    get: function () {
-      return this._tile;
-    },
-  },
+  get tile() {
+    return this._tile;
+  }
 
-  url: {
-    get: function () {
-      return this._url;
-    },
-  },
+  get url() {
+    return this._url;
+  }
 
   /**
    * Part of the {@link Cesium3DTileContent} interface. <code>Implicit3DTileContent</code>
    * always returns <code>undefined</code>. Only transcoded tiles have content metadata.
-   * @memberof Implicit3DTileContent.prototype
    * @private
    */
-  metadata: {
-    get: function () {
-      return undefined;
-    },
-    set: function () {
-      //>>includeStart('debug', pragmas.debug);
-      throw new DeveloperError("Implicit3DTileContent cannot have metadata");
-      //>>includeEnd('debug');
-    },
-  },
-
-  batchTable: {
-    get: function () {
-      return undefined;
-    },
-  },
+  get metadata() {
+    return undefined;
+  }
 
-  group: {
-    get: function () {
-      return this._group;
-    },
-    set: function (value) {
-      this._group = value;
-    },
-  },
-});
+  set metadata(_) {
+    //>>includeStart('debug', pragmas.debug);
+    throw new DeveloperError("Implicit3DTileContent cannot have metadata");
+    //>>includeEnd('debug');
+  }
 
-/**
- * Initialize the implicit content by parsing the subtree resource and setting
- * up a promise chain to expand the immediate subtree.
- *
- * @param {Cesium3DTileset} tileset The tileset this content belongs to
- * @param {Cesium3DTile} tile The tile this content belongs to.
- * @param {Resource} resource The resource for the tileset
- * @param {object} [json] The JSON containing the subtree. Mutually exclusive with arrayBuffer.
- * @param {ArrayBuffer} [arrayBuffer] The ArrayBuffer containing a subtree binary. Mutually exclusive with json.
- * @param {number} [byteOffset=0] The byte offset into the arrayBuffer
- * @return {Promise<Implicit3DTileContent>}
- *
- * @exception {DeveloperError} One of json and arrayBuffer must be defined.
- *
- * @private
- */
-Implicit3DTileContent.fromSubtreeJson = async function (
-  tileset,
-  tile,
-  resource,
-  json,
-  arrayBuffer,
-  byteOffset,
-) {
-  //>>includeStart('debug', pragmas.debug);
-  Check.defined("tile.implicitTileset", tile.implicitTileset);
-  Check.defined("tile.implicitCoordinates", tile.implicitCoordinates);
-  if (defined(json) === defined(arrayBuffer)) {
-    throw new DeveloperError("One of json and arrayBuffer must be defined.");
+  get batchTable() {
+    return undefined;
   }
-  //>>includeEnd('debug');
 
-  byteOffset = byteOffset ?? 0;
-  let uint8Array;
-  if (defined(arrayBuffer)) {
-    uint8Array = new Uint8Array(arrayBuffer, byteOffset);
+  get group() {
+    return this._group;
   }
 
-  const implicitTileset = tile.implicitTileset;
-  const implicitCoordinates = tile.implicitCoordinates;
+  set group(value) {
+    this._group = value;
+  }
 
-  const subtree = await ImplicitSubtree.fromSubtreeJson(
+  /**
+   * Initialize the implicit content by parsing the subtree resource and setting
+   * up a promise chain to expand the immediate subtree.
+   *
+   * @param {Cesium3DTileset} tileset The tileset this content belongs to
+   * @param {Cesium3DTile} tile The tile this content belongs to.
+   * @param {Resource} resource The resource for the tileset
+   * @param {object} [json] The JSON containing the subtree. Mutually exclusive with arrayBuffer.
+   * @param {ArrayBuffer} [arrayBuffer] The ArrayBuffer containing a subtree binary. Mutually exclusive with json.
+   * @param {number} [byteOffset=0] The byte offset into the arrayBuffer
+   * @return {Promise<Implicit3DTileContent>}
+   *
+   * @exception {DeveloperError} One of json and arrayBuffer must be defined.
+   *
+   * @private
+   */
+  static async fromSubtreeJson(
+    tileset,
+    tile,
     resource,
     json,
-    uint8Array,
-    implicitTileset,
-    implicitCoordinates,
-  );
+    arrayBuffer,
+    byteOffset,
+  ) {
+    //>>includeStart('debug', pragmas.debug);
+    Check.defined("tile.implicitTileset", tile.implicitTileset);
+    Check.defined("tile.implicitCoordinates", tile.implicitCoordinates);
+    if (defined(json) === defined(arrayBuffer)) {
+      throw new DeveloperError("One of json and arrayBuffer must be defined.");
+    }
+    //>>includeEnd('debug');
 
-  const content = new Implicit3DTileContent(tileset, tile, resource);
+    byteOffset = byteOffset ?? 0;
+    let uint8Array;
+    if (defined(arrayBuffer)) {
+      uint8Array = new Uint8Array(arrayBuffer, byteOffset);
+    }
 
-  content._implicitSubtree = subtree;
-  expandSubtree(content, subtree);
-  content._ready = true;
+    const implicitTileset = tile.implicitTileset;
+    const implicitCoordinates = tile.implicitCoordinates;
 
-  return content;
-};
+    const subtree = await ImplicitSubtree.fromSubtreeJson(
+      resource,
+      json,
+      uint8Array,
+      implicitTileset,
+      implicitCoordinates,
+    );
+
+    const content = new Implicit3DTileContent(tileset, tile, resource);
+
+    content._implicitSubtree = subtree;
+    expandSubtree(content, subtree);
+    content._ready = true;
+
+    return content;
+  }
+
+  /**
+   * Part of the {@link Cesium3DTileContent} interface.  <code>Implicit3DTileContent</code>
+   * always returns <code>false</code> since a tile of this type does not have any features.
+   * @private
+   */
+  hasProperty(batchId, name) {
+    return false;
+  }
+
+  /**
+   * Part of the {@link Cesium3DTileContent} interface.  <code>Implicit3DTileContent</code>
+   * always returns <code>undefined</code> since a tile of this type does not have any features.
+   * @private
+   */
+  getFeature(batchId) {
+    return undefined;
+  }
+
+  applyDebugSettings(enabled, color) {}
+  applyStyle(style) {}
+  update(tileset, frameState) {}
+
+  pick(ray, frameState, result) {
+    return undefined;
+  }
+
+  isDestroyed() {
+    return false;
+  }
+
+  destroy() {
+    this._implicitSubtree =
+      this._implicitSubtree && this._implicitSubtree.destroy();
+    return destroyObject(this);
+  }
+}
 
 /**
  * Expand a single subtree placeholder tile. This transcodes the subtree into
@@ -304,7 +310,14 @@ function expandSubtree(content, subtree) {
  */
 function listChildSubtrees(content, subtree, bottomRow) {
   const results = [];
-  const branchingFactor = content._implicitTileset.branchingFactor;
+  const implicitTileset = content._implicitTileset;
+  const nextSubtreeLevel =
+    content._implicitCoordinates.level + implicitTileset.subtreeLevels;
+  if (nextSubtreeLevel >= implicitTileset.availableLevels) {
+    return results;
+  }
+
+  const branchingFactor = implicitTileset.branchingFactor;
   for (let i = 0; i < bottomRow.length; i++) {
     const leafTile = bottomRow[i];
     if (!defined(leafTile)) {
@@ -367,7 +380,11 @@ function transcodeSubtreeTiles(content, subtree, placeholderTile, childIndex) {
   let currentRow = [];
 
   const implicitTileset = content._implicitTileset;
-  for (let level = 1; level < implicitTileset.subtreeLevels; level++) {
+  const availableSubtreeLevels = Math.min(
+    implicitTileset.subtreeLevels,
+    implicitTileset.availableLevels - content._implicitCoordinates.level,
+  );
+  for (let level = 1; level < availableSubtreeLevels; level++) {
     const levelOffset = subtree.getLevelOffset(level);
     const numberOfChildren = implicitTileset.branchingFactor * parentRow.length;
     for (
@@ -1157,47 +1174,6 @@ function makeTile(content, baseResource, tileJson, parentTile) {
   return new Cesium3DTile(content._tileset, baseResource, tileJson, parentTile);
 }
 
-/**
- * Part of the {@link Cesium3DTileContent} interface.  <code>Implicit3DTileContent</code>
- * always returns <code>false</code> since a tile of this type does not have any features.
- * @private
- */
-Implicit3DTileContent.prototype.hasProperty = function (batchId, name) {
-  return false;
-};
-
-/**
- * Part of the {@link Cesium3DTileContent} interface.  <code>Implicit3DTileContent</code>
- * always returns <code>undefined</code> since a tile of this type does not have any features.
- * @private
- */
-Implicit3DTileContent.prototype.getFeature = function (batchId) {
-  return undefined;
-};
-
-Implicit3DTileContent.prototype.applyDebugSettings = function (
-  enabled,
-  color,
-) {};
-
-Implicit3DTileContent.prototype.applyStyle = function (style) {};
-
-Implicit3DTileContent.prototype.update = function (tileset, frameState) {};
-
-Implicit3DTileContent.prototype.pick = function (ray, frameState, result) {
-  return undefined;
-};
-
-Implicit3DTileContent.prototype.isDestroyed = function () {
-  return false;
-};
-
-Implicit3DTileContent.prototype.destroy = function () {
-  this._implicitSubtree =
-    this._implicitSubtree && this._implicitSubtree.destroy();
-  return destroyObject(this);
-};
-
 // Exposed for testing
 Implicit3DTileContent._deriveBoundingBox = deriveBoundingBox;
 Implicit3DTileContent._deriveBoundingRegion = deriveBoundingRegion;

package/Source/Scene/ImplicitTileCoordinates.js

@@ -4,6 +4,8 @@ import DeveloperError from "../Core/DeveloperError.js";
 import MortonOrder from "../Core/MortonOrder.js";
 import ImplicitSubdivisionScheme from "./ImplicitSubdivisionScheme.js";
 
+const webMercatorMaximumLatitude = Math.atan(Math.sinh(Math.PI));
+
 /**
  * The coordinates for a tile in an implicit tileset. The coordinates
  * are (level, x, y) for quadtrees or (level, x, y, z) for octrees.
@@ -540,6 +542,7 @@ ImplicitTileCoordinates.prototype.getTemplateValues = function () {
     level: this.level,
     x: this.x,
     y: this.y,
+    webMercatorY: getWebMercatorY(this.level, this.y),
   };
   if (this.subdivisionScheme === ImplicitSubdivisionScheme.OCTREE) {
     values.z = this.z;
@@ -548,6 +551,20 @@ ImplicitTileCoordinates.prototype.getTemplateValues = function () {
   return values;
 };
 
+/** @param {number} level @param {number} implicitY */
+function getWebMercatorY(level, implicitY) {
+  const dimension = Math.pow(2, level);
+  const latitude =
+    -webMercatorMaximumLatitude +
+    (2.0 * webMercatorMaximumLatitude * (implicitY + 0.5)) / dimension;
+  const normalizedY = (1.0 - Math.asinh(Math.tan(latitude)) / Math.PI) * 0.5;
+  return CesiumMath.clamp(
+    Math.floor(normalizedY * dimension),
+    0,
+    dimension - 1,
+  );
+}
+
 const scratchCoordinatesArray = [0, 0, 0];
 
 /**

package/Source/Scene/IonImageryProvider.js

@@ -26,17 +26,13 @@ import IonImageryProviderFactory from "./IonImageryProviderFactory.js";
  * @alias IonImageryProvider
  * @constructor
  *
- * @param {IonImageryProvider.ConstructorOptions} [options] Object describing initialization options
- *
  * @example
  * const imageryLayer = Cesium.ImageryLayer.fromProviderAsync(Cesium.IonImageryProvider.fromAssetId(3812));
  * viewer.imageryLayers.add(imageryLayer);
  *
  * @see IonImageryProvider.fromAssetId
  */
-function IonImageryProvider(options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
-
+function IonImageryProvider() {
   this._defaultAlpha = undefined;
   this._defaultNightAlpha = undefined;
   this._defaultDayAlpha = undefined;

package/Source/Scene/Label.js

@@ -1282,10 +1282,10 @@ Label.getScreenSpaceBoundingBox = function (
   screenSpacePosition,
   result,
 ) {
-  let x = 0;
-  let y = 0;
-  let width = 0;
-  let height = 0;
+  let x;
+  let y;
+  let width;
+  let height;
   const scale = label.totalScale;
 
   const backgroundBillboard = label._backgroundBillboard;

package/Source/Scene/LabelCollection.js

@@ -335,7 +335,7 @@ function updateBackgroundBillboard(
   // Label is shown and background is hidden - remove the background billboard
   if (label.show && !showBackground) {
     backgroundBillboardCollection.remove(backgroundBillboard);
-    label._backgroundBillboard = backgroundBillboard = undefined;
+    label._backgroundBillboard = undefined;
     return;
   }
 
@@ -597,6 +597,7 @@ function destroyLabel(labelCollection, label) {
  * @param {boolean} [options.show=true] Determines if the labels in the collection will be shown.
  * @param {number} [options.coarseDepthTestDistance] The distance from the camera, beyond which, labels are depth-tested against an approximation of the globe ellipsoid rather than against the full globe depth buffer. If unspecified, the default value is determined relative to the value of {@link Ellipsoid.default}.
  * @param {number} [options.threePointDepthTestDistance] The distance from the camera, within which, lables with a {@link Label#heightReference} value of {@link HeightReference.CLAMP_TO_GROUND} or {@link HeightReference.CLAMP_TO_TERRAIN} are depth tested against three key points. This ensures that if any key point of the label is visible, the whole label will be visible. If unspecified, the default value is determined relative to the value of {@link Ellipsoid.default}.
+ * @param {boolean} [options.alwaysThreePointDepthTest=false] Enables the three-point depth test even when {@link Globe#depthTestAgainstTerrain} is false.
  * @performance For best performance, prefer a few collections, each with many labels, to
  * many collections with only a few labels each.  Avoid having collections where some
  * labels change every frame and others do not; instead, create one or more collections
@@ -634,6 +635,7 @@ function LabelCollection(options) {
     }),
     coarseDepthTestDistance: options.coarseDepthTestDistance,
     threePointDepthTestDistance: options.threePointDepthTestDistance,
+    alwaysThreePointDepthTest: options.alwaysThreePointDepthTest,
   });
   this._backgroundBillboardCollection = backgroundBillboardCollection;
   this._backgroundBillboardTexture = new BillboardTexture(
@@ -645,6 +647,7 @@ function LabelCollection(options) {
     batchTable: this._batchTable,
     coarseDepthTestDistance: options.coarseDepthTestDistance,
     threePointDepthTestDistance: options.threePointDepthTestDistance,
+    alwaysThreePointDepthTest: options.alwaysThreePointDepthTest,
   });
   this._glyphBillboardCollection._sdf = true;