@loaders.gl/3d-tiles 4.3.2 → 4.4.0-alpha.1

package/dist/3d-tiles-archive-loader.js

@@ -5,7 +5,7 @@ import { DataViewFile } from '@loaders.gl/loader-utils';
 import { parse3DTilesArchive as parse3DTilesArchiveFromProvider } from "./3d-tiles-archive/3d-tiles-archive-parser.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for 3tz packages
  */

package/dist/dist.dev.js

@@ -4299,14 +4299,14 @@ var __exports__ = (() => {
   var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/globals.js
+  // ../../node_modules/@probe.gl/env/dist/lib/globals.js
   var window_2 = globalThis;
   var document_2 = globalThis.document || {};
   var process_ = globalThis.process || {};
   var console_ = globalThis.console;
   var navigator_ = globalThis.navigator || {};
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/is-electron.js
+  // ../../node_modules/@probe.gl/env/dist/lib/is-electron.js
   function isElectron(mockUserAgent) {
     if (typeof window !== "undefined" && window.process?.type === "renderer") {
       return true;
@@ -4319,7 +4319,7 @@ var __exports__ = (() => {
     return Boolean(userAgent && userAgent.indexOf("Electron") >= 0);
   }
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/is-browser.js
+  // ../../node_modules/@probe.gl/env/dist/lib/is-browser.js
   function isBrowser2() {
     const isNode = (
       // @ts-expect-error
@@ -4328,7 +4328,7 @@ var __exports__ = (() => {
     return !isNode || isElectron();
   }
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/index.js
+  // ../../node_modules/@probe.gl/env/dist/index.js
   var VERSION = true ? "4.0.7" : "untranspiled source";
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -4741,8 +4741,10 @@ var __exports__ = (() => {
     return module || null;
   }
 
+  // ../worker-utils/src/lib/npm-tag.ts
+  var NPM_TAG = "beta";
+
   // ../worker-utils/src/lib/env-utils/version.ts
-  var NPM_TAG = "latest";
   function getVersion() {
     if (!globalThis._loadersgl_?.version) {
       globalThis._loadersgl_ = globalThis._loadersgl_ || {};
@@ -5222,7 +5224,7 @@ var __exports__ = (() => {
       throw new Error("Can't instantiate NodeFile. Make sure to import @loaders.gl/polyfills first.");
     }
     /** Read data */
-    async read(start, end) {
+    async read(start, length4) {
       throw NOT_IMPLEMENTED;
     }
     /** Write to file. The number of bytes written will be returned */
@@ -10913,35 +10915,88 @@ var __exports__ = (() => {
     return `${String.fromCharCode(dataView.getUint8(byteOffset + 0))}${String.fromCharCode(dataView.getUint8(byteOffset + 1))}${String.fromCharCode(dataView.getUint8(byteOffset + 2))}${String.fromCharCode(dataView.getUint8(byteOffset + 3))}`;
   }
 
+  // ../draco/src/lib/draco-module-loader.ts
+  var DRACO_DECODER_VERSION = "1.5.6";
+  var DRACO_ENCODER_VERSION = "1.4.1";
+  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
+  var DRACO_EXTERNAL_LIBRARIES = {
+    /** The primary Draco3D encoder, javascript wrapper part */
+    DECODER: "draco_wasm_wrapper.js",
+    /** The primary draco decoder, compiled web assembly part */
+    DECODER_WASM: "draco_decoder.wasm",
+    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
+    FALLBACK_DECODER: "draco_decoder.js",
+    /** Draco encoder */
+    ENCODER: "draco_encoder.js"
+  };
+  var DRACO_EXTERNAL_LIBRARY_URLS = {
+    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
+    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
+  };
+  var loadDecoderPromise;
+  async function loadDracoDecoderModule(options) {
+    const modules = options.modules || {};
+    if (modules.draco3d) {
+      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
+        return { draco };
+      });
+    } else {
+      loadDecoderPromise ||= loadDracoDecoder(options);
+    }
+    return await loadDecoderPromise;
+  }
+  async function loadDracoDecoder(options) {
+    let DracoDecoderModule;
+    let wasmBinary;
+    switch (options.draco && options.draco.decoderType) {
+      case "js":
+        DracoDecoderModule = await loadLibrary(
+          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
+          "draco",
+          options,
+          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
+        );
+        break;
+      case "wasm":
+      default:
+        [DracoDecoderModule, wasmBinary] = await Promise.all([
+          await loadLibrary(
+            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
+            "draco",
+            options,
+            DRACO_EXTERNAL_LIBRARIES.DECODER
+          ),
+          await loadLibrary(
+            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
+            "draco",
+            options,
+            DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
+          )
+        ]);
+    }
+    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
+    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
+  }
+  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
+    const options = {};
+    if (wasmBinary) {
+      options.wasmBinary = wasmBinary;
+    }
+    return new Promise((resolve2) => {
+      DracoDecoderModule({
+        ...options,
+        onModuleLoaded: (draco) => resolve2({ draco })
+        // Module is Promise-like. Wrap in object to avoid loop.
+      });
+    });
+  }
+
   // ../draco/src/lib/utils/version.ts
   var VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
 
-  // ../draco/src/draco-loader.ts
-  var DracoLoader = {
-    dataType: null,
-    batchType: null,
-    name: "Draco",
-    id: "draco",
-    module: "draco",
-    // shapes: ['mesh'],
-    version: VERSION4,
-    worker: true,
-    extensions: ["drc"],
-    mimeTypes: ["application/octet-stream"],
-    binary: true,
-    tests: ["DRACO"],
-    options: {
-      draco: {
-        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
-        // 'js' for IE11
-        libraryPath: "libs/",
-        extraAttributes: {},
-        attributeNameEntry: void 0
-      }
-    }
-  };
-
-  // ../schema/src/lib/table/simple-table/data-type.ts
+  // ../schema-utils/src/lib/schema/data-type.ts
   function getDataTypeFromTypedArray(array) {
     switch (array.constructor) {
       case Int8Array:
@@ -10966,7 +11021,7 @@ var __exports__ = (() => {
     }
   }
 
-  // ../schema/src/lib/mesh/mesh-utils.ts
+  // ../schema-utils/src/lib/mesh/mesh-utils.ts
   function getMeshBoundingBox(attributes) {
     let minX = Infinity;
     let minY = Infinity;
@@ -10993,7 +11048,7 @@ var __exports__ = (() => {
     ];
   }
 
-  // ../schema/src/lib/mesh/deduce-mesh-schema.ts
+  // ../schema-utils/src/lib/mesh/deduce-mesh-schema.ts
   function deduceMeshField(name12, attribute, optionalMetadata) {
     const type = getDataTypeFromTypedArray(attribute.value);
     const metadata = optionalMetadata ? optionalMetadata : makeMeshAttributeMetadata(attribute);
@@ -11217,6 +11272,7 @@ var __exports__ = (() => {
           case "triangle-strip":
             return {
               topology: "triangle-strip",
+              // TODO - mode is wrong?
               mode: 4,
               // GL.TRIANGLES
               attributes,
@@ -11229,6 +11285,7 @@ var __exports__ = (() => {
           default:
             return {
               topology: "triangle-list",
+              // TODO - mode is wrong?
               mode: 5,
               // GL.TRIANGLE_STRIP
               attributes,
@@ -11513,87 +11570,32 @@ var __exports__ = (() => {
     return intArray;
   }
 
-  // ../draco/src/lib/draco-module-loader.ts
-  var DRACO_DECODER_VERSION = "1.5.6";
-  var DRACO_ENCODER_VERSION = "1.4.1";
-  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
-  var DRACO_EXTERNAL_LIBRARIES = {
-    /** The primary Draco3D encoder, javascript wrapper part */
-    DECODER: "draco_wasm_wrapper.js",
-    /** The primary draco decoder, compiled web assembly part */
-    DECODER_WASM: "draco_decoder.wasm",
-    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
-    FALLBACK_DECODER: "draco_decoder.js",
-    /** Draco encoder */
-    ENCODER: "draco_encoder.js"
-  };
-  var DRACO_EXTERNAL_LIBRARY_URLS = {
-    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
-    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
-  };
-  var loadDecoderPromise;
-  async function loadDracoDecoderModule(options) {
-    const modules = options.modules || {};
-    if (modules.draco3d) {
-      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
-        return { draco };
-      });
-    } else {
-      loadDecoderPromise ||= loadDracoDecoder(options);
-    }
-    return await loadDecoderPromise;
-  }
-  async function loadDracoDecoder(options) {
-    let DracoDecoderModule;
-    let wasmBinary;
-    switch (options.draco && options.draco.decoderType) {
-      case "js":
-        DracoDecoderModule = await loadLibrary(
-          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
-          "draco",
-          options,
-          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
-        );
-        break;
-      case "wasm":
-      default:
-        [DracoDecoderModule, wasmBinary] = await Promise.all([
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER
-          ),
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
-          )
-        ]);
-    }
-    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
-    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
-  }
-  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
-    const options = {};
-    if (wasmBinary) {
-      options.wasmBinary = wasmBinary;
+  // ../draco/src/draco-loader.ts
+  var DracoWorkerLoader = {
+    dataType: null,
+    batchType: null,
+    name: "Draco",
+    id: "draco",
+    module: "draco",
+    // shapes: ['mesh'],
+    version: VERSION4,
+    worker: true,
+    extensions: ["drc"],
+    mimeTypes: ["application/octet-stream"],
+    binary: true,
+    tests: ["DRACO"],
+    options: {
+      draco: {
+        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
+        // 'js' for IE11
+        libraryPath: "libs/",
+        extraAttributes: {},
+        attributeNameEntry: void 0
+      }
     }
-    return new Promise((resolve2) => {
-      DracoDecoderModule({
-        ...options,
-        onModuleLoaded: (draco) => resolve2({ draco })
-        // Module is Promise-like. Wrap in object to avoid loop.
-      });
-    });
-  }
-
-  // ../draco/src/index.ts
-  var DracoLoader2 = {
-    ...DracoLoader,
+  };
+  var DracoLoader = {
+    ...DracoWorkerLoader,
     parse
   };
   async function parse(arrayBuffer, options) {
@@ -12813,7 +12815,7 @@ var __exports__ = (() => {
       }
     };
     delete dracoOptions["3d-tiles"];
-    const data = await parseFromContext(dracoData.buffer, DracoLoader2, dracoOptions, context);
+    const data = await parseFromContext(dracoData.buffer, DracoLoader, dracoOptions, context);
     const decodedPositions = data.attributes.POSITION && data.attributes.POSITION.value;
     const decodedColors = data.attributes.COLOR_0 && data.attributes.COLOR_0.value;
     const decodedNormals = data.attributes.NORMAL && data.attributes.NORMAL.value;
@@ -16051,7 +16053,7 @@ var __exports__ = (() => {
     const bufferCopy = sliceArrayBuffer(buffer.buffer, buffer.byteOffset);
     const dracoOptions = { ...options };
     delete dracoOptions["3d-tiles"];
-    const decodedData = await parseFromContext(bufferCopy, DracoLoader2, dracoOptions, context);
+    const decodedData = await parseFromContext(bufferCopy, DracoLoader, dracoOptions, context);
     const decodedAttributes = getGLTFAccessors(decodedData.attributes);
     for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {
       if (attributeName in primitive.attributes) {
@@ -19383,10 +19385,12 @@ var __exports__ = (() => {
       }
     }
     const ionAssetMetadata = await getIonAssetMetadata(accessToken, assetId);
-    const { type, url } = ionAssetMetadata;
+    const type = ionAssetMetadata.type;
+    const url = ionAssetMetadata.options?.url || ionAssetMetadata.url;
     assert2(type === "3DTILES" && url);
     ionAssetMetadata.headers = {
-      Authorization: `Bearer ${ionAssetMetadata.accessToken}`
+      // Use provided accessToken if a new token is not provided in the ion response
+      Authorization: `Bearer ${ionAssetMetadata.accessToken || accessToken}`
     };
     return ionAssetMetadata;
   }