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

package/dist/lib/encoders/helpers/encode-3d-tile-header.js

@@ -1,31 +1,30 @@
-import { assert } from '@loaders.gl/loader-utils';
-export function encode3DTileHeader(tile, dataView, byteOffset) {
-  const HEADER_SIZE = 12;
-
-  if (!dataView) {
-    return byteOffset + HEADER_SIZE;
-  }
-
-  const {
-    magic,
-    version = 1,
-    byteLength = 12
-  } = tile;
-  assert(Array.isArray(magic) && Number.isFinite(version) && Number.isFinite(byteLength));
-  dataView.setUint8(byteOffset + 0, magic[0]);
-  dataView.setUint8(byteOffset + 1, magic[1]);
-  dataView.setUint8(byteOffset + 2, magic[2]);
-  dataView.setUint8(byteOffset + 3, magic[3]);
-  dataView.setUint32(byteOffset + 4, version, true);
-  dataView.setUint32(byteOffset + 8, byteLength, true);
-  byteOffset += HEADER_SIZE;
-  return byteOffset;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encode3DTileByteLength = exports.encode3DTileHeader = void 0;
+// HELPER ENCODERS
+const loader_utils_1 = require("@loaders.gl/loader-utils");
+function encode3DTileHeader(tile, dataView, byteOffset) {
+    const HEADER_SIZE = 12;
+    if (!dataView) {
+        return byteOffset + HEADER_SIZE;
+    }
+    const { magic, version = 1, byteLength = 12 } = tile;
+    (0, loader_utils_1.assert)(Array.isArray(magic) && Number.isFinite(version) && Number.isFinite(byteLength));
+    dataView.setUint8(byteOffset + 0, magic[0]);
+    dataView.setUint8(byteOffset + 1, magic[1]);
+    dataView.setUint8(byteOffset + 2, magic[2]);
+    dataView.setUint8(byteOffset + 3, magic[3]);
+    dataView.setUint32(byteOffset + 4, version, true); // version
+    dataView.setUint32(byteOffset + 8, byteLength, true); // byteLength
+    byteOffset += HEADER_SIZE;
+    return byteOffset;
 }
-export function encode3DTileByteLength(dataView, byteOffsetTileStart, byteLength) {
-  if (!dataView) {
-    return;
-  }
-
-  dataView.setUint32(byteOffsetTileStart + 8, byteLength, true);
+exports.encode3DTileHeader = encode3DTileHeader;
+// Bytelength is sometimes only known at the end of writing a tile
+function encode3DTileByteLength(dataView, byteOffsetTileStart, byteLength) {
+    if (!dataView) {
+        return;
+    }
+    dataView.setUint32(byteOffsetTileStart + 8, byteLength, true); // byteLength
 }
-//# sourceMappingURL=encode-3d-tile-header.js.map
+exports.encode3DTileByteLength = encode3DTileByteLength;

package/dist/lib/ion/ion.js

@@ -1,77 +1,68 @@
-import { fetchFile } from '@loaders.gl/core';
-import { assert } from '@loaders.gl/loader-utils';
+"use strict";
+// Minimal support to load tilsets from the Cesium ION services
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIonAssetMetadata = exports.getIonAssets = exports.getIonTilesetMetadata = void 0;
+const core_1 = require("@loaders.gl/core");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 const CESIUM_ION_URL = 'https://api.cesium.com/v1/assets';
-export async function getIonTilesetMetadata(accessToken, assetId) {
-  if (!assetId) {
-    const assets = await getIonAssets(accessToken);
-
-    for (const item of assets.items) {
-      if (item.type === '3DTILES') {
-        assetId = item.id;
-      }
+// Returns `{url, headers, type, attributions}` for an ion tileset
+async function getIonTilesetMetadata(accessToken, assetId) {
+    // Step 1, if no asset id, look for first 3DTILES asset associated with this token.
+    if (!assetId) {
+        const assets = await getIonAssets(accessToken);
+        for (const item of assets.items) {
+            if (item.type === '3DTILES') {
+                assetId = item.id;
+            }
+        }
     }
-  }
-
-  const ionAssetMetadata = await getIonAssetMetadata(accessToken, assetId);
-  const {
-    type,
-    url
-  } = ionAssetMetadata;
-  assert(type === '3DTILES' && url);
-  ionAssetMetadata.headers = {
-    Authorization: "Bearer ".concat(ionAssetMetadata.accessToken)
-  };
-  return ionAssetMetadata;
+    // Step 2: Query metdatadata for this asset.
+    const ionAssetMetadata = await getIonAssetMetadata(accessToken, assetId);
+    const { type, url } = ionAssetMetadata;
+    (0, loader_utils_1.assert)(type === '3DTILES' && url);
+    // Prepare a headers object for fetch
+    ionAssetMetadata.headers = {
+        Authorization: `Bearer ${ionAssetMetadata.accessToken}`
+    };
+    return ionAssetMetadata;
 }
-export async function getIonAssets(accessToken) {
-  assert(accessToken);
-  const url = CESIUM_ION_URL;
-  const headers = {
-    Authorization: "Bearer ".concat(accessToken)
-  };
-  const response = await fetchFile(url, {
-    fetch: {
-      headers
+exports.getIonTilesetMetadata = getIonTilesetMetadata;
+// Return a list of all assets associated with accessToken
+async function getIonAssets(accessToken) {
+    (0, loader_utils_1.assert)(accessToken);
+    const url = CESIUM_ION_URL;
+    const headers = { Authorization: `Bearer ${accessToken}` };
+    const response = await (0, core_1.fetchFile)(url, { fetch: { headers } });
+    if (!response.ok) {
+        throw new Error(response.statusText);
     }
-  });
-
-  if (!response.ok) {
-    throw new Error(response.statusText);
-  }
-
-  return await response.json();
+    return await response.json();
 }
-export async function getIonAssetMetadata(accessToken, assetId) {
-  assert(accessToken, assetId);
-  const headers = {
-    Authorization: "Bearer ".concat(accessToken)
-  };
-  const url = "".concat(CESIUM_ION_URL, "/").concat(assetId);
-  let response = await fetchFile("".concat(url), {
-    fetch: {
-      headers
+exports.getIonAssets = getIonAssets;
+// Return metadata for a specific asset associated with token
+async function getIonAssetMetadata(accessToken, assetId) {
+    (0, loader_utils_1.assert)(accessToken, assetId);
+    const headers = { Authorization: `Bearer ${accessToken}` };
+    const url = `${CESIUM_ION_URL}/${assetId}`;
+    // https://cesium.com/docs/rest-api/#operation/getAsset
+    // Retrieves metadata information about a specific asset.
+    let response = await (0, core_1.fetchFile)(`${url}`, { fetch: { headers } });
+    if (!response.ok) {
+        throw new Error(response.statusText);
     }
-  });
-
-  if (!response.ok) {
-    throw new Error(response.statusText);
-  }
-
-  let metadata = await response.json();
-  response = await fetchFile("".concat(url, "/endpoint"), {
-    fetch: {
-      headers
+    let metadata = await response.json();
+    // https://cesium.com/docs/rest-api/#operation/getAssetEndpoint
+    // Retrieves information and credentials that allow you to access the tiled asset data for visualization and analysis.
+    response = await (0, core_1.fetchFile)(`${url}/endpoint`, { fetch: { headers } });
+    if (!response.ok) {
+        throw new Error(response.statusText);
     }
-  });
-
-  if (!response.ok) {
-    throw new Error(response.statusText);
-  }
-
-  const tilesetInfo = await response.json();
-  metadata = { ...metadata,
-    ...tilesetInfo
-  };
-  return metadata;
+    const tilesetInfo = await response.json();
+    // extract dataset description
+    metadata = {
+        ...metadata,
+        ...tilesetInfo
+    };
+    return metadata;
 }
-//# sourceMappingURL=ion.js.map
+exports.getIonAssetMetadata = getIonAssetMetadata;

package/dist/lib/parsers/helpers/normalize-3d-tile-colors.js

@@ -1,67 +1,65 @@
-import { decodeRGB565, GL } from '@loaders.gl/math';
-export function normalize3DTileColorAttribute(tile, colors, batchTable) {
-  if (!colors && (!tile || !tile.batchIds || !batchTable)) {
-    return null;
-  }
-
-  const {
-    batchIds,
-    isRGB565,
-    pointCount
-  } = tile;
-
-  if (batchIds && batchTable) {
-    const colorArray = new Uint8ClampedArray(pointCount * 3);
-
-    for (let i = 0; i < pointCount; i++) {
-      const batchId = batchIds[i];
-      const dimensions = batchTable.getProperty(batchId, 'dimensions');
-      const color = dimensions.map(d => d * 255);
-      colorArray[i * 3] = color[0];
-      colorArray[i * 3 + 1] = color[1];
-      colorArray[i * 3 + 2] = color[2];
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalize3DTileColorAttribute = void 0;
+const math_1 = require("@loaders.gl/math");
+/* eslint-disable complexity*/
+function normalize3DTileColorAttribute(tile, colors, batchTable) {
+    // no colors defined
+    if (!colors && (!tile || !tile.batchIds || !batchTable)) {
+        return null;
     }
-
-    return {
-      type: GL.UNSIGNED_BYTE,
-      value: colorArray,
-      size: 3,
-      normalized: true
-    };
-  }
-
-  if (isRGB565) {
-    const colorArray = new Uint8ClampedArray(pointCount * 3);
-
-    for (let i = 0; i < pointCount; i++) {
-      const color = decodeRGB565(colors[i]);
-      colorArray[i * 3] = color[0];
-      colorArray[i * 3 + 1] = color[1];
-      colorArray[i * 3 + 2] = color[2];
+    const { batchIds, isRGB565, pointCount } = tile;
+    // Batch table, look up colors in table
+    if (batchIds && batchTable) {
+        const colorArray = new Uint8ClampedArray(pointCount * 3);
+        for (let i = 0; i < pointCount; i++) {
+            const batchId = batchIds[i];
+            // TODO figure out what is `dimensions` used for
+            const dimensions = batchTable.getProperty(batchId, 'dimensions');
+            const color = dimensions.map((d) => d * 255);
+            colorArray[i * 3] = color[0];
+            colorArray[i * 3 + 1] = color[1];
+            colorArray[i * 3 + 2] = color[2];
+        }
+        return {
+            type: math_1.GL.UNSIGNED_BYTE,
+            value: colorArray,
+            size: 3,
+            normalized: true
+        };
     }
-
-    return {
-      type: GL.UNSIGNED_BYTE,
-      value: colorArray,
-      size: 3,
-      normalized: true
-    };
-  }
-
-  if (colors && colors.length === pointCount * 3) {
+    // RGB565 case, convert to RGB
+    if (isRGB565) {
+        const colorArray = new Uint8ClampedArray(pointCount * 3);
+        for (let i = 0; i < pointCount; i++) {
+            const color = (0, math_1.decodeRGB565)(colors[i]);
+            colorArray[i * 3] = color[0];
+            colorArray[i * 3 + 1] = color[1];
+            colorArray[i * 3 + 2] = color[2];
+        }
+        return {
+            type: math_1.GL.UNSIGNED_BYTE,
+            value: colorArray,
+            size: 3,
+            normalized: true
+        };
+    }
+    // RGB case (tile.isTranslucent)
+    if (colors && colors.length === pointCount * 3) {
+        return {
+            type: math_1.GL.UNSIGNED_BYTE,
+            value: colors,
+            size: 3,
+            normalized: true
+        };
+    }
+    // DEFAULT: RGBA case
     return {
-      type: GL.UNSIGNED_BYTE,
-      value: colors,
-      size: 3,
-      normalized: true
+        type: math_1.GL.UNSIGNED_BYTE,
+        value: colors,
+        size: 4,
+        normalized: true
     };
-  }
-
-  return {
-    type: GL.UNSIGNED_BYTE,
-    value: colors,
-    size: 4,
-    normalized: true
-  };
 }
-//# sourceMappingURL=normalize-3d-tile-colors.js.map
+exports.normalize3DTileColorAttribute = normalize3DTileColorAttribute;
+/* eslint-enable complexity*/

package/dist/lib/parsers/helpers/normalize-3d-tile-normals.js

@@ -1,30 +1,30 @@
-import { Vector3 } from '@math.gl/core';
-import { GL, octDecode } from '@loaders.gl/math';
-const scratchNormal = new Vector3();
-export function normalize3DTileNormalAttribute(tile, normals) {
-  if (!normals) {
-    return null;
-  }
-
-  if (tile.isOctEncoded16P) {
-    const decodedArray = new Float32Array(tile.pointsLength * 3);
-
-    for (let i = 0; i < tile.pointsLength; i++) {
-      octDecode(normals[i * 2], normals[i * 2 + 1], scratchNormal);
-      scratchNormal.toArray(decodedArray, i * 3);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalize3DTileNormalAttribute = void 0;
+const core_1 = require("@math.gl/core");
+const math_1 = require("@loaders.gl/math");
+const scratchNormal = new core_1.Vector3();
+function normalize3DTileNormalAttribute(tile, normals) {
+    if (!normals) {
+        return null;
+    }
+    if (tile.isOctEncoded16P) {
+        const decodedArray = new Float32Array(tile.pointsLength * 3);
+        for (let i = 0; i < tile.pointsLength; i++) {
+            (0, math_1.octDecode)(normals[i * 2], normals[i * 2 + 1], scratchNormal);
+            // @ts-ignore
+            scratchNormal.toArray(decodedArray, i * 3);
+        }
+        return {
+            type: math_1.GL.FLOAT,
+            size: 2,
+            value: decodedArray
+        };
     }
-
     return {
-      type: GL.FLOAT,
-      size: 2,
-      value: decodedArray
+        type: math_1.GL.FLOAT,
+        size: 2,
+        value: normals
     };
-  }
-
-  return {
-    type: GL.FLOAT,
-    size: 2,
-    value: normals
-  };
 }
-//# sourceMappingURL=normalize-3d-tile-normals.js.map
+exports.normalize3DTileNormalAttribute = normalize3DTileNormalAttribute;

package/dist/lib/parsers/helpers/normalize-3d-tile-positions.js

@@ -1,31 +1,42 @@
-import { Vector3 } from '@math.gl/core';
-import { GL } from '@loaders.gl/math';
-export function normalize3DTilePositionAttribute(tile, positions, options) {
-  if (!tile.isQuantized) {
-    return positions;
-  }
-
-  if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {
-    tile.isQuantized = false;
-    return decodeQuantizedPositions(tile, positions);
-  }
-
-  return {
-    type: GL.UNSIGNED_SHORT,
-    value: positions,
-    size: 3,
-    normalized: true
-  };
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalize3DTilePositionAttribute = void 0;
+const core_1 = require("@math.gl/core");
+const math_1 = require("@loaders.gl/math");
+// Prepare attribute for positions
+function normalize3DTilePositionAttribute(tile, positions, options) {
+    if (!tile.isQuantized) {
+        return positions;
+    }
+    // For quantized posititions, either expand to Float32Array or return custom accessor
+    // https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positions
+    // Optionally decodes quantized positions on GPU, for simpler renderers that don't accept normalized attributes
+    if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {
+        tile.isQuantized = false;
+        return decodeQuantizedPositions(tile, positions);
+    }
+    // Default: Use normalized shorts directly, no copying/processing.
+    // NOTE: The "missing" offset/scaling operations are automatically added to modelMatrix if `tile.isQuantized === true`
+    return {
+        type: math_1.GL.UNSIGNED_SHORT,
+        value: positions,
+        size: 3,
+        normalized: true
+    };
 }
-
+exports.normalize3DTilePositionAttribute = normalize3DTilePositionAttribute;
+// Pre-scale quantized positions on CPU
 function decodeQuantizedPositions(tile, positions) {
-  const scratchPosition = new Vector3();
-  const decodedArray = new Float32Array(tile.pointCount * 3);
-
-  for (let i = 0; i < tile.pointCount; i++) {
-    scratchPosition.set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2]).scale(1 / tile.quantizedRange).multiply(tile.quantizedVolumeScale).add(tile.quantizedVolumeOffset).toArray(decodedArray, i * 3);
-  }
-
-  return decodedArray;
+    const scratchPosition = new core_1.Vector3();
+    const decodedArray = new Float32Array(tile.pointCount * 3);
+    for (let i = 0; i < tile.pointCount; i++) {
+        // POSITION = POSITION_QUANTIZED / 65535.0 * QUANTIZED_VOLUME_SCALE + QUANTIZED_VOLUME_OFFSET
+        scratchPosition
+            .set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2])
+            .scale(1 / tile.quantizedRange)
+            .multiply(tile.quantizedVolumeScale)
+            .add(tile.quantizedVolumeOffset)
+            .toArray(decodedArray, i * 3);
+    }
+    return decodedArray;
 }
-//# sourceMappingURL=normalize-3d-tile-positions.js.map

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

@@ -1,4 +1,14 @@
 import type { Subtree } from '../../../types';
+import type { S2VolumeInfo } from '../../utils/obb/s2-corners-to-obb';
+/**
+ *  S2VolumeBox is an extention of BoundingVolume of type "box"
+ */
+export type S2VolumeBox = {
+    /** BoundingVolume of type "box" has the "box" field. S2VolumeBox contains it as well. */
+    box: number[];
+    /** s2VolumeInfo provides additional info about the box - specifically the token, min and max height */
+    s2VolumeInfo: S2VolumeInfo;
+};
 /**
  * Recursively parse implicit tiles tree
  * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling
@@ -29,6 +39,7 @@ export declare function parseImplicitTiles(params: {
         y: number;
         z: number;
     };
+    s2VolumeBox?: S2VolumeBox;
 }): Promise<{
     children: never[];
     lodMetricValue: number;

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

@@ -1 +1 @@
-{"version":3,"file":"parse-3d-implicit-tiles.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAY1E;;;;;;;;;;;GAWG;AAEH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACpF;;;;GA+HA;AA8GD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,GACR,MAAM,CAGR"}
+{"version":3,"file":"parse-3d-implicit-tiles.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAK1E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAYpE;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,yFAAyF;IACzF,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,uGAAuG;IACvG,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AA6CF;;;;;;;;;;;GAWG;AAEH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACnF,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;;;;GAqIA;AA0HD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,GACR,MAAM,CAGR"}