@cesium/engine 21.0.1 → 22.1.0

package/Source/Scene/GlobeSurfaceTile.js

@@ -1,12 +1,9 @@
 import BoundingSphere from "../Core/BoundingSphere.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import Cartesian4 from "../Core/Cartesian4.js";
-import Cartographic from "../Core/Cartographic.js";
 import defined from "../Core/defined.js";
 import IndexDatatype from "../Core/IndexDatatype.js";
-import IntersectionTests from "../Core/IntersectionTests.js";
 import PixelFormat from "../Core/PixelFormat.js";
-import Ray from "../Core/Ray.js";
 import Request from "../Core/Request.js";
 import RequestState from "../Core/RequestState.js";
 import RequestType from "../Core/RequestType.js";
@@ -23,7 +20,6 @@ import TextureWrap from "../Renderer/TextureWrap.js";
 import VertexArray from "../Renderer/VertexArray.js";
 import ImageryState from "./ImageryState.js";
 import QuadtreeTileLoadState from "./QuadtreeTileLoadState.js";
-import SceneMode from "./SceneMode.js";
 import TerrainState from "./TerrainState.js";
 
 /**
@@ -126,33 +122,6 @@ Object.defineProperties(GlobeSurfaceTile.prototype, {
   },
 });
 
-const scratchCartographic = new Cartographic();
-
-function getPosition(encoding, mode, projection, vertices, index, result) {
-  let position = encoding.getExaggeratedPosition(vertices, index, result);
-
-  if (defined(mode) && mode !== SceneMode.SCENE3D) {
-    const ellipsoid = projection.ellipsoid;
-    const positionCartographic = ellipsoid.cartesianToCartographic(
-      position,
-      scratchCartographic,
-    );
-    position = projection.project(positionCartographic, result);
-    position = Cartesian3.fromElements(
-      position.z,
-      position.x,
-      position.y,
-      result,
-    );
-  }
-
-  return position;
-}
-
-const scratchV0 = new Cartesian3();
-const scratchV1 = new Cartesian3();
-const scratchV2 = new Cartesian3();
-
 GlobeSurfaceTile.prototype.pick = function (
   ray,
   mode,
@@ -160,42 +129,11 @@ GlobeSurfaceTile.prototype.pick = function (
   cullBackFaces,
   result,
 ) {
-  const mesh = this.renderedMesh;
-  if (!defined(mesh)) {
+  if (!defined(this.renderedMesh)) {
     return undefined;
   }
-
-  const vertices = mesh.vertices;
-  const indices = mesh.indices;
-  const encoding = mesh.encoding;
-  const indicesLength = indices.length;
-
-  let minT = Number.MAX_VALUE;
-
-  for (let i = 0; i < indicesLength; i += 3) {
-    const i0 = indices[i];
-    const i1 = indices[i + 1];
-    const i2 = indices[i + 2];
-
-    const v0 = getPosition(encoding, mode, projection, vertices, i0, scratchV0);
-    const v1 = getPosition(encoding, mode, projection, vertices, i1, scratchV1);
-    const v2 = getPosition(encoding, mode, projection, vertices, i2, scratchV2);
-
-    const t = IntersectionTests.rayTriangleParametric(
-      ray,
-      v0,
-      v1,
-      v2,
-      cullBackFaces,
-    );
-    if (defined(t) && t < minT && t >= 0.0) {
-      minT = t;
-    }
-  }
-
-  return minT !== Number.MAX_VALUE
-    ? Ray.getPoint(ray, minT, result)
-    : undefined;
+  const value = this.renderedMesh.pick(ray, cullBackFaces, mode, projection);
+  return Cartesian3.clone(value, result);
 };
 
 GlobeSurfaceTile.prototype.freeResources = function () {
@@ -473,8 +411,10 @@ GlobeSurfaceTile.prototype.updateExaggeration = function (
     encoding.exaggeration !== exaggeration;
   const encodingRelativeHeightChanged =
     encoding.exaggerationRelativeHeight !== exaggerationRelativeHeight;
+  const exaggerationChanged =
+    encodingExaggerationScaleChanged || encodingRelativeHeightChanged;
 
-  if (encodingExaggerationScaleChanged || encodingRelativeHeightChanged) {
+  if (exaggerationChanged) {
     // Turning exaggeration scale on/off requires adding or removing geodetic surface normals
     // Relative height only translates, so it has no effect on normals
     if (encodingExaggerationScaleChanged) {
@@ -493,14 +433,24 @@ GlobeSurfaceTile.prototype.updateExaggeration = function (
     if (quadtree !== undefined) {
       quadtree._tileToUpdateHeights.push(tile);
       const customData = tile.customData;
-      const customDataLength = customData.length;
-      for (let i = 0; i < customDataLength; i++) {
+      for (const data of customData) {
         // Restart the level so that a height update is triggered
-        const data = customData[i];
         data.level = -1;
       }
     }
+
+    mesh.updateExaggeration(exaggeration, exaggerationRelativeHeight);
+  }
+};
+
+GlobeSurfaceTile.prototype.updateSceneMode = function (mode) {
+  const surfaceTile = this;
+  const mesh = surfaceTile.renderedMesh;
+  if (mesh === undefined) {
+    return;
   }
+
+  mesh.updateSceneMode(mode);
 };
 
 function prepareNewTile(tile, terrainProvider, imageryLayerCollection) {
@@ -931,7 +881,15 @@ function createWaterMaskTextureIfNeeded(context, surfaceTile) {
   let texture;
 
   const waterMaskLength = waterMask.length;
-  if (waterMaskLength === 1) {
+  if (waterMask instanceof ImageBitmap) {
+    texture = Texture.create({
+      context: context,
+      source: waterMask,
+      sampler: waterMaskData.sampler,
+      flipY: false,
+      skipColorSpaceConversion: true,
+    });
+  } else if (waterMaskLength === 1) {
     // Length 1 means the tile is entirely land or entirely water.
     // A value of 0 indicates entirely land, a value of 1 indicates entirely water.
     if (waterMask[0] !== 0) {

package/Source/Scene/GlobeSurfaceTileProvider.js

@@ -193,6 +193,7 @@ function GlobeSurfaceTileProvider(options) {
 
   this._oldVerticalExaggeration = undefined;
   this._oldVerticalExaggerationRelativeHeight = undefined;
+  this._oldSceneMode = SceneMode.SCENE3D;
 }
 
 Object.defineProperties(GlobeSurfaceTileProvider.prototype, {
@@ -514,6 +515,16 @@ GlobeSurfaceTileProvider.prototype.endUpdate = function (frameState) {
     });
   }
 
+  const sceneModeChanged = this._oldSceneMode !== frameState.mode;
+  this._oldSceneMode = frameState.mode;
+
+  if (sceneModeChanged) {
+    quadtree.forEachLoadedTile(function (tile) {
+      const surfaceTile = tile.data;
+      surfaceTile.updateSceneMode(frameState.mode);
+    });
+  }
+
   // Add the tile render commands to the command list, sorted by texture count.
   const tilesToRenderByTextureCount = this._tilesToRenderByTextureCount;
   for (

package/Source/Scene/GltfBufferViewLoader.js

@@ -125,6 +125,12 @@ Object.defineProperties(GltfBufferViewLoader.prototype, {
   },
 });
 
+/**
+ * Load the resources associated with the loader.
+ * @private
+ * @param {GltfBufferViewLoader} loader
+ * @returns {Promise<GltfBufferViewLoader>}
+ */
 async function loadResources(loader) {
   try {
     const bufferLoader = getBufferLoader(loader);
@@ -190,9 +196,18 @@ GltfBufferViewLoader.prototype.load = async function () {
   return this._promise;
 };
 
+/**
+ * Get the buffer loader for the specified buffer view loader.
+ * Attempts to retrieve from the resource cache first. If a buffer loader is
+ * not found, creates a new buffer loader and adds it to the resource cache.
+ * @private
+ * @param {GltfBufferViewLoader} bufferViewLoader The loader.
+ * @returns {BufferLoader} The buffer loader.
+ */
 function getBufferLoader(bufferViewLoader) {
   const resourceCache = bufferViewLoader._resourceCache;
   const buffer = bufferViewLoader._buffer;
+
   if (defined(buffer.uri)) {
     const baseResource = bufferViewLoader._baseResource;
     const resource = baseResource.getDerivedResource({
@@ -202,9 +217,12 @@ function getBufferLoader(bufferViewLoader) {
       resource: resource,
     });
   }
+
+  const source = buffer.extras?._pipeline?.source;
   return resourceCache.getEmbeddedBufferLoader({
     parentResource: bufferViewLoader._gltfResource,
     bufferId: bufferViewLoader._bufferId,
+    typedArray: source,
   });
 }
 

package/Source/Scene/GltfLoader.js

@@ -1441,13 +1441,18 @@ function loadIndices(
   loader,
   accessorId,
   primitive,
-  draco,
   hasFeatureIds,
   needsPostProcessing,
   frameState,
 ) {
   const accessor = loader.gltfJson.accessors[accessorId];
   const bufferViewId = accessor.bufferView;
+  // Infer compression / extensions directly from the glTF primitive instead of passing in flags
+  const extensions = primitive.extensions ?? Frozen.EMPTY_OBJECT;
+  const draco = extensions.KHR_draco_mesh_compression;
+  const hasEdgeVisibility = defined(
+    extensions.EXT_mesh_primitive_edge_visibility,
+  );
 
   if (!defined(draco) && !defined(bufferViewId)) {
     return undefined;
@@ -1470,7 +1475,10 @@ function loadIndices(
   const outputTypedArrayOnly = loadAttributesAsTypedArray;
   const outputBuffer = !outputTypedArrayOnly;
   const outputTypedArray =
-    loadAttributesAsTypedArray || loadForCpuOperations || loadForClassification;
+    loadAttributesAsTypedArray ||
+    loadForCpuOperations ||
+    loadForClassification ||
+    hasEdgeVisibility;
 
   // Determine what to load right now:
   //
@@ -1991,11 +1999,6 @@ function fetchSpzExtensionFrom(extensions) {
     return spz;
   }
 
-  const legacySpz = extensions?.KHR_spz_gaussian_splats_compression;
-  if (defined(legacySpz)) {
-    return legacySpz;
-  }
-
   return undefined;
 }
 
@@ -2036,8 +2039,44 @@ function loadPrimitive(loader, gltfPrimitive, hasInstances, frameState) {
     );
   }
 
+  // Edge Visibility
+  const edgeVisibilityExtension = extensions.EXT_mesh_primitive_edge_visibility;
+  const hasEdgeVisibility = defined(edgeVisibilityExtension);
+  if (hasEdgeVisibility) {
+    const visibilityAccessor =
+      loader.gltfJson.accessors[edgeVisibilityExtension.visibility];
+    if (!defined(visibilityAccessor)) {
+      throw new RuntimeError("Edge visibility accessor not found!");
+    }
+    const visibilityValues = loadAccessor(loader, visibilityAccessor);
+    primitive.edgeVisibility = {
+      visibility: visibilityValues,
+      material: edgeVisibilityExtension.material,
+    };
+
+    // Load silhouette normals
+    if (defined(edgeVisibilityExtension.silhouetteNormals)) {
+      const silhouetteNormalsAccessor =
+        loader.gltfJson.accessors[edgeVisibilityExtension.silhouetteNormals];
+      if (defined(silhouetteNormalsAccessor)) {
+        const silhouetteNormalsValues = loadAccessor(
+          loader,
+          silhouetteNormalsAccessor,
+        );
+        primitive.edgeVisibility.silhouetteNormals = silhouetteNormalsValues;
+      }
+    }
+
+    // Load line strings
+    if (defined(edgeVisibilityExtension.lineStrings)) {
+      primitivePlan.edgeVisibility.lineStrings =
+        edgeVisibilityExtension.lineStrings;
+    }
+  }
+
   //support the latest glTF spec and the legacy extension
   const spzExtension = fetchSpzExtensionFrom(extensions);
+
   if (defined(spzExtension)) {
     needsPostProcessing = true;
     primitivePlan.needsGaussianSplats = true;
@@ -2108,7 +2147,6 @@ function loadPrimitive(loader, gltfPrimitive, hasInstances, frameState) {
       loader,
       indices,
       gltfPrimitive,
-      draco,
       hasFeatureIds,
       needsPostProcessing,
       frameState,

package/Source/Scene/Google2DImageryProvider.js

@@ -5,28 +5,28 @@ import DeveloperError from "../Core/DeveloperError.js";
 import Resource from "../Core/Resource.js";
 import IonResource from "../Core/IonResource.js";
 import Check from "../Core/Check.js";
-import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js";
 import GoogleMaps from "../Core/GoogleMaps.js";
+import { GOOGLE_2D_MAPS as createFromIonEndpoint } from "./IonImageryProviderFactory.js";
+import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js";
 
 const trailingSlashRegex = /\/$/;
 
 /**
- * @typedef {Object} Google2DImageryProvider.ConstructorOptions
+ * @typedef {object} Google2DImageryProvider.ConstructorOptions
  *
  * Initialization options for the Google2DImageryProvider constructor
  *
- * @property {object} options Object with the following properties:
- * @property {string} options.key The Google api key to send with tile requests.
- * @property {string} options.session The Google session token that tracks the current state of your map and viewport.
- * @property {string|Resource|IonResource} options.url The Google 2D maps endpoint.
- * @property {string} options.tileWidth The width of each tile in pixels.
- * @property {string} options.tileHeight The height of each tile in pixels.
- * @property {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid.  If not specified, the default ellipsoid is used.
- * @property {number} [options.minimumLevel=0] The minimum level-of-detail supported by the imagery provider.  Take care when specifying
+ * @property {string} key The Google api key to send with tile requests.
+ * @property {string} session The Google session token that tracks the current state of your map and viewport.
+ * @property {string|Resource|IonResource} url The Google 2D maps endpoint.
+ * @property {string} tileWidth The width of each tile in pixels.
+ * @property {string} tileHeight The height of each tile in pixels.
+ * @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid.  If not specified, the default ellipsoid is used.
+ * @property {number} [minimumLevel=0] The minimum level-of-detail supported by the imagery provider.  Take care when specifying
  *                 this that the number of tiles at the minimum level is small, such as four or less.  A larger number is likely
  *                 to result in rendering problems.
- * @property {number} [options.maximumLevel=22] The maximum level-of-detail supported by the imagery provider.
- * @property {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle, in radians, covered by the image.
+ * @property {number} [maximumLevel=22] The maximum level-of-detail supported by the imagery provider.
+ * @property {Rectangle} [rectangle=Rectangle.MAX_VALUE] The rectangle, in radians, covered by the image.
  */
 
 /**
@@ -36,7 +36,7 @@ const trailingSlashRegex = /\/$/;
  *
  *
  * Provides 2D image tiles from {@link https://developers.google.com/maps/documentation/tile/2d-tiles-overview|Google 2D Tiles}.
- * 
+ *
  * Google 2D Tiles can only be used with the Google geocoder.
  *
  * @alias Google2DImageryProvider
@@ -52,7 +52,7 @@ const trailingSlashRegex = /\/$/;
   * @example
  * // Use your own Google api key
  * Cesium.GoogleMaps.defaultApiKey = "your-api-key";
- * 
+ *
  * const googleTilesProvider = Cesium.Google2DImageryProvider.fromUrl({
  *     mapType: "SATELLITE"
  * });
@@ -101,6 +101,8 @@ function Google2DImageryProvider(options) {
     key: encodeURIComponent(options.key),
   });
 
+  this._resource = resource.clone();
+
   let credit;
   if (defined(options.credit)) {
     credit = options.credit;
@@ -125,8 +127,6 @@ function Google2DImageryProvider(options) {
   // This will be defined for ion resources
   this._tileCredits = resource.credits;
   this._attributionsByLevel = undefined;
-  // Asynchronously request and populate _attributionsByLevel
-  this.getViewportCredits();
 }
 
 Object.defineProperties(Google2DImageryProvider.prototype, {
@@ -296,7 +296,7 @@ Object.defineProperties(Google2DImageryProvider.prototype, {
  * @param {string} [options.language="en_US"] an IETF language tag that specifies the language used to display information on the tiles
  * @param {string} [options.region="US"] A Common Locale Data Repository region identifier (two uppercase letters) that represents the physical location of the user.
  * @param {"layerRoadmap" | "layerStreetview" | "layerTraffic"} [options.overlayLayerType] Returns a transparent overlay map with the specified layerType. If no value is provided, a basemap of mapType is returned. Use multiple instances of Google2DImageryProvider to add multiple Google Maps overlays to a scene. layerRoadmap is included in terrain and roadmap mapTypes, so adding as overlay to terrain or roadmap has no effect.
- * @param {Object} [options.styles] An array of JSON style objects that specify the appearance and detail level of map features such as roads, parks, and built-up areas. Styling is used to customize the standard Google base map. The styles parameter is valid only if the mapType is roadmap. For the complete style syntax, see the ({@link https://developers.google.com/maps/documentation/tile/style-reference|Google Style Reference}).
+ * @param {object} [options.styles] An array of JSON style objects that specify the appearance and detail level of map features such as roads, parks, and built-up areas. Styling is used to customize the standard Google base map. The styles parameter is valid only if the mapType is roadmap. For the complete style syntax, see the ({@link https://developers.google.com/maps/documentation/tile/style-reference|Google Style Reference}).
  * @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid.  If not specified, the default ellipsoid is used.
  * @param {number} [options.minimumLevel=0] The minimum level-of-detail supported by the imagery provider.  Take care when specifying
  *                 this that the number of tiles at the minimum level is small, such as four or less.  A larger number is likely
@@ -314,7 +314,7 @@ Object.defineProperties(Google2DImageryProvider.prototype, {
  * });
  * @example
  * // Google 2D roadmap overlay with custom styles
- * const googleTileProvider = Cesium.Google2DImageryProvider.fromIonAssetId({
+ * const googleTilesProvider = Cesium.Google2DImageryProvider.fromIonAssetId({
  *     assetId: 3830184,
  *     overlayLayerType: "layerRoadmap",
  *     styles: [
@@ -354,10 +354,6 @@ Google2DImageryProvider.fromIonAssetId = async function (options) {
     },
   );
 
-  const endpoint = await endpointResource.fetchJson();
-  const endpointOptions = { ...endpoint.options };
-  delete endpointOptions.url;
-
   const providerOptions = {
     language: options.language,
     region: options.region,
@@ -368,11 +364,15 @@ Google2DImageryProvider.fromIonAssetId = async function (options) {
     credit: options.credit,
   };
 
-  return new Google2DImageryProvider({
-    ...endpointOptions,
+  const endpoint = await endpointResource.fetchJson();
+  const url = endpoint.options.url;
+  delete endpoint.options.url;
+  endpoint.options = {
+    ...endpoint.options,
     ...providerOptions,
-    url: new IonResource(endpoint, endpointResource),
-  });
+  };
+
+  return createFromIonEndpoint(url, endpoint, endpointResource);
 };
 
 /**
@@ -383,7 +383,7 @@ Google2DImageryProvider.fromIonAssetId = async function (options) {
  * @param {string} [options.language="en_US"] an IETF language tag that specifies the language used to display information on the tiles
  * @param {string} [options.region="US"] A Common Locale Data Repository region identifier (two uppercase letters) that represents the physical location of the user.
  * @param {"layerRoadmap" | "layerStreetview" | "layerTraffic"} [options.overlayLayerType] Returns a transparent overlay map with the specified layerType. If no value is provided, a basemap of mapType is returned. Use multiple instances of Google2DImageryProvider to add multiple Google Maps overlays to a scene. layerRoadmap is included in terrain and roadmap mapTypes, so adding as overlay to terrain or roadmap has no effect.
- * @param {Object} [options.styles] An array of JSON style objects that specify the appearance and detail level of map features such as roads, parks, and built-up areas. Styling is used to customize the standard Google base map. The styles parameter is valid only if the mapType is roadmap. For the complete style syntax, see the ({@link https://developers.google.com/maps/documentation/tile/style-reference|Google Style Reference}).
+ * @param {object} [options.styles] An array of JSON style objects that specify the appearance and detail level of map features such as roads, parks, and built-up areas. Styling is used to customize the standard Google base map. The styles parameter is valid only if the mapType is roadmap. For the complete style syntax, see the ({@link https://developers.google.com/maps/documentation/tile/style-reference|Google Style Reference}).
  * @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid.  If not specified, the default ellipsoid is used.
  * @param {number} [options.minimumLevel=0] The minimum level-of-detail supported by the imagery provider.  Take care when specifying
  *                 this that the number of tiles at the minimum level is small, such as four or less.  A larger number is likely
@@ -405,7 +405,7 @@ Google2DImageryProvider.fromIonAssetId = async function (options) {
  * // Google 2D roadmap overlay with custom styles
  * Cesium.GoogleMaps.defaultApiKey = "your-api-key";
  *
- * const googleTileProvider = Cesium.Google2DImageryProvider.fromUrl({
+ * const googleTilesProvider = Cesium.Google2DImageryProvider.fromUrl({
  *     overlayLayerType: "layerRoadmap",
  *     styles: [
  *         {
@@ -486,7 +486,21 @@ Google2DImageryProvider.prototype.requestImage = function (
   level,
   request,
 ) {
-  return this._imageryProvider.requestImage(x, y, level, request);
+  const promise = this._imageryProvider.requestImage(x, y, level, request);
+
+  // If the requestImage call returns undefined, it couldn't be scheduled this frame. Make sure to return undefined so this can be handled upstream.
+  if (!defined(promise)) {
+    return undefined;
+  }
+
+  // Asynchronously request and populate _attributionsByLevel if it hasn't been already. We do this here so that the promise can be properly awaited.
+  if (!defined(this._attributionsByLevel)) {
+    return Promise.all([promise, this.getViewportCredits()]).then(
+      (results) => results[0],
+    );
+  }
+
+  return promise;
 };
 
 /**
@@ -521,12 +535,7 @@ Google2DImageryProvider.prototype.getViewportCredits = async function () {
   const promises = [];
   for (let level = 0; level < maximumLevel + 1; level++) {
     promises.push(
-      fetchViewportAttribution(
-        this._viewportUrl,
-        this._key,
-        this._session,
-        level,
-      ),
+      fetchViewportAttribution(this._resource, this._viewportUrl, level),
     );
   }
   const results = await Promise.all(promises);
@@ -547,12 +556,10 @@ Google2DImageryProvider.prototype.getViewportCredits = async function () {
   return attributionsByLevel;
 };
 
-async function fetchViewportAttribution(url, key, session, level) {
-  const viewport = await Resource.fetch({
-    url: url,
+async function fetchViewportAttribution(resource, url, level) {
+  const viewportResource = resource.getDerivedResource({
+    url,
     queryParameters: {
-      key,
-      session,
       zoom: level,
       north: 90,
       south: -90,
@@ -561,7 +568,7 @@ async function fetchViewportAttribution(url, key, session, level) {
     },
     data: JSON.stringify(Frozen.EMPTY_OBJECT),
   });
-  const viewportJson = JSON.parse(viewport);
+  const viewportJson = await viewportResource.fetchJson();
   return viewportJson.copyright;
 }
 

package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js

@@ -436,7 +436,7 @@ Object.defineProperties(GoogleEarthEnterpriseMapsProvider.prototype, {
 /**
  * Creates a tiled imagery provider using the Google Earth Imagery API.
  *
- * @param {Resource|String} url The url of the Google Earth server hosting the imagery.
+ * @param {Resource|string} url The url of the Google Earth server hosting the imagery.
  * @param {GoogleEarthEnterpriseMapsProvider.ConstructorOptions} [options] Object describing initialization options
  * @returns {Promise<GoogleEarthEnterpriseMapsProvider>} The created GoogleEarthEnterpriseMapsProvider.
  *

package/Source/Scene/I3SDataProvider.js

@@ -63,7 +63,7 @@ import Lerc from "lerc";
 import Rectangle from "../Core/Rectangle.js";
 
 /**
- * @typedef {Object} I3SDataProvider.ConstructorOptions
+ * @typedef {object} I3SDataProvider.ConstructorOptions
  *
  * Initialization options for the I3SDataProvider constructor
  *

package/Source/Scene/I3SDecoder.js

@@ -41,11 +41,11 @@ async function initializeDecoder() {
 
 /**
  * Transcodes I3S to glTF in a web worker
- * @param {String} url custom attributes source URL
- * @param {Object} defaultGeometrySchema Schema to use during decoding
+ * @param {string} url custom attributes source URL
+ * @param {object} defaultGeometrySchema Schema to use during decoding
  * @param {I3SGeometry} geometryData The draco encoded geometry data
  * @param {Array} [featureData] The draco encoded feature data
- * @param {Object} [symbologyData] The rendering symbology to apply
+ * @param {object} [symbologyData] The rendering symbology to apply
  * @returns Promise<undefined|object> Returns a promise which resolves to the glTF result, or undefined if the task cannot be scheduled this frame.
  *
  * @exception {RuntimeError} I3S decoder could not be initialized.

package/Source/Scene/ITwinData.js

@@ -35,7 +35,7 @@ const ITwinData = {};
  *
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
  *
- * @param {Object} options
+ * @param {object} options
  * @param {string} options.iModelId The id of the iModel to load
  * @param {Cesium3DTileset.ConstructorOptions} [options.tilesetOptions] Object containing options to pass to the internally created {@link Cesium3DTileset}.
  * @param {string} [options.changesetId] The id of the changeset to load, if not provided the latest changesets will be used
@@ -95,7 +95,7 @@ ITwinData.createTilesetFromIModelId = async function ({
  *
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
  *
- * @param {Object} options
+ * @param {object} options
  * @param {string} options.iTwinId The id of the iTwin to load data from
  * @param {string} options.realityDataId The id of the reality data to load
  * @param {ITwinPlatform.RealityDataType} [options.type] The type of this reality data
@@ -169,7 +169,7 @@ ITwinData.createTilesetForRealityDataId = async function ({
  * If the <code>type</code> or <code>rootDocument</code> are not provided this function
  * will first request the full metadata for the specified reality data to fill these values.
  *
- * @param {Object} options
+ * @param {object} options
  * @param {string} options.iTwinId The id of the iTwin to load data from
  * @param {string} options.realityDataId The id of the reality data to load
  * @param {ITwinPlatform.RealityDataType} [options.type] The type of this reality data
@@ -232,7 +232,7 @@ ITwinData.createDataSourceForRealityDataId = async function ({
 /**
  * Load data from the Geospatial Features API as GeoJSON.
  *
- * @param {Object} options
+ * @param {object} options
  * @param {string} options.iTwinId The id of the iTwin to load data from
  * @param {string} options.collectionId The id of the data collection to load
  * @param {number} [options.limit=10000] number of items per page, must be between 1 and 10,000 inclusive

package/Source/Scene/ImageryLayer.js

@@ -40,7 +40,7 @@ import SplitDirection from "./SplitDirection.js";
 import TileImagery from "./TileImagery.js";
 
 /**
- * @typedef {Object} ImageryLayer.ConstructorOptions
+ * @typedef {object} ImageryLayer.ConstructorOptions
  *
  * Initialization options for the ImageryLayer constructor.
  *

package/Source/Scene/Implicit3DTileContent.js

@@ -459,14 +459,13 @@ function deriveChildTile(
   // as the bounding volumes are needed below.
   let tileMetadata;
   let tileBounds;
-  let contentBounds;
   if (defined(subtree.tilePropertyTableJson)) {
     tileMetadata = subtree.getTileMetadataView(implicitCoordinates);
 
-    const boundingVolumeSemantics =
-      BoundingVolumeSemantics.parseAllBoundingVolumeSemantics(tileMetadata);
-    tileBounds = boundingVolumeSemantics.tile;
-    contentBounds = boundingVolumeSemantics.content;
+    tileBounds = BoundingVolumeSemantics.parseAllBoundingVolumeSemantics(
+      "TILE",
+      tileMetadata,
+    );
   }
 
   // Content is not loaded at this point, so this flag is set for future reference.
@@ -502,6 +501,20 @@ function deriveChildTile(
       uri: childContentUri,
     };
 
+    let contentBounds;
+
+    if (subtree.contentPropertyTableJsons.length > 0) {
+      const contentMetadata = subtree.getContentMetadataView(
+        implicitCoordinates,
+        i,
+      );
+
+      contentBounds = BoundingVolumeSemantics.parseAllBoundingVolumeSemantics(
+        "CONTENT",
+        contentMetadata,
+      );
+    }
+
     const contentBoundingVolume = getContentBoundingVolume(
       boundingVolume,
       contentBounds,
@@ -892,7 +905,6 @@ function deriveBoundingVolumeS2(
   }
 
   // Extract the first 3 face bits from the 64-bit S2 cell ID.
-  // eslint-disable-next-line no-undef
   const face = Number(parentTile._boundingVolume.s2Cell._cellId >> BigInt(61));
   // The Hilbert curve is rotated for the "odd" faces on the S2 Earthcube.
   // See http://s2geometry.io/devguide/img/s2cell_global.jpg
@@ -900,7 +912,6 @@ function deriveBoundingVolumeS2(
     face % 2 === 0
       ? HilbertOrder.encode2D(level, x, y)
       : HilbertOrder.encode2D(level, y, x);
-  // eslint-disable-next-line no-undef
   const cell = S2Cell.fromFacePositionLevel(face, BigInt(position), level);
 
   let minHeight, maxHeight;