@inweb/viewer-visualize 26.9.0 → 26.9.2

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

@@ -5,5 +5,5 @@ export declare class ResizeCanvasComponent implements IComponent {
     protected resizeObserver: ResizeObserver;
     constructor(viewer: Viewer);
     dispose(): void;
-    resizeViewer: () => void;
+    resizeViewer: (entries: ResizeObserverEntry[]) => void;
 }

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

@@ -49,10 +49,9 @@ import { ILoadersRegistry } from "@inweb/viewer-core";
  *
  *     this.viewer.visualizeJs.getViewer().parseVsfx(data);
  *
- *     this.viewer.syncOpenCloudVisualStyle(false);
  *     this.viewer.syncOptions();
  *     this.viewer.syncOverlay();
- *     this.viewer.resize();
+ *     this.viewer.update();
  *
  *     this.viewer.emitEvent({ type: "databasechunk", data, file });
  *

package/lib/Viewer/Viewer.d.ts

@@ -11,13 +11,14 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     private _activeDragger;
     private _components;
     private _enableAutoUpdate;
-    private _isNeedRender;
-    private _isRunAsyncUpdate;
+    private _renderNeeded;
     private _renderTime;
+    private _isRunAsyncUpdate;
     protected _options: Options;
     protected _visualizeJsUrl: string;
     protected _visualizeJs: any;
     protected _visualizeTimestamp: number;
+    protected _viewer: any;
     protected _crossOrigin: any;
     private canvaseventlistener;
     canvasEvents: string[];
@@ -103,7 +104,8 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      * Returns `true` if `VisualizeJS` module has been loaded and initialized.
      */
     isInitialized(): boolean;
-    render(time: DOMHighResTimeStamp): void;
+    setSize(width: number, height: number, updateStyle?: boolean): void;
+    render(time?: DOMHighResTimeStamp): void;
     resize(): this;
     /**
      * Updates the viewer.
@@ -150,7 +152,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      * instance.
      */
     visViewer(): any;
-    syncOpenCloudVisualStyle(isInitializing: boolean): this;
+    syncOpenCloudVisualStyle(): this;
     syncOptions(options?: IOptions): this;
     syncHighlightingOptions(options?: IOptions): this;
     get draggers(): string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "26.9.0",
+  "version": "26.9.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": "~26.9.0",
-    "@inweb/eventemitter2": "~26.9.0",
-    "@inweb/markup": "~26.9.0",
-    "@inweb/viewer-core": "~26.9.0"
+    "@inweb/client": "~26.9.2",
+    "@inweb/eventemitter2": "~26.9.2",
+    "@inweb/markup": "~26.9.2",
+    "@inweb/viewer-core": "~26.9.2"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Commands/ApplyModelTransform.ts

