@loaders.gl/3d-tiles 4.0.0-alpha.18 → 4.0.0-alpha.20

package/dist/dist.min.js

@@ -566,32 +566,33 @@
   });
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
+  async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
-      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
+      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
     }
     loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
     return await loadLibraryPromises[libraryUrl];
   }
-  function getLibraryUrl(library, moduleName, options) {
-    if (library.startsWith("http")) {
+  function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
+    libraryName = libraryName || library;
     const modules = options.modules || {};
-    if (modules[library]) {
-      return modules[library];
+    if (modules[libraryName]) {
+      return modules[libraryName];
     }
     if (!isBrowser2) {
-      return `modules/${moduleName}/dist/libs/${library}`;
+      return `modules/${moduleName}/dist/libs/${libraryName}`;
     }
     if (options.CDN) {
       assert3(options.CDN.startsWith("http"));
-      return `${options.CDN}/${moduleName}@${VERSION2}/dist/libs/${library}`;
+      return `${options.CDN}/${moduleName}@${VERSION2}/dist/libs/${libraryName}`;
     }
     if (isWorker) {
-      return `../src/libs/${library}`;
+      return `../src/libs/${libraryName}`;
     }
-    return `modules/${moduleName}/src/libs/${library}`;
+    return `modules/${moduleName}/src/libs/${libraryName}`;
   }
   async function loadLibraryFromFile(libraryUrl) {
     if (libraryUrl.endsWith("wasm")) {
@@ -6204,6 +6205,7 @@
         mimeType: void 0,
         nothrow: false,
         log: new ConsoleLog(),
+        useLocalLibraries: false,
         CDN: "https://unpkg.com/@loaders.gl",
         worker: true,
         maxConcurrency: 3,
@@ -6784,12 +6786,12 @@
   // ../core/src/lib/loader-utils/get-fetch-function.ts
   function getFetchFunction(options, context) {
     const globalOptions = getGlobalLoaderOptions();
-    const fetchOptions = options || globalOptions;
-    if (typeof fetchOptions.fetch === "function") {
-      return fetchOptions.fetch;
+    const loaderOptions = options || globalOptions;
+    if (typeof loaderOptions.fetch === "function") {
+      return loaderOptions.fetch;
     }
-    if (isObject(fetchOptions.fetch)) {
-      return (url) => fetchFile(url, fetchOptions);
+    if (isObject(loaderOptions.fetch)) {
+      return (url) => fetchFile(url, loaderOptions.fetch);
     }
     if (context?.fetch) {
       return context?.fetch;
@@ -7568,13 +7570,13 @@
     let wasmBinary;
     switch (options.draco && options.draco.decoderType) {
       case "js":
-        DracoDecoderModule = await loadLibrary(DRACO_JS_DECODER_URL, "draco", options);
+        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_WASM_WRAPPER_URL, "draco", options),
-          await loadLibrary(DRACO_WASM_DECODER_URL, "draco", options)
+          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;
@@ -7592,17 +7594,25 @@
       });
     });
   }
-  var DRACO_DECODER_VERSION, DRACO_ENCODER_VERSION, STATIC_DECODER_URL, DRACO_JS_DECODER_URL, DRACO_WASM_WRAPPER_URL, DRACO_WASM_DECODER_URL, DRACO_ENCODER_URL, loadDecoderPromise;
+  var DRACO_DECODER_VERSION, DRACO_ENCODER_VERSION, STATIC_DECODER_URL, DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS, loadDecoderPromise;
   var init_draco_module_loader = __esm({
     "../draco/src/lib/draco-module-loader.ts"() {
       init_src();
       DRACO_DECODER_VERSION = "1.5.5";
       DRACO_ENCODER_VERSION = "1.4.1";
       STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
-      DRACO_JS_DECODER_URL = `${STATIC_DECODER_URL}/draco_decoder.js`;
-      DRACO_WASM_WRAPPER_URL = `${STATIC_DECODER_URL}/draco_wasm_wrapper.js`;
-      DRACO_WASM_DECODER_URL = `${STATIC_DECODER_URL}/draco_decoder.wasm`;
-      DRACO_ENCODER_URL = `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/draco_encoder.js`;
+      DRACO_EXTERNAL_LIBRARIES = {
+        DECODER: "draco_wasm_wrapper.js",
+        DECODER_WASM: "draco_decoder.wasm",
+        FALLBACK_DECODER: "draco_decoder.js",
+        ENCODER: "draco_encoder.js"
+      };
+      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}`
+      };
     }
   });
 
@@ -9403,8 +9413,8 @@
     let BASIS = null;
     let wasmBinary = null;
     [BASIS, wasmBinary] = await Promise.all([
-      await loadLibrary("basis_transcoder.js", "textures", options),
-      await loadLibrary("basis_transcoder.wasm", "textures", options)
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.TRANSCODER, "textures", options),
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, "textures", options)
     ]);
     BASIS = BASIS || globalThis.BASIS;
     return await initializeBasisTranscoderModule(BASIS, wasmBinary);
@@ -9434,8 +9444,8 @@
     let BASIS_ENCODER = null;
     let wasmBinary = null;
     [BASIS_ENCODER, wasmBinary] = await Promise.all([
-      await loadLibrary(BASIS_CDN_ENCODER_JS, "textures", options),
-      await loadLibrary(BASIS_CDN_ENCODER_WASM, "textures", options)
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.ENCODER, "textures", options),
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, "textures", options)
     ]);
     BASIS_ENCODER = BASIS_ENCODER || globalThis.BASIS;
     return await initializeBasisEncoderModule(BASIS_ENCODER, wasmBinary);
@@ -9453,13 +9463,16 @@
       });
     });
   }
-  var VERSION9, BASIS_CDN_ENCODER_WASM, BASIS_CDN_ENCODER_JS, loadBasisTranscoderPromise, loadBasisEncoderPromise;
+  var BASIS_EXTERNAL_LIBRARIES, loadBasisTranscoderPromise, loadBasisEncoderPromise;
   var init_basis_module_loader = __esm({
     "../textures/src/lib/parsers/basis-module-loader.ts"() {
       init_src();
-      VERSION9 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "beta";
-      BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION9}/dist/libs/basis_encoder.wasm`;
-      BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION9}/dist/libs/basis_encoder.js`;
+      BASIS_EXTERNAL_LIBRARIES = {
+        TRANSCODER: "basis_transcoder.js",
+        TRANSCODER_WASM: "basis_transcoder.wasm",
+        ENCODER: "basis_encoder.js",
+        ENCODER_WASM: "basis_encoder.wasm"
+      };
     }
   });
 
@@ -10708,7 +10721,7 @@
   });
   async function decode2(gltfData, options) {
     const scenegraph = new GLTFScenegraph(gltfData);
-    if (!options?.gltf?.decompressMeshes) {
+    if (!options?.gltf?.decompressMeshes || !options.gltf?.loadBuffers) {
       return;
     }
     const promises = [];
@@ -11012,7 +11025,7 @@
   async function decode4(gltfData, options) {
     const gltfScenegraph = new GLTFScenegraph(gltfData);
     const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
-    if (!hasExtension) {
+    if (!hasExtension || !options.gltf?.loadBuffers) {
       return;
     }
     const materials = gltfData.json.materials || [];
@@ -11912,7 +11925,11 @@
       arrayBuffer = sliceArrayBuffer(array.buffer, array.byteOffset, array.byteLength);
     }
     assert7(arrayBuffer, "glTF image has no data");
-    let parsedImage = await parse5(arrayBuffer, [ImageLoader, BasisLoader], { mimeType: image.mimeType, basis: options.basis || { format: selectSupportedBasisFormat() } }, context);
+    let parsedImage = await parse5(arrayBuffer, [ImageLoader, BasisLoader], {
+      ...options,
+      mimeType: image.mimeType,
+      basis: options.basis || { format: selectSupportedBasisFormat() }
+    }, context);
     if (parsedImage && parsedImage[0]) {
       parsedImage = {
         compressed: true,
@@ -12816,11 +12833,11 @@
   });
 
   // node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION10, isBrowser6;
+  var VERSION9, isBrowser6;
   var init_globals6 = __esm({
     "node_modules/@probe.gl/env/dist/utils/globals.js"() {
       init_is_browser2();
-      VERSION10 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "untranspiled source";
+      VERSION9 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "untranspiled source";
       isBrowser6 = isBrowser5();
     }
   });
@@ -13155,7 +13172,7 @@
             id: ""
           };
           this.id = void 0;
-          this.VERSION = VERSION10;
+          this.VERSION = VERSION9;
           this._startTs = getHiResTimestamp2();
           this._deltaTs = getHiResTimestamp2();
           this._storage = void 0;
@@ -13358,7 +13375,7 @@
           return noop2;
         }
       };
-      Log2.VERSION = VERSION10;
+      Log2.VERSION = VERSION9;
     }
   });
 

package/dist/es5/lib/utils/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VERSION = void 0;
-var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 'latest';
+var VERSION = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : 'latest';
 exports.VERSION = VERSION;
 //# sourceMappingURL=version.js.map

package/dist/esm/lib/utils/version.js

@@ -1,2 +1,2 @@
-export const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 'latest';
+export const VERSION = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : 'latest';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "4.0.0-alpha.18",
+  "version": "4.0.0-alpha.20",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
   "license": "MIT",
   "publishConfig": {
@@ -34,11 +34,11 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/draco": "4.0.0-alpha.18",
-    "@loaders.gl/gltf": "4.0.0-alpha.18",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.18",
-    "@loaders.gl/math": "4.0.0-alpha.18",
-    "@loaders.gl/tiles": "4.0.0-alpha.18",
+    "@loaders.gl/draco": "4.0.0-alpha.20",
+    "@loaders.gl/gltf": "4.0.0-alpha.20",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.20",
+    "@loaders.gl/math": "4.0.0-alpha.20",
+    "@loaders.gl/tiles": "4.0.0-alpha.20",
     "@math.gl/core": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
     "@probe.gl/log": "^4.0.4",
@@ -47,5 +47,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0-alpha.8"
   },
-  "gitHead": "7bc633f46560f661bdd46cf1015ea27b3694ebce"
+  "gitHead": "ac122e83102657c38207d59c631a5ce4e7aa46bd"
 }