@loaders.gl/3d-tiles 4.4.0-alpha.17 → 4.4.0-alpha.19

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

@@ -5,7 +5,7 @@ import { DataViewReadableFile } from '@loaders.gl/zip';
 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.4.0-alpha.17" !== 'undefined' ? "4.4.0-alpha.17" : 'latest';
+const VERSION = typeof "4.4.0-alpha.19" !== 'undefined' ? "4.4.0-alpha.19" : 'latest';
 /**
  * Loader for 3tz packages
  */

package/dist/dist.dev.js

@@ -4885,6 +4885,16 @@ var __exports__ = (() => {
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
   var loadLibraryPromises = {};
+  function extractLoadLibraryOptions(options = {}) {
+    const useLocalLibraries = options.useLocalLibraries ?? options.core?.useLocalLibraries;
+    const CDN = options.CDN ?? options.core?.CDN;
+    const modules = options.modules;
+    return {
+      ...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
+      ...CDN !== void 0 ? { CDN } : {},
+      ...modules !== void 0 ? { modules } : {}
+    };
+  }
   async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
       libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
@@ -11657,7 +11667,6 @@ var __exports__ = (() => {
       draco: {
         decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
         // 'js' for IE11
-        libraryPath: "libs/",
         extraAttributes: {},
         attributeNameEntry: void 0
       }
@@ -11669,7 +11678,7 @@ var __exports__ = (() => {
   };
   async function parse(arrayBuffer, options) {
     const { draco } = await loadDracoDecoderModule(
-      options?.core,
+      extractLoadLibraryOptions(options),
       options?.draco?.decoderType || "wasm"
     );
     const dracoParser = new DracoParser(draco);
@@ -15275,7 +15284,7 @@ var __exports__ = (() => {
       "bc7-rgba-unorm",
       "bc7-rgba-unorm-srgb"
     ],
-    WEBGL_compressed_texture_etc1: ["etc1-rbg-unorm-webgl"],
+    WEBGL_compressed_texture_etc1: ["etc1-rgb-unorm-webgl"],
     WEBGL_compressed_texture_etc: [
       "etc2-rgb8unorm",
       "etc2-rgb8unorm-srgb",
@@ -15291,7 +15300,7 @@ var __exports__ = (() => {
     WEBGL_compressed_texture_pvrtc: [
       "pvrtc-rgb4unorm-webgl",
       "pvrtc-rgba4unorm-webgl",
-      "pvrtc-rbg2unorm-webgl",
+      "pvrtc-rgb2unorm-webgl",
       "pvrtc-rgba2unorm-webgl"
     ],
     WEBGL_compressed_texture_atc: [
@@ -15391,12 +15400,13 @@ var __exports__ = (() => {
   }
 
   // ../textures/src/lib/parsers/parse-basis.ts
+  var basisTranscodingLock = Promise.resolve();
   var BASIS_FORMAT_TO_OUTPUT_OPTIONS = {
     etc1: {
       basisFormat: 0,
       compressed: true,
       format: GL_COMPRESSED_RGB_ETC1_WEBGL,
-      textureFormat: "etc1-rbg-unorm-webgl"
+      textureFormat: "etc1-rgb-unorm-webgl"
     },
     etc2: {
       basisFormat: 1,
@@ -15498,30 +15508,46 @@ var __exports__ = (() => {
   var BASIS_FORMATS = Object.freeze(
     Object.keys(BASIS_FORMAT_TO_OUTPUT_OPTIONS)
   );
+  async function withBasisTranscodingLock(transcode) {
+    const previousLock = basisTranscodingLock;
+    let releaseLock;
+    basisTranscodingLock = new Promise((resolve2) => {
+      releaseLock = resolve2;
+    });
+    await previousLock;
+    try {
+      return await transcode();
+    } finally {
+      releaseLock();
+    }
+  }
   async function parseBasis(data, options = {}) {
-    if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
-      if (isKTX(data)) {
-        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
-        return parseKTX2File(fileConstructors.KTX2File, data, options);
-      }
-      const { BasisFile } = await loadBasisTranscoderModule(options?.core || {});
-      return parseBasisFile(BasisFile, data, options);
-    }
-    switch (options.basis.module) {
-      case "encoder":
-        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
-        switch (options.basis.containerFormat) {
-          case "ktx2":
-            return parseKTX2File(fileConstructors.KTX2File, data, options);
-          case "basis":
-          default:
-            return parseBasisFile(fileConstructors.BasisFile, data, options);
-        }
-      case "transcoder":
-      default:
-        const { BasisFile } = await loadBasisTranscoderModule(options.core || {});
+    const loadLibraryOptions = extractLoadLibraryOptions(options);
+    return await withBasisTranscodingLock(async () => {
+      if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
+        if (isKTX(data)) {
+          const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
+          return parseKTX2File(fileConstructors.KTX2File, data, options);
+        }
+        const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
         return parseBasisFile(BasisFile, data, options);
-    }
+      }
+      switch (options.basis.module) {
+        case "encoder":
+          const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
+          switch (options.basis.containerFormat) {
+            case "ktx2":
+              return parseKTX2File(fileConstructors.KTX2File, data, options);
+            case "basis":
+            default:
+              return parseBasisFile(fileConstructors.BasisFile, data, options);
+          }
+        case "transcoder":
+        default:
+          const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
+          return parseBasisFile(BasisFile, data, options);
+      }
+    });
   }
   function parseBasisFile(BasisFile, data, options) {
     const basisFile = new BasisFile(new Uint8Array(data));
@@ -15666,7 +15692,7 @@ var __exports__ = (() => {
     } else if (hasSupportedTextureFormat(textureFormats2, [
       "pvrtc-rgb4unorm-webgl",
       "pvrtc-rgba4unorm-webgl",
-      "pvrtc-rbg2unorm-webgl",
+      "pvrtc-rgb2unorm-webgl",
       "pvrtc-rgba2unorm-webgl"
     ])) {
       return {
@@ -15686,7 +15712,7 @@ var __exports__ = (() => {
       "eac-rg11snorm"
     ])) {
       return "etc2";
-    } else if (textureFormats2.has("etc1-rbg-unorm-webgl")) {
+    } else if (textureFormats2.has("etc1-rgb-unorm-webgl")) {
       return "etc1";
     } else if (hasSupportedTextureFormat(textureFormats2, [
       "atc-rgb-unorm-webgl",
@@ -15722,7 +15748,6 @@ var __exports__ = (() => {
     options: {
       basis: {
         format: "auto",
-        libraryPath: "libs/",
         containerFormat: "auto",
         module: "transcoder"
       }
@@ -15844,16 +15869,26 @@ var __exports__ = (() => {
   }
 
   // ../gltf/src/lib/gltf-utils/resolve-url.ts
-  function resolveUrl(url, options) {
+  function resolveUrl(url, options, context) {
     const absolute = url.startsWith("data:") || url.startsWith("http:") || url.startsWith("https:");
     if (absolute) {
       return url;
     }
-    const baseUrl = options?.core?.baseUri || options.baseUri || options.uri;
+    const baseUrl = context?.baseUrl || getResolveBaseUrl(options?.core?.baseUrl);
     if (!baseUrl) {
-      throw new Error(`'baseUri' must be provided to resolve relative url ${url}`);
+      throw new Error(`'baseUrl' must be provided to resolve relative url ${url}`);
+    }
+    return baseUrl.endsWith("/") ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
+  }
+  function getResolveBaseUrl(baseUrl) {
+    if (!baseUrl) {
+      return void 0;
+    }
+    if (baseUrl.endsWith("/")) {
+      return baseUrl;
     }
-    return baseUrl.substr(0, baseUrl.lastIndexOf("/") + 1) + url;
+    const slashIndex = baseUrl.lastIndexOf("/");
+    return slashIndex >= 0 ? baseUrl.slice(0, slashIndex + 1) : "";
   }
 
   // ../gltf/src/lib/extensions/EXT_meshopt_compression.ts
@@ -16939,8 +16974,8 @@ var __exports__ = (() => {
     return gltf;
   }
   function parseGLTFContainerSync(gltf, data, byteOffset, options) {
-    if (options.core?.baseUri) {
-      gltf.baseUri = options.core?.baseUri;
+    if (options.core?.baseUrl) {
+      gltf.baseUri = options.core?.baseUrl;
     }
     if (data instanceof ArrayBuffer && !isGLB(data, byteOffset, options.glb)) {
       const textDecoder = new TextDecoder();
@@ -16977,7 +17012,7 @@ var __exports__ = (() => {
       if (buffer.uri) {
         const { fetch: fetch2 } = context;
         assert7(fetch2);
-        const uri = resolveUrl(buffer.uri, options);
+        const uri = resolveUrl(buffer.uri, options, context);
         const response = await context?.fetch?.(uri);
         const arrayBuffer = await response?.arrayBuffer?.();
         gltf.buffers[i] = {
@@ -17017,7 +17052,7 @@ var __exports__ = (() => {
   async function loadImage(gltf, image, index, options, context) {
     let arrayBuffer;
     if (image.uri && !image.hasOwnProperty("bufferView")) {
-      const uri = resolveUrl(image.uri, options);
+      const uri = resolveUrl(image.uri, options, context);
       const { fetch: fetch2 } = context;
       const response = await fetch2(uri);
       arrayBuffer = await response.arrayBuffer();