@inweb/viewer-three 26.6.2 → 26.6.3

package/lib/Viewer/loaders/{GLTFModelLoader.d.ts → GLTFCloudModelLoader.d.ts}

@@ -1,6 +1,6 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
-export declare class GLTFModelLoader extends Loader {
+export declare class GLTFCloudModelLoader extends Loader {
     viewer: Viewer;
     constructor(viewer: Viewer);
     isSupport(model: any): boolean;

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

@@ -5,5 +5,5 @@ export declare class GLTFFileLoader extends Loader {
     viewer: Viewer;
     constructor(viewer: Viewer);
     isSupport(file: any, format?: string): boolean;
-    load(buffer: any, format?: string, params?: GLTFLoadParams): Promise<this>;
+    load(file: any, format?: string, params?: GLTFLoadParams): Promise<this>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.6.2",
+  "version": "26.6.3",
   "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",
@@ -31,10 +31,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.6.2",
-    "@inweb/eventemitter2": "~26.6.2",
-    "@inweb/markup": "~26.6.2",
-    "@inweb/viewer-core": "~26.6.2"
+    "@inweb/client": "~26.6.3",
+    "@inweb/eventemitter2": "~26.6.3",
+    "@inweb/markup": "~26.6.3",
+    "@inweb/viewer-core": "~26.6.3"
   },
   "devDependencies": {
     "@types/three": "^0.173.0",

package/plugins/loaders/{IFCXModelLoader.ts → IFCXCloudFileLoader.ts}

@@ -24,7 +24,7 @@
 import { Loader, Viewer } from "@inweb/viewer-three";
 import { parse, clear } from "./IFCX/render.js";
 
-export class IFCXModelLoader extends Loader {
+export class IFCXCloudFileLoader extends Loader {
   public viewer: Viewer;
 
   constructor(viewer: Viewer) {
@@ -41,12 +41,12 @@ export class IFCXModelLoader extends Loader {
     );
   }
 
-  override async load(model: any): Promise<this> {
+  override async load(file: any): Promise<this> {
     const progress = (progress: number) => {
-      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model });
+      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file });
     };
 
-    const arrayBuffer = await model.download(progress, this.abortController.signal);
+    const arrayBuffer = await file.download(progress, this.abortController.signal);
     if (!this.viewer.scene) return this;
 
     const textDecoder = new TextDecoder();
@@ -56,7 +56,7 @@ export class IFCXModelLoader extends Loader {
     clear();
 
     let handle = 0;
-    scene.traverse((object) => {
+    scene.traverse((object: any) => {
       object.userData = { handle, ...object.userData };
       handle++;
     });
@@ -68,7 +68,7 @@ export class IFCXModelLoader extends Loader {
     this.viewer.syncOverlay();
     this.viewer.update();
 
-    this.viewer.emitEvent({ type: "databasechunk", data: scene, file: model });
+    this.viewer.emitEvent({ type: "databasechunk", data: scene, file });
 
     return this;
   }

package/plugins/loaders/IFCXLoader.ts

@@ -23,8 +23,8 @@
 
 import { loaders } from "@inweb/viewer-three";
 
-import { IFCXModelLoader } from "./IFCXModelLoader";
 import { IFCXFileLoader } from "./IFCXFileLoader";
+import { IFCXCloudFileLoader } from "./IFCXCloudFileLoader";
 
-loaders.registerLoader("ifcx", (viewer: any) => new IFCXModelLoader(viewer));
 loaders.registerLoader("ifcx-file", (viewer: any) => new IFCXFileLoader(viewer));
+loaders.registerLoader("ifcx-cloud-file", (viewer: any) => new IFCXCloudFileLoader(viewer));

package/src/Viewer/Viewer.ts

@@ -192,15 +192,15 @@ export class Viewer
 
   dispose(): this {
     this.cancel();
-    this.emitEvent({ type: "dispose" });
+    this.clear();
 
-    this._components.forEach((component: IComponent) => component.dispose());
-    this._components = [];
+    this.emitEvent({ type: "dispose" });
+    this.removeAllListeners();
 
     this.setActiveDragger();
-    this.removeAllListeners();
 
-    this.clear();
+    this._components.forEach((component: IComponent) => component.dispose());
+    this._components = [];
 
     this._markup.dispose();
 
@@ -211,10 +211,10 @@ export class Viewer
 
     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;
   }

package/src/Viewer/components/index.ts

@@ -83,5 +83,4 @@ components.registerComponent("ResizeCanvasComponent", (viewer) => new ResizeCanv
 components.registerComponent("RenderLoopComponent", (viewer) => new RenderLoopComponent(viewer));
 components.registerComponent("HighlighterComponent", (viewer) => new HighlighterComponent(viewer));
 components.registerComponent("SelectionComponent", (viewer) => new SelectionComponent(viewer));
-
 components.registerComponent("WCSHelperComponent", (viewer) => new WCSHelperComponent(viewer));

package/src/Viewer/loaders/{GLTFModelLoader.ts → GLTFCloudModelLoader.ts}

@@ -27,7 +27,7 @@ import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { GLTFLoadingManager } from "./GLTFLoadingManager";
 
-export class GLTFModelLoader extends Loader {
+export class GLTFCloudModelLoader extends Loader {
   public viewer: Viewer;
 
   constructor(viewer: Viewer) {

package/src/Viewer/loaders/GLTFFileLoader.ts

@@ -42,8 +42,8 @@ export class GLTFFileLoader extends Loader {
     );
   }
 
-  override async load(buffer: any, format?: string, params?: GLTFLoadParams): Promise<this> {
-    const manager = new GLTFLoadingManager(buffer, params);
+  override async load(file: any, format?: string, params?: GLTFLoadParams): Promise<this> {
+    const manager = new GLTFLoadingManager(file, params);
 
     const loader = new GLTFLoader(manager);
     loader.setPath(manager.path);
@@ -53,7 +53,7 @@ export class GLTFFileLoader extends Loader {
     const progress = (event: ProgressEvent) => {
       const { lengthComputable, loaded, total } = event;
       const progress = lengthComputable ? loaded / total : 1;
-      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: buffer });
+      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file });
     };
 
     const gltf = await loader.loadAsync(manager.fileURL, progress);
@@ -66,7 +66,7 @@ export class GLTFFileLoader extends Loader {
     this.viewer.syncOverlay();
     this.viewer.update();
 
-    this.viewer.emitEvent({ type: "databasechunk", data: gltf.scene, file: buffer });
+    this.viewer.emitEvent({ type: "databasechunk", data: gltf.scene, file });
 
     return this;
   }

package/src/Viewer/loaders/index.ts

@@ -23,8 +23,8 @@
 
 import { ILoadersRegistry, loadersRegistry } from "@inweb/viewer-core";
 
-import { GLTFModelLoader } from "./GLTFModelLoader";
 import { GLTFFileLoader } from "./GLTFFileLoader";
+import { GLTFCloudModelLoader } from "./GLTFCloudModelLoader";
 
 /**
  * Viewer loaders registry. Use this registry to register custom loaders.
@@ -95,5 +95,5 @@ export const loaders: ILoadersRegistry = loadersRegistry("threejs");
 
 // build-in loaders
 
-loaders.registerLoader("gltf", (viewer: any) => new GLTFModelLoader(viewer));
 loaders.registerLoader("gltf-file", (viewer: any) => new GLTFFileLoader(viewer));
+loaders.registerLoader("gltf-cloud-model", (viewer: any) => new GLTFCloudModelLoader(viewer));