@loaders.gl/3d-tiles 3.3.0-alpha.3 → 3.3.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "3.3.0-alpha.3",
+  "version": "3.3.0-alpha.5",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
   "license": "MIT",
   "publishConfig": {
@@ -34,16 +34,16 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/draco": "3.3.0-alpha.3",
-    "@loaders.gl/gltf": "3.3.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.3",
-    "@loaders.gl/math": "3.3.0-alpha.3",
-    "@loaders.gl/tiles": "3.3.0-alpha.3",
+    "@loaders.gl/draco": "3.3.0-alpha.5",
+    "@loaders.gl/gltf": "3.3.0-alpha.5",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.5",
+    "@loaders.gl/math": "3.3.0-alpha.5",
+    "@loaders.gl/tiles": "3.3.0-alpha.5",
     "@math.gl/core": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "232fdc52fcbee10d8322fd8a4589680943f10517"
+  "gitHead": "d2df3bead97710c45fd2974cd51ecd7d5f7f5ea4"
 }

package/src/index.ts

@@ -13,4 +13,4 @@ export {default as Tile3DBatchTable} from './lib/classes/tile-3d-batch-table';
 // EXPERIMENTAL
 export {TILE3D_TYPE} from './lib/constants';
 export {getIonTilesetMetadata as _getIonTilesetMetadata} from './lib/ion/ion';
-export type {FeatureTableJson, B3DMContent, Node3D} from './types';
+export type {FeatureTableJson, B3DMContent, Node3D, ImplicitTilingExtension} from './types';

package/src/lib/parsers/helpers/parse-3d-implicit-tiles.ts

