@inweb/viewer-visualize 26.6.2 → 26.6.3

package/dist/viewer-visualize.module.js

@@ -2421,7 +2421,39 @@ components.registerComponent("ZoomWheelComponent", (viewer => new ZoomWheelCompo
 
 components.registerComponent("GestureManagerComponent", (viewer => new GestureManagerComponent(viewer)));
 
-class VSFModelLoader extends Loader {
+class VSFBufferLoader extends Loader {
+    constructor(viewer) {
+        super();
+        this.viewer = viewer;
+    }
+    isSupport(file, format) {
+        return file instanceof ArrayBuffer && /vsf$/i.test(format);
+    }
+    load(buffer, format) {
+        if (!this.viewer.visualizeJs) return Promise.resolve(this);
+        const visLib = this.viewer.visLib();
+        const visViewer = visLib.getViewer();
+        const data = new Uint8Array(buffer);
+        visViewer.parseFile(data);
+        this.viewer.syncOpenCloudVisualStyle(false);
+        this.viewer.syncOptions();
+        this.viewer.syncOverlay();
+        this.viewer.resize();
+        this.viewer.emitEvent({
+            type: "geometryprogress",
+            data: 1,
+            file: buffer
+        });
+        this.viewer.emitEvent({
+            type: "databasechunk",
+            data: data,
+            file: buffer
+        });
+        return Promise.resolve(this);
+    }
+}
+
+class VSFCloudModelLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
@@ -2477,20 +2509,20 @@ class VSFModelLoader extends Loader {
     }
 }
 
-class VSFBufferLoader extends Loader {
+class VSFXBufferLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
     }
     isSupport(file, format) {
-        return file instanceof ArrayBuffer && /vsf$/i.test(format);
+        return file instanceof ArrayBuffer && /vsfx$/i.test(format);
     }
     load(buffer, format) {
         if (!this.viewer.visualizeJs) return Promise.resolve(this);
         const visLib = this.viewer.visLib();
         const visViewer = visLib.getViewer();
         const data = new Uint8Array(buffer);
-        visViewer.parseFile(data);
+        visViewer.parseVsfx(data);
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
@@ -2509,7 +2541,7 @@ class VSFBufferLoader extends Loader {
     }
 }
 
-class VSFXModelLoader extends Loader {
+class VSFXCloudModelLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
@@ -2581,13 +2613,13 @@ class UpdateController {
     }
 }
 
-class VSFXStreamingLoader extends Loader {
+class VSFXCloudStreamingLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
     }
     isSupport(file) {
-        return typeof file === "object" && typeof file.downloadResource === "function" && /.vsfx$/i.test(file.database) && this.viewer.options.enableStreamingMode === true && this.viewer.options.enablePartialMode === false && !/.rcs$/i.test(file.name);
+        return typeof file === "object" && typeof file.database === "string" && typeof file.downloadResource === "function" && /.vsfx$/i.test(file.database) && this.viewer.options.enableStreamingMode === true && this.viewer.options.enablePartialMode === false && !/.rcs$/i.test(file.name);
     }
     async load(model) {
         if (!this.viewer.visualizeJs) return this;
@@ -2644,14 +2676,14 @@ const PENDING_REQUESTS_SIZE = 50;
 
 const PENDING_REQUESTS_TIMEOUT = 250;
 
-class VSFXPartialLoader extends Loader {
+class VSFXCloudPartialLoader extends Loader {
     constructor(viewer) {
         super();
         this.viewer = viewer;
         this.abortControllerForRequestMap = new Map;
     }
     isSupport(file) {
-        return typeof file === "object" && typeof file.downloadResource === "function" && /.vsfx$/i.test(file.database) && (this.viewer.options.enablePartialMode === true || /.rcs$/i.test(file.name));
+        return typeof file === "object" && typeof file.database === "string" && typeof file.downloadResource === "function" && /.vsfx$/i.test(file.database) && (this.viewer.options.enablePartialMode === true || /.rcs$/i.test(file.name));
     }
     async load(model, format) {
         if (!this.viewer.visualizeJs) return this;
@@ -2820,51 +2852,19 @@ class VSFXPartialLoader extends Loader {
     }
 }
 
-class VSFXBufferLoader extends Loader {
-    constructor(viewer) {
-        super();
-        this.viewer = viewer;
-    }
-    isSupport(file, format) {
-        return file instanceof ArrayBuffer && /vsfx$/i.test(format);
-    }
-    load(buffer, format) {
-        if (!this.viewer.visualizeJs) return Promise.resolve(this);
-        const visLib = this.viewer.visLib();
-        const visViewer = visLib.getViewer();
-        const data = new Uint8Array(buffer);
-        visViewer.parseVsfx(data);
-        this.viewer.syncOpenCloudVisualStyle(false);
-        this.viewer.syncOptions();
-        this.viewer.syncOverlay();
-        this.viewer.resize();
-        this.viewer.emitEvent({
-            type: "geometryprogress",
-            data: 1,
-            file: buffer
-        });
-        this.viewer.emitEvent({
-            type: "databasechunk",
-            data: data,
-            file: buffer
-        });
-        return Promise.resolve(this);
-    }
-}
-
 const loaders = loadersRegistry("visualizejs");
 
-loaders.registerLoader("vsf", (viewer => new VSFModelLoader(viewer)));
-
 loaders.registerLoader("vsf-buffer", (viewer => new VSFBufferLoader(viewer)));
 
-loaders.registerLoader("vsfx", (viewer => new VSFXModelLoader(viewer)));
+loaders.registerLoader("vsf-cloud-model", (viewer => new VSFCloudModelLoader(viewer)));
 
-loaders.registerLoader("vsfx-streaming", (viewer => new VSFXStreamingLoader(viewer)));
+loaders.registerLoader("vsfx-buffer", (viewer => new VSFXBufferLoader(viewer)));
 
-loaders.registerLoader("vsfx-partial", (viewer => new VSFXPartialLoader(viewer)));
+loaders.registerLoader("vsfx-cloud-model", (viewer => new VSFXCloudModelLoader(viewer)));
 
-loaders.registerLoader("vsfx-buffer", (viewer => new VSFXBufferLoader(viewer)));
+loaders.registerLoader("vsfx-cloud-streaming", (viewer => new VSFXCloudStreamingLoader(viewer)));
+
+loaders.registerLoader("vsfx-cloud-partial", (viewer => new VSFXCloudPartialLoader(viewer)));
 
 function loadScript(url, params = {}) {
     return new Promise(((resolve, reject) => {
@@ -3326,13 +3326,14 @@ 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._markup.dispose();
         if (this.canvas) {
             this.canvasEvents.forEach((x => this.canvas.removeEventListener(x, this.canvaseventlistener)));