@@ -44,7 +44,7 @@ export function applyModelTransform(viewer: Viewer, model: Model | File | Assemb
   if (!model.getModelTransformMatrix) return; // Model.getModelTransformMatrix() since 24.3.14
 
   const visLib = viewer.visLib();
-  const visViewer = visLib.getViewer();
+  const visViewer = viewer.visViewer();
 
   const modelItr = visViewer.getModelIterator();
   for (; !modelItr.done(); modelItr.step()) {

package/src/Viewer/Commands/AutoTransformAllModelsToCentralPoint.ts

@@ -37,7 +37,7 @@ export async function autoTransformAllModelsToCentralPoint(
   if (!model.getModelTransformMatrix) return; // Model.getModelTransformMatrix() since 24.3.14
 
   const visLib = viewer.visLib();
-  const visViewer = visLib.getViewer();
+  const visViewer = viewer.visViewer();
 
   const viewExt = visViewer.getActiveExtents();
   const centralPoint = viewExt.center();

package/src/Viewer/Commands/SetSelected.ts

@@ -27,7 +27,7 @@ export function setSelected(viewer: Viewer, handles: string[] = []): void {
   if (!viewer.visualizeJs) return;
 
   const visLib = viewer.visLib();
-  const visViewer = visLib.getViewer();
+  const visViewer = viewer.visViewer();
 
   const selectionSet = new visLib.OdTvSelectionSet();
   handles?.forEach((handle) => {

package/src/Viewer/Components/ResizeCanvasComponent.ts

@@ -38,7 +38,11 @@ export class ResizeCanvasComponent implements IComponent {
     this.resizeObserver.disconnect();
   }
 
-  resizeViewer = () => {
-    this.viewer.resize();
+  resizeViewer = (entries: ResizeObserverEntry[]) => {
+    const { width, height } = entries[0].contentRect;
+
+    if (!width || !height) return; // <- invisible viewer, or viewer with parent removed
+
+    this.viewer.setSize(width, height);
   };
 }

package/src/Viewer/Draggers/Actions/OrbitAction.ts

@@ -101,6 +101,12 @@ export class OrbitAction {
     extView.delete();
 
     this._subject.activeDragger()?.updatePreview?.();
+    this._subject.emitEvent({
+      type: "orbit",
+    });
+    this._subject.emitEvent({
+      type: "changecamera",
+    });
   }
 
   public endAction() {

package/src/Viewer/Draggers/Actions/PanAction.ts

@@ -88,6 +88,9 @@ export class PanAction {
       dX: absoluteX - this._deltaScreenPosition.x,
       dY: absoluteY - this._deltaScreenPosition.y,
     });
+    this._subject.emitEvent({
+      type: "changecamera",
+    });
 
     this._deltaScreenPosition = { x: absoluteX, y: absoluteY };
   }

package/src/Viewer/Draggers/Actions/ZoomAction.ts

@@ -37,6 +37,7 @@ export class ZoomAction {
     viewer.zoomAt(zoomFactor, x, y);
 
     this._subject.deviceAutoRegeneration();
+
     this._subject.activeDragger()?.updatePreview?.();
     this._subject.emitEvent({
       type: "zoomat",
@@ -44,5 +45,8 @@ export class ZoomAction {
       x: absoluteX,
       y: absoluteY,
     });
+    this._subject.emitEvent({
+      type: "changecamera",
+    });
   }
 }

package/src/Viewer/Draggers/OdaWalkDragger.ts

@@ -205,7 +205,9 @@ export class OdaWalkDragger extends OdBaseDragger {
             break;
         }
       }
+
       this.subject.update();
+      this.subject.emitEvent({ type: "changecamera" });
     }
 
     this.lastFrameTS = timestamp;
@@ -223,7 +225,9 @@ export class OdaWalkDragger extends OdBaseDragger {
 
       if (dltX !== 0.0) this.turnLeft(-dltX * this.deltaAngle);
       if (dltY !== 0.0) this.cameraWalker.turnDown(dltY * this.deltaAngle);
+
       this.subject.update();
+      this.subject.emitEvent({ type: "changecamera" });
     }
   }
 

package/src/Viewer/Loaders/VSFCloudLoader.ts

@@ -44,9 +44,7 @@ export class VSFCloudLoader extends Loader {
   override async load(model: any, format?: string): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
-    const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
-
+    const visViewer = this.viewer.visViewer();
     const filesToDownload = [model.database, ...model.geometry];
 
     console.time("File load time");
@@ -60,18 +58,21 @@ export class VSFCloudLoader extends Loader {
       };
 
       const arrayBuffer = await model.downloadResource(dataId, progress, this.abortController.signal);
+      const data = new Uint8Array(arrayBuffer);
+
       if (!this.viewer.visualizeJs) return this;
 
-      const data = new Uint8Array(arrayBuffer);
-      visViewer.parseStream(data);
+      try {
+        visViewer.parseStream(data);
+      } catch (error: any) {
+        console.error("VSF parse error.", error);
+        throw error;
+      }
 
       if (i === 0) {
-        this.viewer.update(true);
-
-        this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.resize();
+        this.viewer.update(true);
 
         this.viewer.emitEvent({ type: "databasechunk", data, file: model.file, model });
       } else {

package/src/Viewer/Loaders/VSFFileLoader.ts

@@ -43,6 +43,8 @@ export class VSFFileLoader extends Loader {
   override async load(file: any, format?: string, params?: LoadParams): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
+    const visViewer = this.viewer.visViewer();
+
     const progress = (event: ProgressEvent) => {
       const { lengthComputable, loaded, total } = event;
       const progress = lengthComputable ? loaded / total : 1;
@@ -54,18 +56,21 @@ export class VSFFileLoader extends Loader {
     loader.setWithCredentials(params.withCredentials);
     loader.setAbortSignal(this.abortController.signal);
 
-    const buffer = await loader.load(file, progress);
-    const data = new Uint8Array(buffer);
+    const arrayBuffer = await loader.load(file, progress);
+    const data = new Uint8Array(arrayBuffer);
 
-    const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
+    if (!this.viewer.visualizeJs) return this;
 
-    visViewer.parseFile(data);
+    try {
+      visViewer.parseFile(data);
+    } catch (error: any) {
+      console.error("VSF parse error.", error);
+      throw error;
+    }
 
-    this.viewer.syncOpenCloudVisualStyle(false);
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.resize();
+    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file });
 

package/src/Viewer/Loaders/VSFXCloudLoader.ts

@@ -45,8 +45,7 @@ export class VSFXCloudLoader extends Loader {
   override async load(model: any, format?: string, params: any = {}): Promise<this> {
     if (!this.viewer.visualizeJs) return Promise.resolve(this);
 
-    const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
+    const visViewer = this.viewer.visViewer();
 
     const progress = (progress: number) => {
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
@@ -55,10 +54,10 @@ export class VSFXCloudLoader extends Loader {
     console.time("File load time");
 
     const arrayBuffer = await model.downloadResource(model.database, progress, this.abortController.signal);
-    if (!this.viewer.visualizeJs) return this;
-
     const data = new Uint8Array(arrayBuffer);
 
+    if (!this.viewer.visualizeJs) return this;
+
     try {
       visViewer.parseVsfx(data);
     } catch (error: any) {
@@ -66,10 +65,9 @@ export class VSFXCloudLoader extends Loader {
       throw error;
     }
 
-    this.viewer.syncOpenCloudVisualStyle(false);
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.resize();
+    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file: model.file, model });
 

package/src/Viewer/Loaders/VSFXCloudPartialLoader.ts

@@ -52,8 +52,7 @@ export class VSFXCloudPartialLoader extends Loader {
   override async load(model: any, format?: string): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
-    const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
+    const visViewer = this.viewer.visViewer();
     let servicePartAborted = false;
 
     const pendingRequestsMap = new Map();
@@ -71,28 +70,24 @@ export class VSFXCloudPartialLoader extends Loader {
     const chunkLoadHandler = (progress: number, chunk: Uint8Array, requestId = 0) => {
       if (!this.viewer.visualizeJs) return;
 
-      let state: boolean;
+      let isDatabaseChunk: boolean;
       try {
-        state = visViewer.parseVsfxInPartialMode(requestId, chunk);
+        isDatabaseChunk = visViewer.parseVsfxInPartialMode(requestId, chunk);
       } catch (error: any) {
         console.error("VSFX parse error.", error);
         throw error;
       }
 
-      updateController.update(UpdateType.kDelay);
-
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
 
-      if (state) {
-        updateController.update(UpdateType.kForce);
-
-        this.viewer.syncOpenCloudVisualStyle(false);
+      if (isDatabaseChunk) {
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.resize();
 
+        updateController.update(UpdateType.kForce);
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
       } else {
+        updateController.update(UpdateType.kDelay);
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
       }
     };

package/src/Viewer/Loaders/VSFXCloudStreamingLoader.ts

@@ -49,7 +49,7 @@ export class VSFXCloudStreamingLoader extends Loader {
     if (!this.viewer.visualizeJs) return this;
 
     const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
+    const visViewer = this.viewer.visViewer();
 
     const updateController = new UpdateController();
     updateController.initialize(this.viewer);
@@ -59,7 +59,7 @@ export class VSFXCloudStreamingLoader extends Loader {
     const chunkLoadHandler = (progress: number, chunk: Uint8Array) => {
       if (!this.viewer.visualizeJs) return;
 
-      let status;
+      let status: any;
       try {
         status = visViewer.parseVsfx(chunk);
       } catch (error: any) {
@@ -67,29 +67,25 @@ export class VSFXCloudStreamingLoader extends Loader {
         throw error;
       }
 
-      updateController.update(UpdateType.kDelay);
-
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
 
-      let state = false;
+      let isDatabaseChunk = false;
       if (
         status === visLib.DatabaseStreamStatus.ReadyServiceData ||
         (status === visLib.DatabaseStreamStatus.Complete && !isFireDatabaseChunk)
       ) {
         isFireDatabaseChunk = true;
-        state = true;
+        isDatabaseChunk = true;
       }
 
-      if (state) {
-        updateController.update(UpdateType.kForce);
-
-        this.viewer.syncOpenCloudVisualStyle(false);
+      if (isDatabaseChunk) {
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
-        this.viewer.resize();
 
+        updateController.update(UpdateType.kForce);
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
       } else {
+        updateController.update(UpdateType.kDelay);
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
       }
     };

package/src/Viewer/Loaders/VSFXFileLoader.ts

@@ -43,6 +43,8 @@ export class VSFXFileLoader extends Loader {
   override async load(file: any, format?: string, params?: LoadParams): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
+    const visViewer = this.viewer.visViewer();
+
     const progress = (event: ProgressEvent) => {
       const { lengthComputable, loaded, total } = event;
       const progress = lengthComputable ? loaded / total : 1;
@@ -54,18 +56,21 @@ export class VSFXFileLoader extends Loader {
     loader.setWithCredentials(params.withCredentials);
     loader.setAbortSignal(this.abortController.signal);
 
-    const buffer = await loader.load(file, progress);
-    const data = new Uint8Array(buffer);
+    const arrayBuffer = await loader.load(file, progress);
+    const data = new Uint8Array(arrayBuffer);
 
-    const visLib = this.viewer.visLib();
-    const visViewer = visLib.getViewer();
+    if (!this.viewer.visualizeJs) return this;
 
-    visViewer.parseVsfx(data);
+    try {
+      visViewer.parseVsfx(data);
+    } catch (error: any) {
+      console.error("VSFX parse error.", error);
+      throw error;
+    }
 
-    this.viewer.syncOpenCloudVisualStyle(false);
     this.viewer.syncOptions();
     this.viewer.syncOverlay();
-    this.viewer.resize();
+    this.viewer.update(true);
 
     this.viewer.emitEvent({ type: "databasechunk", data, file });
 

package/src/Viewer/Loaders/index.ts

@@ -81,10 +81,9 @@ import { VSFXCloudPartialLoader } from "./VSFXCloudPartialLoader";
  *
  *     this.viewer.visualizeJs.getViewer().parseVsfx(data);
  *
- *     this.viewer.syncOpenCloudVisualStyle(false);
  *     this.viewer.syncOptions();
  *     this.viewer.syncOverlay();
- *     this.viewer.resize();
+ *     this.viewer.update();
  *
  *     this.viewer.emitEvent({ type: "databasechunk", data, file });
  *

package/src/Viewer/Markup/Visualize/VisualizeMarkup.ts

@@ -108,7 +108,7 @@ export class VisualizeMarkup implements IMarkup {
     if (!this._viewer.visualizeJs) return;
 
     const visLib = this._viewer.visLib();
-    const visViewer = visLib.getViewer();
+    const visViewer = this._viewer.visViewer();
     const activeView = visViewer.activeView;
 
     this._viewer.syncOverlay();
@@ -165,7 +165,7 @@ export class VisualizeMarkup implements IMarkup {
     }
 
     const visLib = this._viewer.visLib();
-    const visViewer = visLib.getViewer();
+    const visViewer = this._viewer.visViewer();
 
     if (!viewpoint) viewpoint = {};