@inweb/viewer-visualize 27.1.0 → 27.1.2

package/lib/Viewer/Components/RenderLoopComponent.d.ts

@@ -5,5 +5,5 @@ export declare class RenderLoopComponent implements IComponent {
     protected requestId: number;
     constructor(viewer: Viewer);
     dispose(): void;
-    animate: (time?: number) => void;
+    animate: (time: number) => void;
 }

package/lib/Viewer/Loaders/index.d.ts

@@ -55,11 +55,12 @@ import { ILoadersRegistry } from "@inweb/viewer-core";
  *
  *     this.viewer.syncOptions();
  *     this.viewer.syncOverlay();
- *     this.viewer.update();
  *
  *     this.viewer.emitEvent({ type: "geometryprogress", data: 1, file });
  *     this.viewer.emitEvent({ type: "databasechunk", data, file });
  *
+ *     this.viewer.update(true);
+ *
  *     return Promise.resove(this);
  *   };
  * }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "27.1.0",
+  "version": "27.1.2",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using VisualizeJS",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~27.1.0",
-    "@inweb/eventemitter2": "~27.1.0",
-    "@inweb/markup": "~27.1.0",
-    "@inweb/viewer-core": "~27.1.0"
+    "@inweb/client": "~27.1.2",
+    "@inweb/eventemitter2": "~27.1.2",
+    "@inweb/markup": "~27.1.2",
+    "@inweb/viewer-core": "~27.1.2"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Components/RenderLoopComponent.ts

@@ -30,14 +30,14 @@ export class RenderLoopComponent implements IComponent {
 
   constructor(viewer: Viewer) {
     this.viewer = viewer;
-    this.animate();
+    this.requestId = requestAnimationFrame(this.animate);
   }
 
   dispose() {
     cancelAnimationFrame(this.requestId);
   }
 
-  animate = (time = 0) => {
+  animate = (time: number) => {
     this.requestId = requestAnimationFrame(this.animate);
 
     this.viewer.render(time);

package/src/Viewer/Loaders/VSFCloudLoader.ts

@@ -76,12 +76,12 @@ export class VSFCloudLoader extends Loader {
 
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.update(true);
 
         this.viewer.emitEvent({ type: "databasechunk", data, file: model.file, model });
+        this.viewer.update(true);
       } else {
-        this.viewer.update();
         this.viewer.emitEvent({ type: "geometrychunk", data, file: model.file, model });
+        this.viewer.update();
       }
     }
 

package/src/Viewer/Loaders/VSFFileLoader.ts

@@ -76,9 +76,9 @@ export class VSFFileLoader extends Loader {
 
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file });
+    this.viewer.update(true);
 
     return this;
   }

package/src/Viewer/Loaders/VSFXCloudLoader.ts

@@ -71,9 +71,9 @@ export class VSFXCloudLoader extends Loader {
 
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file: model.file, model });
+    this.viewer.update(true);
 
     return this;
   }

package/src/Viewer/Loaders/VSFXCloudPartialLoader.ts

@@ -85,12 +85,12 @@ export class VSFXCloudPartialLoader extends Loader {
 
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.update(true);
 
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
+        this.viewer.update(true);
       } else {
-        this.viewer.update();
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
+        this.viewer.update();
       }
     };
 

package/src/Viewer/Loaders/VSFXCloudStreamingLoader.ts

@@ -83,12 +83,12 @@ export class VSFXCloudStreamingLoader extends Loader {
 
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.update(true);
 
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
+        this.viewer.update(true);
       } else {
-        this.viewer.update();
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
+        this.viewer.update();
       }
     };
 

package/src/Viewer/Loaders/VSFXFileLoader.ts

@@ -76,9 +76,9 @@ export class VSFXFileLoader extends Loader {
 
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file });
+    this.viewer.update(true);
 
     return this;
   }

package/src/Viewer/Loaders/index.ts

@@ -87,11 +87,12 @@ import { VSFXCloudPartialLoader } from "./VSFXCloudPartialLoader";
  *
  *     this.viewer.syncOptions();
  *     this.viewer.syncOverlay();