@@ -75,15 +75,6 @@ export async function parseImplicitTiles(params: {
   let childTileY = concatBits(parentData.y, childY);
   let childTileZ = concatBits(parentData.z, childZ);
 
-  // TODO Remove after real implicit tileset will be tested.
-  // Degug data
-  // tile.level = level + globalData.level;
-  // tile.x = concatBits(globalData.x, childTileX);
-  // tile.y = concatBits(globalData.y, childTileY);
-  // tile.z = concatBits(globalData.z, childTileZ);
-  // tile.mortonIndex = childTileMortonIndex;
-  // End of debug data
-
   let isChildSubtreeAvailable = false;
 
   if (level + 1 > subtreeLevels) {
@@ -211,12 +202,9 @@ function formatTileData(
     type: getTileType(tile),
     lodMetricType,
     lodMetricValue,
+    geometricError: lodMetricValue,
+    transform: tile.transform,
     boundingVolume
-    // Temp debug values. Remove when real implicit tileset will be tested.
-    // x: tile.x,
-    // y: tile.y,
-    // z: tile.z,
-    // level: tile.level
   };
 }
 

package/src/lib/parsers/helpers/parse-3d-tile-subtree.ts

@@ -1,5 +1,5 @@
 import type {Subtree, ExplicitBitstream} from '../../../types';
-import {fetchFile} from '@loaders.gl/core';
+import type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';
 
 const SUBTREE_FILE_MAGIC = 0x74627573;
 const SUBTREE_FILE_VERSION = 1;
@@ -11,7 +11,11 @@ const SUBTREE_FILE_VERSION = 1;
  * @returns
  */
 // eslint-disable-next-line max-statements
-export default async function parse3DTilesSubtree(data: ArrayBuffer): Promise<Subtree> {
+export default async function parse3DTilesSubtree(
+  data: ArrayBuffer,
+  options: LoaderOptions | undefined,
+  context: LoaderContext | undefined
+): Promise<Subtree> {
   const magic = new Uint32Array(data.slice(0, 4));
 
   if (magic[0] !== SUBTREE_FILE_MAGIC) {
@@ -42,7 +46,8 @@ export default async function parse3DTilesSubtree(data: ArrayBuffer): Promise<Su
     subtree.tileAvailability.explicitBitstream = await getExplicitBitstream(
       subtree,
       'tileAvailability',
-      internalBinaryBuffer
+      internalBinaryBuffer,
+      context
     );
   }
 
@@ -50,7 +55,8 @@ export default async function parse3DTilesSubtree(data: ArrayBuffer): Promise<Su
     subtree.contentAvailability.explicitBitstream = await getExplicitBitstream(
       subtree,
       'contentAvailability',
-      internalBinaryBuffer
+      internalBinaryBuffer,
+      context
     );
   }
 
@@ -58,13 +64,40 @@ export default async function parse3DTilesSubtree(data: ArrayBuffer): Promise<Su
     subtree.childSubtreeAvailability.explicitBitstream = await getExplicitBitstream(
       subtree,
       'childSubtreeAvailability',
-      internalBinaryBuffer
+      internalBinaryBuffer,
+      context
     );
   }
 
   return subtree;
 }
 
+/**
+ * Get url for bitstream downloading
+ * @param bitstreamRelativeUri
+ * @param baseUri
+ * @returns
+ */
+function resolveBufferUri(bitstreamRelativeUri: string, basePath: string): string {
+  const hasProtocol = basePath.startsWith('http');
+
+  if (hasProtocol) {
+    const resolvedUri = new URL(bitstreamRelativeUri, basePath);
+    return decodeURI(resolvedUri.toString());
+  }
+
+  /**
+   * Adding http protocol only for new URL constructor usage.
+   * It allows to resolve relative paths like ../../example with basePath.
+   */
+  const basePathWithProtocol = `http://${basePath}`;
+  const resolvedUri = new URL(bitstreamRelativeUri, basePathWithProtocol);
+  /**
+   * Drop protocol and use just relative path.
+   */
+  return `/${resolvedUri.host}${resolvedUri.pathname}`;
+}
+
 /**
  * Get explicit bitstream for subtree availability data.
  * @param subtree
@@ -74,15 +107,25 @@ export default async function parse3DTilesSubtree(data: ArrayBuffer): Promise<Su
 async function getExplicitBitstream(
   subtree: Subtree,
   name: string,
-  internalBinaryBuffer: ArrayBuffer
+  internalBinaryBuffer: ArrayBuffer,
+  context: LoaderContext | undefined
 ): Promise<ExplicitBitstream> {
   const bufferViewIndex = subtree[name].bufferView;
   const bufferView = subtree.bufferViews[bufferViewIndex];
   const buffer = subtree.buffers[bufferView.buffer];
 
+  if (!context?.url || !context.fetch) {
+    throw new Error('Url is not provided');
+  }
+
+  if (!context.fetch) {
+    throw new Error('fetch is not provided');
+  }
+
   // External bitstream loading
   if (buffer.uri) {
-    const response = await fetchFile(buffer.uri);
+    const bufferUri = resolveBufferUri(buffer.uri, context?.url);
+    const response = await context.fetch(bufferUri);
     const data = await response.arrayBuffer();
     // Return view of bitstream.
     return new Uint8Array(data, bufferView.byteOffset, bufferView.byteLength);

package/src/lib/parsers/parse-3d-tile-header.ts

@@ -1,7 +1,8 @@
+import type {LoaderOptions} from '@loaders.gl/loader-utils';
 import {Tile3DSubtreeLoader} from '../../tile-3d-subtree-loader';
 import {load} from '@loaders.gl/core';
-import {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE} from '@loaders.gl/tiles';
-import {Subtree} from '../../types';
+import {Tileset3D, LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE, Tile3D} from '@loaders.gl/tiles';
+import {ImplicitTilingExtension, Subtree} from '../../types';
 import {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-implicit-tiles';
 
 function getTileType(tile) {
@@ -70,9 +71,24 @@ export function normalizeTileData(tile, options) {
 }
 
 // normalize tile headers
-export function normalizeTileHeaders(tileset) {
+export async function normalizeTileHeaders(
+  tileset: Tileset3D,
+  options: LoaderOptions
+): Promise<Tileset3D> {
   const basePath = tileset.basePath;
-  const root = normalizeTileData(tileset.root, tileset);
+  let root: Tileset3D;
+
+  const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);
+  if (rootImplicitTilingExtension && tileset.root) {
+    root = await normalizeImplicitTileHeaders(
+      tileset.root,
+      tileset,
+      rootImplicitTilingExtension,
+      options
+    );
+  } else {
+    root = normalizeTileData(tileset.root, tileset);
+  }
 
   const stack: any[] = [];
   stack.push(root);
@@ -80,8 +96,19 @@ export function normalizeTileHeaders(tileset) {
   while (stack.length > 0) {
     const tile = stack.pop() || {};
     const children = tile.children || [];
-    for (const childHeader of children) {
-      normalizeTileData(childHeader, {basePath});
+    for (let childHeader of children) {
+      const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);
+      if (childImplicitTilingExtension) {
+        childHeader = await normalizeImplicitTileHeaders(
+          childHeader,
+          tileset,
+          childImplicitTilingExtension,
+          options
+        );
+      } else {
+        normalizeTileData(childHeader, {basePath});
+      }
+
       stack.push(childHeader);
     }
   }
@@ -94,29 +121,29 @@ export function normalizeTileHeaders(tileset) {
  * TODO Check if Tile3D class can be a return type here.
  * @param tileset
  */
-export async function normalizeImplicitTileHeaders(tileset: Tileset3D) {
-  if (!tileset.root) {
-    return null;
-  }
-
+export async function normalizeImplicitTileHeaders(
+  tile: Tile3D,
+  tileset: Tileset3D,
+  implicitTilingExtension: ImplicitTilingExtension,
+  options: LoaderOptions
+) {
   const basePath = tileset.basePath;
-  const implicitTilingExtension = tileset.root.extensions['3DTILES_implicit_tiling'];
   const {
     subdivisionScheme,
     maximumLevel,
     subtreeLevels,
     subtrees: {uri: subtreesUriTemplate}
   } = implicitTilingExtension;
-  const subtreeUrl = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);
-  const rootSubtreeUrl = resolveUri(subtreeUrl, basePath);
-  const rootSubtree = await load(rootSubtreeUrl, Tile3DSubtreeLoader);
-  const contentUrlTemplate = resolveUri(tileset.root.content.uri, basePath);
-  const refine = tileset.root.refine;
+  const replacedUrlTemplate = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);
+  const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);
+  const subtree = await load(subtreeUrl, Tile3DSubtreeLoader, options);
+  const contentUrlTemplate = resolveUri(tile.content.uri, basePath);
+  const refine = tileset?.root?.refine;
   // @ts-ignore
