@inweb/viewer-three 26.12.2 → 26.12.4

package/lib/Viewer/loaders/GLTFFileDynamicLoader.d.ts

@@ -6,7 +6,7 @@ export declare class GLTFFileDynamicLoader extends Loader {
     private gltfLoader;
     private manager;
     private gltf;
-    private bin;
+    private glb;
     constructor(viewer: Viewer);
     dispose(): void;
     isSupport(file: any, format?: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.12.2",
+  "version": "26.12.4",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,10 +35,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.12.2",
-    "@inweb/eventemitter2": "~26.12.2",
-    "@inweb/markup": "~26.12.2",
-    "@inweb/viewer-core": "~26.12.2"
+    "@inweb/client": "~26.12.4",
+    "@inweb/eventemitter2": "~26.12.4",
+    "@inweb/markup": "~26.12.4",
+    "@inweb/viewer-core": "~26.12.4"
   },
   "devDependencies": {
     "@types/three": "^0.180.0",

package/src/Viewer/loaders/DynamicGltfLoader/DynamicGltfLoader.js

@@ -311,7 +311,7 @@ export class DynamicGltfLoader {
     const uniqueTextureIds = new Set();
     if (Array.isArray(this.structures)) {
       for (const structure of this.structures) {
-        console.log(structure.materialCache.values());
+        // console.log(structure.materialCache.values());
         try {
           for (const entry of structure.materialCache.values()) {
             if (entry?.mesh?.uuid) uniqueMaterialIds.add(entry.mesh.uuid);

package/src/Viewer/loaders/DynamicGltfLoader/GltfStructure.js

@@ -46,7 +46,6 @@ export class GltfStructure {
   constructor(id, loadController) {
     this.id = `${id}`;
     this.json = null;
-    this.baseUrl = "";
     this.loadController = loadController;
     this.loader = null;
     this.batchDelay = 10;
@@ -66,14 +65,12 @@ export 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) {
@@ -397,12 +394,8 @@ export class GltfStructure {
       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);

package/src/Viewer/loaders/GLTFCloudDynamicLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Group } from "three";
+import { Group, LoaderUtils } from "three";
 import { Loader, LoadParams } from "@inweb/viewer-core";
 
 import { Viewer } from "../Viewer";
@@ -118,7 +118,11 @@ export class GLTFCloudDynamicLoader extends Loader {
         );
       },
 
-      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);

package/src/Viewer/loaders/GLTFFileDynamicLoader.ts

@@ -37,7 +37,7 @@ export class GLTFFileDynamicLoader extends Loader {
   private gltfLoader: DynamicGltfLoader;
   private manager: GLTFLoadingManager;
   private gltf: any;
-  private bin: ArrayBuffer;
+  private glb: ArrayBuffer;
 
   constructor(viewer: Viewer) {
     super();
@@ -106,7 +106,11 @@ export class GLTFFileDynamicLoader extends Loader {
 
         const extension = new GLTFBinaryExtension(data as ArrayBuffer);
         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;
       },
@@ -117,7 +121,7 @@ export class GLTFFileDynamicLoader extends Loader {
         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);
@@ -125,9 +129,10 @@ export class GLTFFileDynamicLoader extends Loader {
         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));
       },
     };