@loaders.gl/3d-tiles 4.1.0-alpha.2 → 4.1.0-alpha.4

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {Availability, Tile3DBoundingVolume, Subtree} from '../../../types';
 import {Tile3DSubtreeLoader} from '../../../tile-3d-subtree-loader';
 import {load} from '@loaders.gl/core';
@@ -10,12 +14,12 @@ import Long from 'long';
 import {Tiles3DLoaderOptions} from '../../../tiles-3d-loader';
 import {ImplicitOptions} from '../parse-3d-tile-header';
 
-const QUADTREE_DEVISION_COUNT = 4;
-const OCTREE_DEVISION_COUNT = 8;
+const QUADTREE_DIVISION_COUNT = 4;
+const OCTREE_DIVISION_COUNT = 8;
 
 const SUBDIVISION_COUNT_MAP = {
-  QUADTREE: QUADTREE_DEVISION_COUNT,
-  OCTREE: OCTREE_DEVISION_COUNT
+  QUADTREE: QUADTREE_DIVISION_COUNT,
+  OCTREE: OCTREE_DIVISION_COUNT
 };
 
 /**
@@ -103,17 +107,20 @@ export async function parseImplicitTiles(params: {
       z: 0
     },
     childIndex = 0,
+    s2VolumeBox,
+    loaderOptions
+  } = params;
+  let {
+    subtree,
+    level = 0,
     globalData = {
       level: 0,
       mortonIndex: 0,
       x: 0,
       y: 0,
       z: 0
-    },
-    s2VolumeBox,
-    loaderOptions
+    }
   } = params;
-  let {subtree, level = 0} = params;
   const {
     subdivisionScheme,
     subtreeLevels,
@@ -163,9 +170,9 @@ export async function parseImplicitTiles(params: {
     );
   }
 
-  const x = concatBits(globalData.x, childTileX, level * bitsPerTile);
-  const y = concatBits(globalData.y, childTileY, level * bitsPerTile);
-  const z = concatBits(globalData.z, childTileZ, level * bitsPerTile);
+  const x = concatBits(globalData.x, childTileX, level);
+  const y = concatBits(globalData.y, childTileY, level);
+  const z = concatBits(globalData.z, childTileZ, level);
 
   if (isChildSubtreeAvailable) {
     const subtreePath = `${basePath}/${subtreesUriTemplate}`;
@@ -174,11 +181,13 @@ export async function parseImplicitTiles(params: {
 
     subtree = childSubtree;
 
-    globalData.mortonIndex = childTileMortonIndex;
-    globalData.x = childTileX;
-    globalData.y = childTileY;
-    globalData.z = childTileZ;
-    globalData.level = level;
+    globalData = {
+      mortonIndex: childTileMortonIndex,
+      x: childTileX,
+      y: childTileY,
+      z: childTileZ,
+      level
+    };
 
     childTileMortonIndex = 0;
     tileAvailabilityIndex = 0;

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {Subtree, Availability} from '../../../types';
 import type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';
 
@@ -72,7 +76,7 @@ export default async function parse3DTilesSubtree(
  * @param internalBinaryBuffer - subtree binary buffer
  * @param context - loaders.gl context
  */
-async function loadExplicitBitstream(
+export async function loadExplicitBitstream(
   subtree: Subtree,
   availabilityObject: Availability,
   internalBinaryBuffer: ArrayBuffer,
@@ -109,8 +113,13 @@ async function loadExplicitBitstream(
     );
     return;
   }
+
+  const bufferStart = subtree.buffers
+    .slice(0, bufferView.buffer)
+    .reduce((offset, buf) => offset + buf.byteLength, 0);
+
   availabilityObject.explicitBitstream = new Uint8Array(
-    internalBinaryBuffer,
+    internalBinaryBuffer.slice(bufferStart, bufferStart + buffer.byteLength),
     bufferView.byteOffset,
     bufferView.byteLength
   );

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

package/src/lib/parsers/helpers/parse-utils.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT license
 // Copyright (c) vis.gl contributors
 
 import {parseFromContext, LoaderContext} from '@loaders.gl/loader-utils';

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {Tiles3DLoaderOptions} from '../../tiles-3d-loader';
 import type {LoaderOptions} from '@loaders.gl/loader-utils';
 import {path} from '@loaders.gl/loader-utils';
@@ -79,7 +83,7 @@ function getRefine(refine?: string): TILE_REFINEMENT | string | undefined {
   }
 }
 