-  const rootLodMetricValue = tileset.root.geometricError;
-  const rootBoundingVolume = tileset.root.boundingVolume;
+  const rootLodMetricValue = tile.geometricError;
+  const rootBoundingVolume = tile.boundingVolume;
 
-  const options = {
+  const implicitOptions = {
     contentUrlTemplate,
     subtreesUriTemplate,
     subdivisionScheme,
@@ -131,7 +158,7 @@ export async function normalizeImplicitTileHeaders(tileset: Tileset3D) {
     getRefine
   };
 
-  return await normalizeImplicitTileData(tileset.root, rootSubtree, options);
+  return await normalizeImplicitTileData(tile, subtree, implicitOptions);
 }
 
 /**
@@ -164,3 +191,14 @@ export async function normalizeImplicitTileData(tile, rootSubtree: Subtree, opti
 
   return tile;
 }
+
+/**
+ * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.
+ * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling
+ * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling
+ * @param tile
+ * @returns
+ */
+function getImplicitTilingExtensionData(tile: Tile3D | null): ImplicitTilingExtension {
+  return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;
+}

package/src/tiles-3d-loader.ts

@@ -3,12 +3,7 @@ import {path} from '@loaders.gl/loader-utils';
 import {TILESET_TYPE, LOD_METRIC_TYPE} from '@loaders.gl/tiles';
 import {VERSION} from './lib/utils/version';
 import {parse3DTile} from './lib/parsers/parse-3d-tile';
-import {
-  normalizeTileHeaders,
-  normalizeImplicitTileHeaders
-} from './lib/parsers/parse-3d-tile-header';
-
-const IMPLICIT_TILING_EXTENSION_NAME = '3DTILES_implicit_tiling';
+import {normalizeTileHeaders} from './lib/parsers/parse-3d-tile-header';
 
 /**
  * Loader for 3D Tiles
@@ -54,9 +49,7 @@ async function parseTileset(data, options, context) {
   tilesetJson.url = context.url;
   // base path that non-absolute paths in tileset are relative to.
   tilesetJson.basePath = getBaseUri(tilesetJson);
-  tilesetJson.root = hasImplicitTilingExtension(tilesetJson)
-    ? await normalizeImplicitTileHeaders(tilesetJson)
-    : normalizeTileHeaders(tilesetJson);
+  tilesetJson.root = await normalizeTileHeaders(tilesetJson, options);
 
   tilesetJson.type = TILESET_TYPE.TILES3D;
 
@@ -84,10 +77,3 @@ async function parse(data, options, context) {
 
   return data;
 }
-
-function hasImplicitTilingExtension(tilesetJson) {
-  return (
-    tilesetJson?.extensionsRequired?.includes(IMPLICIT_TILING_EXTENSION_NAME) &&
-    tilesetJson?.extensionsUsed?.includes(IMPLICIT_TILING_EXTENSION_NAME)
-  );
-}

package/src/types.ts

@@ -88,3 +88,18 @@ type BufferView = {
   byteOffset: number;
   byteLength: number;
 };
+
+/**
+ * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling
+ */
+export type ImplicitTilingExtension = {
+  subdivisionScheme: 'QUADTREE' | 'OCTREE';
+  maximumLevel?: number;
+  availableLevels: number;
+  subtreeLevels: number;
+  subtrees: SubtreeUri;
+};
+
+type SubtreeUri = {
+  uri: string;
+};