@loaders.gl/3d-tiles 4.4.0-alpha.2 → 4.4.0-alpha.9

package/dist/index.cjs

@@ -48,7 +48,7 @@ var import_loader_utils8 = require("@loaders.gl/loader-utils");
 var import_tiles2 = require("@loaders.gl/tiles");
 
 // dist/lib/utils/version.js
-var VERSION = true ? "4.4.0-alpha.1" : "latest";
+var VERSION = true ? "4.4.0-alpha.9" : "latest";
 
 // dist/lib/constants.js
 var TILE3D_TYPE = {
@@ -150,7 +150,17 @@ var Tile3DFeatureTable = class {
     const cachedTypedArrays = this._cachedTypedArrays;
     let typedArray = cachedTypedArrays[propertyName];
     if (!typedArray) {
-      typedArray = import_math.GLType.createTypedArray(componentType, array);
+      if (ArrayBuffer.isView(array)) {
+        const byteOffset = array.byteOffset;
+        const byteLength = array.byteLength;
+        const elementCount = byteLength / import_math.GLType.getByteSize(componentType);
+        typedArray = import_math.GLType.createTypedArray(componentType, array.buffer, byteOffset, elementCount);
+      } else if (array instanceof ArrayBuffer) {
+        typedArray = import_math.GLType.createTypedArray(componentType, array);
+      } else {
+        const ArrayType = import_math.GLType.getArrayType(componentType);
+        typedArray = new ArrayType(array);
+      }
       cachedTypedArrays[propertyName] = typedArray;
     }
     return typedArray;
@@ -1138,7 +1148,7 @@ async function extractGLTF(tile, gltfFormat, options, context) {
     }
     if (tile.gltfUrl) {
       const { fetch } = context;
-      const response = await fetch(tile.gltfUrl, options);
+      const response = await fetch(tile.gltfUrl, options == null ? void 0 : options.core);
       tile.gltfArrayBuffer = await response.arrayBuffer();
       tile.gltfByteOffset = 0;
     }
@@ -2299,7 +2309,7 @@ var CesiumIonLoader = {
 };
 
 // dist/3d-tiles-archive-loader.js
-var import_loader_utils10 = require("@loaders.gl/loader-utils");
+var import_zip3 = require("@loaders.gl/zip");
 
 // dist/3d-tiles-archive/3d-tiles-archive-parser.js
 var import_zip2 = require("@loaders.gl/zip");
@@ -2319,7 +2329,7 @@ var Tiles3DArchive = class extends import_zip.IndexedArchive {
   hashTable;
   /**
    * creates Tiles3DArchive handler
-   * @param fileProvider - FileProvider with the whole file
+   * @param fileProvider - readable file handle with the whole archive
    * @param hashTable - hash info
    */
   constructor(fileProvider, hashTable, fileName) {
@@ -2355,11 +2365,11 @@ var Tiles3DArchive = class extends import_zip.IndexedArchive {
       if (byteOffset === void 0) {
         return null;
       }
-      const localFileHeader = await (0, import_zip.parseZipLocalFileHeader)(byteOffset, this.fileProvider);
+      const localFileHeader = await (0, import_zip.parseZipLocalFileHeader)(byteOffset, this.file);
       if (!localFileHeader) {
         return null;
       }
-      const compressedFile = await this.fileProvider.slice(localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
+      const compressedFile = await (0, import_zip.readRange)(this.file, localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
       const compressionMethod = COMPRESSION_METHODS[localFileHeader.compressionMethod];
       if (!compressionMethod) {
         throw Error("Only Deflation compression is supported");
@@ -2386,14 +2396,14 @@ var parse3DTilesArchive = async (fileProvider, cb) => {
       throw new Error("corrupted 3tz zip archive");
     }
     const fileDataOffset = localFileHeader.fileDataOffset;
-    const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
+    const hashFile = await (0, import_zip2.readRange)(fileProvider, fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
     hashTable = (0, import_zip2.parseHashTable)(hashFile);
   }
   return new Tiles3DArchive(fileProvider, hashTable);
 };
 
 // dist/3d-tiles-archive-loader.js
-var VERSION2 = true ? "4.4.0-alpha.1" : "latest";
+var VERSION2 = true ? "4.4.0-alpha.9" : "latest";
 var Tiles3DArchiveFileLoader = {
   dataType: null,
   batchType: null,
@@ -2408,22 +2418,22 @@ var Tiles3DArchiveFileLoader = {
 };
 async function parse3DTilesArchive2(data, options = {}) {
   var _a;
-  const archive = await parse3DTilesArchive(new import_loader_utils10.DataViewFile(new DataView(data)));
+  const archive = await parse3DTilesArchive(new import_zip3.DataViewReadableFile(new DataView(data)));
   return archive.getFile(((_a = options["3d-tiles-archive"]) == null ? void 0 : _a.path) ?? "");
 }
 
 // dist/lib/encoders/encode-3d-tile.js
-var import_loader_utils15 = require("@loaders.gl/loader-utils");
+var import_loader_utils14 = require("@loaders.gl/loader-utils");
 
 // dist/lib/encoders/helpers/encode-3d-tile-header.js
-var import_loader_utils11 = require("@loaders.gl/loader-utils");
+var import_loader_utils10 = 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, import_loader_utils11.assert)(Array.isArray(magic) && Number.isFinite(version) && Number.isFinite(byteLength));
+  (0, import_loader_utils10.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]);
@@ -2457,7 +2467,7 @@ function encodeComposite3DTile(tile, dataView, byteOffset, options, encode3DTile
 }
 
 // dist/lib/encoders/encode-3d-tile-batched-model.js
-var import_loader_utils12 = require("@loaders.gl/loader-utils");
+var import_loader_utils11 = require("@loaders.gl/loader-utils");
 function encodeBatchedModel3DTile(tile, dataView, byteOffset, options) {
   const { featuresLength = 0, batchTable } = tile;
   const featureTableJson = {
@@ -2465,8 +2475,8 @@ function encodeBatchedModel3DTile(tile, dataView, byteOffset, options) {
   };
   const featureTableJsonString = JSON.stringify(featureTableJson);
   const batchTableJsonString = batchTable ? JSON.stringify(batchTable) : "";
-  const featureTableJsonByteLength = (0, import_loader_utils12.padToNBytes)(featureTableJsonString.length, 8);
-  const batchTableJsonByteLength = batchTableJsonString ? (0, import_loader_utils12.padToNBytes)(batchTableJsonString.length, 8) : 0;
+  const featureTableJsonByteLength = (0, import_loader_utils11.padToNBytes)(featureTableJsonString.length, 8);
+  const batchTableJsonByteLength = batchTableJsonString ? (0, import_loader_utils11.padToNBytes)(batchTableJsonString.length, 8) : 0;
   tile = { magic: MAGIC_ARRAY.BATCHED_MODEL, ...tile };
   const byteOffsetStart = byteOffset;
   byteOffset = encode3DTileHeader(tile, dataView, byteOffset);
@@ -2477,20 +2487,20 @@ function encodeBatchedModel3DTile(tile, dataView, byteOffset, options) {
     dataView.setUint32(24, 0, true);
   }
   byteOffset += 16;
-  byteOffset = (0, import_loader_utils12.copyPaddedStringToDataView)(dataView, byteOffset, featureTableJsonString, 8);
+  byteOffset = (0, import_loader_utils11.copyPaddedStringToDataView)(dataView, byteOffset, featureTableJsonString, 8);
   if (batchTable) {
-    byteOffset = (0, import_loader_utils12.copyPaddedStringToDataView)(dataView, byteOffset, batchTableJsonString, 8);
+    byteOffset = (0, import_loader_utils11.copyPaddedStringToDataView)(dataView, byteOffset, batchTableJsonString, 8);
   }
   const gltfEncoded = tile.gltfEncoded;
   if (gltfEncoded) {
-    byteOffset = (0, import_loader_utils12.copyBinaryToDataView)(dataView, byteOffset, gltfEncoded, gltfEncoded.byteLength);
+    byteOffset = (0, import_loader_utils11.copyBinaryToDataView)(dataView, byteOffset, gltfEncoded, gltfEncoded.byteLength);
   }
   encode3DTileByteLength(dataView, byteOffsetStart, byteOffset - byteOffsetStart);
   return byteOffset;
 }
 
 // dist/lib/encoders/encode-3d-tile-instanced-model.js
-var import_loader_utils13 = require("@loaders.gl/loader-utils");
+var import_loader_utils12 = require("@loaders.gl/loader-utils");
 function encodeInstancedModel3DTile(tile, dataView, byteOffset, options) {
   const { featuresLength = 1, gltfFormat = 1, gltfUri = "" } = tile;
   const gltfUriByteLength = gltfUri.length;
@@ -2511,14 +2521,14 @@ function encodeInstancedModel3DTile(tile, dataView, byteOffset, options) {
     dataView.setUint32(28, gltfFormat, true);
   }
   byteOffset += 20;
-  byteOffset += (0, import_loader_utils13.copyStringToDataView)(dataView, byteOffset, featureTableJsonString, featureTableJsonByteLength);
-  byteOffset += (0, import_loader_utils13.copyStringToDataView)(dataView, byteOffset, gltfUri, gltfUriByteLength);
+  byteOffset += (0, import_loader_utils12.copyStringToDataView)(dataView, byteOffset, featureTableJsonString, featureTableJsonByteLength);
+  byteOffset += (0, import_loader_utils12.copyStringToDataView)(dataView, byteOffset, gltfUri, gltfUriByteLength);
   encode3DTileByteLength(dataView, byteOffsetStart, byteOffset - byteOffsetStart);
   return byteOffset;
 }
 
 // dist/lib/encoders/encode-3d-tile-point-cloud.js
-var import_loader_utils14 = require("@loaders.gl/loader-utils");
+var import_loader_utils13 = require("@loaders.gl/loader-utils");
 var DEFAULT_FEATURE_TABLE_JSON = {
   POINTS_LENGTH: 1,
   POSITIONS: {
@@ -2528,7 +2538,7 @@ var DEFAULT_FEATURE_TABLE_JSON = {
 function encodePointCloud3DTile(tile, dataView, byteOffset, options) {
   const { featureTableJson = DEFAULT_FEATURE_TABLE_JSON } = tile;
   let featureTableJsonString = JSON.stringify(featureTableJson);
-  featureTableJsonString = (0, import_loader_utils14.padStringToByteAlignment)(featureTableJsonString, 4);
+  featureTableJsonString = (0, import_loader_utils13.padStringToByteAlignment)(featureTableJsonString, 4);
   const { featureTableJsonByteLength = featureTableJsonString.length } = tile;
   const featureTableBinary = new ArrayBuffer(12);
   const featureTableBinaryByteLength = featureTableBinary.byteLength;
@@ -2542,8 +2552,8 @@ function encodePointCloud3DTile(tile, dataView, byteOffset, options) {
     dataView.setUint32(byteOffset + 12, 0, true);
   }
   byteOffset += 16;
-  byteOffset += (0, import_loader_utils14.copyStringToDataView)(dataView, byteOffset, featureTableJsonString, featureTableJsonByteLength);
-  byteOffset += (0, import_loader_utils14.copyBinaryToDataView)(dataView, byteOffset, featureTableBinary, featureTableBinaryByteLength);
+  byteOffset += (0, import_loader_utils13.copyStringToDataView)(dataView, byteOffset, featureTableJsonString, featureTableJsonByteLength);
+  byteOffset += (0, import_loader_utils13.copyBinaryToDataView)(dataView, byteOffset, featureTableBinary, featureTableBinaryByteLength);
   encode3DTileByteLength(dataView, byteOffsetStart, byteOffset - byteOffsetStart);
   return byteOffset;
 }
@@ -2557,7 +2567,7 @@ function encode3DTile(tile, options) {
   return arrayBuffer;
 }
 function encode3DTileToDataView(tile, dataView, byteOffset, options) {
-  (0, import_loader_utils15.assert)(typeof tile.type === "string");
+  (0, import_loader_utils14.assert)(typeof tile.type === "string");
   switch (tile.type) {
     case TILE3D_TYPE.COMPOSITE:
       return encodeComposite3DTile(tile, dataView, byteOffset, options, encode3DTileToDataView);