- *     this.viewer.update();
  *
  *     this.viewer.emitEvent({ type: "geometryprogress", data: 1, file });
  *     this.viewer.emitEvent({ type: "databasechunk", data, file });
  *
+ *     this.viewer.update(true);
+ *
  *     return Promise.resove(this);
  *   };
  * }

package/src/Viewer/Viewer.ts

@@ -284,9 +284,9 @@ export class Viewer
     this.syncOverlay();
 
     this._renderTime = performance.now();
-    this.render(this._renderTime);
 
     this.emitEvent({ type: "initialize" });
+    this.update(true);
 
     return this;
   }
@@ -339,8 +339,8 @@ export class Viewer
 
     this._viewer.resize(0, this.canvas.width, this.canvas.height, 0);
 
-    this.update(true);
     this.emitEvent({ type: "resize", width, height });
+    this.update(true);
   }
 
   resize(): this {
@@ -435,6 +435,8 @@ export class Viewer
   }
 
   applyModelTransformMatrix(model: Model | Assembly) {
+    if (!this.visualizeJs) return;
+
     this.executeCommand("applyModelTransform", model);
   }
 
@@ -546,31 +548,29 @@ export class Viewer
     if (model && typeof model.database === "string") {
       file = model.file;
     }
-    if (!model) throw new Error(`Format not supported`);
 
     let format = params.format;
-    if (!format && typeof file["type"] === "string") format = file["type"].split(".").pop();
+    if (!format && file && typeof file["type"] === "string") format = file["type"].split(".").pop();
     if (!format && typeof file === "string") format = file.split(".").pop();
     if (!format && file instanceof globalThis.File) format = file.name.split(".").pop();
 
     const loader = loaders.createLoader(this, model, format);
-    if (!loader) throw new Error(`Format not supported`);
+    if (!loader) throw new Error(`Format not supported (${format})`);
     this.loaders.push(loader);
 
     this.emitEvent({ type: "geometrystart", file, model });
     try {
       await this.loadReferences(model);
       await loader.load(model, format, params);
+
+      this.applyModelTransformMatrix(model);
+      this.applySceneGraphSettings();
     } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error, file, model });
       throw error;
     }
     this.emitEvent({ type: "geometryend", file, model });
-
-    if (this.visualizeJs) {
-      this.applyModelTransformMatrix(model);
-      this.applySceneGraphSettings();
-    }
+    this.update(true);
 
     return this;
   }
@@ -601,7 +601,6 @@ export class Viewer
 
       this.syncOptions();
       this.syncOverlay();
-      this.update(true);
 
       this.emitEvent({ type: "geometryprogress", data: 1, file: "", buffer });
       this.emitEvent({ type: "databasechunk", data, file: "", buffer });
@@ -610,6 +609,7 @@ export class Viewer
       throw error;
     }
     this.emitEvent({ type: "geometryend", file: "", buffer });
+    this.update(true);
 
     return this;
   }
@@ -640,7 +640,6 @@ export class Viewer
 
       this.syncOptions();
       this.syncOverlay();
-      this.update(true);
 
       this.emitEvent({ type: "geometryprogress", data: 1, file: "", buffer });
       this.emitEvent({ type: "databasechunk", data, file: "", buffer });
@@ -649,6 +648,7 @@ export class Viewer
       throw error;
     }
     this.emitEvent({ type: "geometryend", file: "", buffer });
+    this.update(true);
 
     return this;
   }
@@ -684,9 +684,9 @@ export class Viewer
 
     this.syncOptions();
     this.syncOverlay();
-    this.update(true);
 
     this.emitEvent({ type: "clear" });
+    this.update(true);
 
     return this;
   }
@@ -1104,10 +1104,10 @@ export class Viewer
     this._markup.setViewpoint(viewpoint);
 
     this.syncOverlay();
-
     this.setActiveDragger(draggerName);
+
     this.emitEvent({ type: "drawviewpoint", data: viewpoint });
-    this.update();
+    this.update(true);
   }
 
   createViewpoint(): IViewpoint {