@inweb/viewer-three 26.12.2 → 26.12.4

package/dist/viewer-three.module.js

@@ -3672,7 +3672,6 @@ class GltfStructure {
   constructor(id, loadController) {
     this.id = `${id}`;
     this.json = null;
-    this.baseUrl = "";
     this.loadController = loadController;
     this.loader = null;
     this.batchDelay = 10;
@@ -3691,13 +3690,11 @@ class GltfStructure {
   }
   async initialize(loader) {
     this.json = await this.loadController.loadJson();
-    this.baseUrl = await this.loadController.baseUrl();
     this.loader = loader;
     this.uri = this.json.buffers[0].uri || "";
   }
   clear() {
     this.json = null;
-    this.baseUrl = "";
     this.loadController = null;
     this.pendingRequests = [];
     if (this.batchTimeout) {
@@ -3978,12 +3975,8 @@ class GltfStructure {
     const loadTexture = async (imageIndex) => {
       const image = this.json.images[imageIndex];
       if (image.uri) {
-        if (image.uri.startsWith("data:")) {
-          return await this.textureLoader.loadAsync(image.uri);
-        } else {
-          const fullUrl = this.baseUrl + image.uri;
-          return await this.textureLoader.loadAsync(fullUrl);
-        }
+        const fullUrl = await this.loadController.resolveURL(image.uri);
+        return this.textureLoader.loadAsync(fullUrl);
       } else if (image.bufferView !== undefined) {
         const bufferView = this.json.bufferViews[image.bufferView];
         const array = await this.getBufferView(bufferView.byteOffset || 0, bufferView.byteLength, 5121);
@@ -4376,7 +4369,6 @@ class DynamicGltfLoader {
     const uniqueTextureIds = new Set();
     if (Array.isArray(this.structures)) {
       for (const structure of this.structures) {
-        console.log(structure.materialCache.values());
         try {
           for (const entry of structure.materialCache.values()) {
             if (entry?.mesh?.uuid) uniqueMaterialIds.add(entry.mesh.uuid);
@@ -6154,7 +6146,10 @@ class GLTFFileDynamicLoader extends Loader {
                 const data = await loader.loadAsync(this.manager.fileURL, progress);
                 const extension = new GLTFBinaryExtension(data);
                 this.gltf = JSON.parse(extension.content);
-                this.bin = extension.body;
+                this.glb = extension.body;
+                if (/\.glb$/i.test(this.manager.fileURL) && !this.glb) {
+                    throw new Error("GLTFFileDynamicLoader: Binary buffer chunk not found or type not supported.");
+                }
                 return this.gltf;
             },
             loadBinaryData: (ranges, uri = "") => {
@@ -6162,15 +6157,16 @@ class GLTFFileDynamicLoader extends Loader {
                 loader.setRequestHeader(params.requestHeader || {});
                 loader.setWithCredentials(params.withCredentials || false);
                 loader.setAbortSignal(this.gltfLoader.abortController.signal);
-                if (this.bin)
-                    return loader.extractRanges(this.bin, ranges);
+                if (this.glb)
+                    return loader.extractRanges(this.glb, ranges);
                 const path = this.manager.path || this.manager.resourcePath;
                 const url = LoaderUtils.resolveURL(uri, path);
                 return loader.load(this.manager.resolveURL(url), ranges);
             },
-            baseUrl: () => {
+            resolveURL: (uri) => {
                 const path = this.manager.path || this.manager.resourcePath;
-                return Promise.resolve(path);
+                const url = LoaderUtils.resolveURL(uri, path);
+                return Promise.resolve(this.manager.resolveURL(url));
             },
         };
         const structure = new GltfStructure(modelImpl.id, loadController);
@@ -6241,7 +6237,11 @@ class GLTFCloudDynamicLoader extends Loader {
                 }));
                 return model.downloadResourceRange(model.geometry[0], undefined, ranges, undefined, this.gltfLoader.getAbortController().signal);
             },
-            baseUrl: () => Promise.resolve(`${model.httpClient.serverUrl}${model.path}/`),
+            resolveURL: (uri) => {
+                const path = `${model.httpClient.serverUrl}${model.path}/`;
+                const url = LoaderUtils.resolveURL(uri, path);
+                return Promise.resolve(url);
+            },
         };
         const structure = new GltfStructure(modelImpl.id, loadController);
         await this.gltfLoader.loadStructure(structure);