@inweb/viewer-three 26.6.2 → 26.6.4

package/dist/viewer-three.module.js

@@ -2415,30 +2415,30 @@ class GLTFLoadingManager extends LoadingManager {
     }
 }
 
-class GLTFModelLoader extends Loader {
+class GLTFFileLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
     }
-    isSupport(model) {
-        return typeof model === "object" && typeof model.database === "string" && typeof model.downloadResource === "function" && /.gltf$/i.test(model.database);
+    isSupport(file, format) {
+        return (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) && /(gltf|glb)$/i.test(format);
     }
-    async load(model) {
-        const url = `${model.httpClient.serverUrl}${model.path}/${model.database}`;
-        const manager = new GLTFLoadingManager(url);
+    async load(file, format, params) {
+        const manager = new GLTFLoadingManager(file, params);
         const loader = new GLTFLoader(manager);
-        loader.setRequestHeader(model.httpClient.headers);
+        loader.setPath(manager.path);
+        loader.setCrossOrigin(params.crossOrigin || loader.crossOrigin);
+        loader.setWithCredentials(params.withCredentials || loader.withCredentials);
         const progress = event => {
             const {lengthComputable: lengthComputable, loaded: loaded, total: total} = event;
             const progress = lengthComputable ? loaded / total : 1;
             this.viewer.emitEvent({
                 type: "geometryprogress",
                 data: progress,
-                file: model.file,
-                model: model
+                file: file
             });
         };
-        const gltf = await loader.loadAsync(url, progress);
+        const gltf = await loader.loadAsync(manager.fileURL, progress);
         if (!this.viewer.scene) return this;
         this.viewer.scene.add(gltf.scene);
         this.viewer.models.push(gltf.scene);
@@ -2448,37 +2448,36 @@ class GLTFModelLoader extends Loader {
         this.viewer.emitEvent({
             type: "databasechunk",
             data: gltf.scene,
-            file: model.file,
-            model: model
+            file: file
         });
         return this;
     }
 }
 
-class GLTFFileLoader extends Loader {
+class GLTFCloudModelLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
     }
-    isSupport(file, format) {
-        return (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) && /(gltf|glb)$/i.test(format);
+    isSupport(model) {
+        return typeof model === "object" && typeof model.database === "string" && typeof model.downloadResource === "function" && /.gltf$/i.test(model.database);
     }
-    async load(buffer, format, params) {
-        const manager = new GLTFLoadingManager(buffer, params);
+    async load(model) {
+        const url = `${model.httpClient.serverUrl}${model.path}/${model.database}`;
+        const manager = new GLTFLoadingManager(url);
         const loader = new GLTFLoader(manager);
-        loader.setPath(manager.path);
-        loader.setCrossOrigin(params.crossOrigin || loader.crossOrigin);
-        loader.setWithCredentials(params.withCredentials || loader.withCredentials);
+        loader.setRequestHeader(model.httpClient.headers);
         const progress = event => {
             const {lengthComputable: lengthComputable, loaded: loaded, total: total} = event;
             const progress = lengthComputable ? loaded / total : 1;
             this.viewer.emitEvent({
                 type: "geometryprogress",
                 data: progress,
-                file: buffer
+                file: model.file,
+                model: model
             });
         };
-        const gltf = await loader.loadAsync(manager.fileURL, progress);
+        const gltf = await loader.loadAsync(url, progress);
         if (!this.viewer.scene) return this;
         this.viewer.scene.add(gltf.scene);
         this.viewer.models.push(gltf.scene);
@@ -2488,7 +2487,8 @@ class GLTFFileLoader extends Loader {
         this.viewer.emitEvent({
             type: "databasechunk",
             data: gltf.scene,
-            file: buffer
+            file: model.file,
+            model: model
         });
         return this;
     }
@@ -2496,10 +2496,10 @@ class GLTFFileLoader extends Loader {
 
 const loaders = loadersRegistry("threejs");
 
-loaders.registerLoader("gltf", (viewer => new GLTFModelLoader(viewer)));
-
 loaders.registerLoader("gltf-file", (viewer => new GLTFFileLoader(viewer)));
 
+loaders.registerLoader("gltf-cloud-model", (viewer => new GLTFCloudModelLoader(viewer)));
+
 class Viewer extends EventEmitter2 {
     constructor(client) {
         super();
@@ -2577,24 +2577,24 @@ class Viewer extends EventEmitter2 {
     }
     dispose() {
         this.cancel();
+        this.clear();
         this.emitEvent({
             type: "dispose"
         });
+        this.removeAllListeners();
+        this.setActiveDragger();
         this._components.forEach((component => component.dispose()));
         this._components = [];
-        this.setActiveDragger();
-        this.removeAllListeners();
-        this.clear();
         this._markup.dispose();
         if (this.canvas) {
             this.canvasEvents.forEach((x => this.canvas.removeEventListener(x, this.canvaseventlistener)));
             this.canvas = undefined;
         }
         if (this.renderer) this.renderer.dispose();
+        this.helpers = undefined;
+        this.scene = undefined;
         this.renderer = undefined;
         this.camera = undefined;
-        this.scene = undefined;
-        this.helpers = undefined;
         return this;
     }
     isInitialized() {