-function resolveUri(uri: string = '', basePath: string): string {
+function resolveUri(uri: string, basePath: string): string {
   // url scheme per RFC3986
   const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;
 
@@ -103,7 +107,10 @@ export function normalizeTileData(
   let tileContentUrl: string | undefined;
   if (tile.content) {
     const contentUri = tile.content.uri || tile.content?.url;
-    tileContentUrl = resolveUri(contentUri, basePath);
+    if (typeof contentUri !== 'undefined') {
+      // sparse implicit tilesets may not define content for all nodes
+      tileContentUrl = resolveUri(contentUri, basePath);
+    }
   }
   const tilePostprocessed: Tiles3DTileJSONPostprocessed = {
     ...tile,
@@ -195,7 +202,8 @@ export async function normalizeImplicitTileHeaders(
   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 tileContentUri = tile.content?.uri;
+  const contentUrlTemplate = tileContentUri ? resolveUri(tileContentUri, basePath) : '';
   const refine = tileset?.root?.refine;
   // @ts-ignore
   const rootLodMetricValue = tile.geometricError;

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT AND Apache-2.0
+// Copyright vis.gl contributors
+
 // This file is derived from the Cesium code base under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 

package/src/lib/utils/obb/s2-corners-to-obb.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import {Vector3} from '@math.gl/core';
 import {OrientedBoundingBox, makeOrientedBoundingBoxFromPoints} from '@math.gl/culling';
 

package/src/lib/utils/s2/converters/s2-to-boundary.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {S2Cell} from '../s2geometry/s2-geometry';
 import {IJToST, STToUV, FaceUVToXYZ, XYZToLngLat} from '../s2geometry/s2-geometry';
 

package/src/lib/utils/s2/converters/s2-to-obb-points.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import {getS2Cell} from '../s2geometry/s2-cell-utils';
 import {getS2Region} from './s2-to-region';
 import {Vector3} from '@math.gl/core';

package/src/lib/utils/s2/converters/s2-to-region.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {S2Cell} from '../s2geometry/s2-geometry';
 import {getS2BoundaryFlatFromS2Cell} from './s2-to-boundary';
 import {getS2Cell} from '../s2geometry/s2-cell-utils';

package/src/lib/utils/s2/index.ts

@@ -1,4 +1,6 @@
-// math.gl MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 export {getS2CellIdFromToken, getS2TokenFromCellId, getS2ChildCellId} from './s2-token-functions';
 export {getS2BoundaryFlat, getS2LngLat} from './s2-geometry-functions';

package/src/lib/utils/s2/s2-geometry-functions.ts

@@ -1,4 +1,6 @@
-// math.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import {getS2BoundaryFlatFromS2Cell} from './converters/s2-to-boundary';
 import {getS2LngLatFromS2Cell} from './s2geometry/s2-geometry';

package/src/lib/utils/s2/s2-token-functions.ts

@@ -1,5 +1,6 @@
-// loaders.gl, MIT license
-// Copyright (c) vis.gl contributors
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import Long from 'long';
 

package/src/lib/utils/s2/s2geometry/s2-cell-utils.ts

@@ -1,4 +1,6 @@
-// math.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import type {S2Cell} from './s2-geometry';
 import {getS2CellFromQuadKey, getS2QuadkeyFromCellId} from './s2-geometry';

package/src/lib/utils/s2/s2geometry/s2-geometry.ts

@@ -1,4 +1,7 @@
-// math.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT AND ISC
+// Copyright vis.gl contributors
+
 /*
 Adapted from s2-geometry under ISC License (ISC)
 Copyright (c) 2012-2016, Jon Atkins <github@jonatkins.com>

package/src/tile-3d-subtree-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {Subtree} from './types';
 import parse3DTilesSubtree from './lib/parsers/helpers/parse-3d-tile-subtree';

package/src/tile-3d-writer.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
 import {VERSION} from './lib/utils/version';
 import encode3DTile from './lib/encoders/encode-3d-tile';

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderWithParser, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';
 // / import type { GLTFLoaderOptions } from '@loaders.gl/gltf';
 import type {DracoLoaderOptions} from '@loaders.gl/draco';

package/src/types.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {GLTFPostprocessed, FeatureTableJson} from '@loaders.gl/gltf';
 export type {FeatureTableJson};
 
@@ -321,10 +325,10 @@ export type Subtree = {
    */
   childSubtreeAvailability: Availability;
   // TODO: These are unused properties. Improve types when they are required
-  propertyTables: unknown;
-  tileMetadata: unknown;
-  contentMetadata: unknown;
-  subtreeMetadata: unknown;
+  propertyTables?: unknown;
+  tileMetadata?: unknown;
+  contentMetadata?: unknown;
+  subtreeMetadata?: unknown;
 };
 
 export type Availability = {