@inweb/viewer-visualize 25.11.0 → 25.11.2

package/lib/Viewer/Markup/Visualize/VisualizeMarkup.d.ts

@@ -24,7 +24,7 @@ export declare class VisualizeMarkup implements IMarkup {
     colorizeAllMarkup(r?: number, g?: number, b?: number): void;
     colorizeSelectedMarkups(r?: number, g?: number, b?: number): void;
     setViewpoint(viewpoint: IViewpoint): void;
-    getViewpoint(): IViewpoint;
+    getViewpoint(viewpoint: IViewpoint): IViewpoint;
     enableEditMode(mode: MarkupMode | false): this;
     createObject(type: string, params: any): IMarkupObject;
     getObjects(): IMarkupObject[];

package/lib/Viewer/Viewer.d.ts

@@ -148,9 +148,9 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     syncOptions(options?: IOptions): this;
     syncHighlightingOptions(options?: IOptions): this;
     /**
-     * List of names of registered draggers.
+     * List of names of available draggers.
      *
-     * The following draggers are registered by default:
+     * The following draggers are available by default:
      *
      * - `Line`
      * - `Text`
@@ -181,18 +181,9 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     activeDragger(): IDragger | null;
     setActiveDragger(name?: string): IDragger | null;
     resetActiveDragger(): void;
-    /**
-     * Removes all cutting planes.
-     */
     clearSlices(): void;
-    /**
-     * Clears the overlay view.
-     */
     clearOverlay(): void;
-    /**
-     * Creates an overlay view. Overlay view is used to draw cutting planes and `Visualize` markups.
-     */
-    syncOverlay(): any;
+    syncOverlay(): void;
     is3D(): boolean;
     screenToWorld(position: {
         x: number;
@@ -321,20 +312,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      * Adds an empty `Visualize` markup entity to the overlay.
      */
     addMarkupEntity(entityName: string): any;
-    /**
-     * Sets the viewer state to the specified viewpoint.
-     *
-     * To get a list of available viewpoints from the server for a specific file, use the
-     * `File.getViewpoints()`.
-     *
-     * @param viewpoint - Viewpoint data.
-     */
     drawViewpoint(viewpoint: IViewpoint): void;
-    /**
-     * Saves the viewer state at the viewpoint.
-     *
-     * To save a viewpoint to the server for a specific file, use the `File.saveViewpoint()`.
-     */
     createViewpoint(): IViewpoint;
     private getPoint3dFromArray;
     private getLogicalPoint3dAsArray;
@@ -342,6 +320,8 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     private setOrthogonalCameraSettings;
     private getClippingPlanes;
     private setClippingPlanes;
+    private getSelection;
+    private setSelection;
     /**
      * Executes the command denoted by the given command. If the command is not found, tries to
      * set active dragger with the specified name.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "25.11.0",
-  "description": "3D viewer powered by VisualizeJS",
+  "version": "25.11.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",
   "author": "Open Design Alliance",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~25.11.0",
-    "@inweb/eventemitter2": "~25.11.0",
-    "@inweb/markup": "~25.11.0",
-    "@inweb/viewer-core": "~25.11.0"
+    "@inweb/client": "~25.11.2",
+    "@inweb/eventemitter2": "~25.11.2",
+    "@inweb/markup": "~25.11.2",
+    "@inweb/viewer-core": "~25.11.2"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Commands/ResetView.ts

@@ -27,7 +27,7 @@ import { Viewer } from "../Viewer";
 function resetView(viewer: Viewer): void {
   if (!viewer.visualizeJs) return;
 
-  viewer.executeCommand("setActiveDragger", "");
+  viewer.executeCommand("setActiveDragger");
   viewer.executeCommand("clearSlices");
   viewer.executeCommand("clearOverlay");
   viewer.executeCommand("setMarkupColor");

package/src/Viewer/Draggers/OdaWalkDragger.ts

@@ -133,7 +133,8 @@ export class OdaWalkDragger extends OdBaseDragger {
       avp.delete();
     }
 
-    this.subject.update();
+    // CLOUD-5359 Demo Viewer crashes after the Walk Mode
+    this.subject.update(true);
     this.subject.options.enableZoomWheel = this.enableZoomWheelPreviousValue;
   }
 

package/src/Viewer/Loaders/TCSLoader.ts

@@ -63,6 +63,7 @@ export class TCSLoader extends BaseLoader {
 
           this.viewer.syncOpenCloudVisualStyle(false);
           this.viewer.syncOptions();
+          this.viewer.syncOverlay();
           this.viewer.resize();
 
           this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });

package/src/Viewer/Loaders/VsfXLoader.ts

@@ -58,6 +58,7 @@ export class VsfXLoader extends BaseLoader {
 
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
+        this.viewer.syncOverlay();
         this.viewer.resize();
       }
 

package/src/Viewer/Loaders/VsfXPartialLoader.ts

@@ -65,6 +65,7 @@ export class VsfXPartialLoader extends BaseLoader {
 
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
+        this.viewer.syncOverlay();
         this.viewer.resize();
 
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });

package/src/Viewer/Loaders/VsfXStreamingLoader.ts

@@ -61,6 +61,7 @@ export class VsfXStreamingLoader extends BaseLoader {
 
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
+        this.viewer.syncOverlay();
         this.viewer.resize();
 
         this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });

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

@@ -134,20 +134,20 @@ export class VisualizeMarkup implements IMarkup {
     this._viewer.update();
   }
 
-  getViewpoint(): IViewpoint {
+  getViewpoint(viewpoint: IViewpoint): IViewpoint {
+    if (!this._viewer.visualizeJs) return {};
+
     function getLogicalPoint3dFromArray(array) {
       return { x: array[0], y: array[1], z: array[2] };
     }
 
-    if (!this._viewer.visualizeJs) return {};
-
     const visLib = this._viewer.visLib();
     const visViewer = visLib.getViewer();
 
-    const viewpoint: IViewpoint = {
-      lines: [],
-      texts: [],
-    };
+    if (!viewpoint) viewpoint = {};
+
+    viewpoint.lines = [];
+    viewpoint.texts = [];
 
     const model = visViewer.getMarkupModel();
     const itr = model.getEntitiesIterator();
@@ -204,7 +204,6 @@ export class VisualizeMarkup implements IMarkup {
       markup_color: this.getMarkupColor(),
     };
 
-    viewpoint.description = new Date().toDateString();
     return viewpoint;
   }
 

package/src/Viewer/Viewer.ts

@@ -29,9 +29,11 @@ import {
   commands,
   Dragger,
   IClippingPlane,
+  IComponent,
   IDragger,
   IOrthogonalCamera,
   IOptions,
+  IPoint,
   IViewer,
   IViewpoint,
   Options,
@@ -253,6 +255,7 @@ export class Viewer
 
     this.syncOpenCloudVisualStyle(true);
     this.syncOptions();
+    this.syncOverlay();
 
     this._renderTime = performance.now();
     this.render(this._renderTime);
@@ -619,9 +622,9 @@ export class Viewer
   }
 
   /**
-   * List of names of registered draggers.
+   * List of names of available draggers.
    *
-   * The following draggers are registered by default:
+   * The following draggers are available by default:
    *
    * - `Line`
    * - `Text`
@@ -683,6 +686,7 @@ export class Viewer
           .join(" ");
       }
       this.emitEvent({ type: "changeactivedragger", data: name });
+      this.update();
     }
     return this._activeDragger;
   }
@@ -695,9 +699,6 @@ export class Viewer
     }
   }
 
-  /**
-   * Removes all cutting planes.
-   */
   clearSlices(): void {
     if (!this.visualizeJs) return;
 
@@ -709,9 +710,6 @@ export class Viewer
     this.update();
   }
 
-  /**
-   * Clears the overlay view.
-   */
   clearOverlay(): void {
     if (!this.visualizeJs) return;
 
@@ -719,10 +717,7 @@ export class Viewer
     this.update();
   }
 
-  /**
-   * Creates an overlay view. Overlay view is used to draw cutting planes and `Visualize` markups.
-   */
-  syncOverlay(): any {
+  syncOverlay(): void {
     if (!this.visualizeJs) return;
 
     const visViewer = this.visViewer();
@@ -998,6 +993,7 @@ export class Viewer
 
       this.syncOpenCloudVisualStyle(false);
       this.syncOptions();
+      this.syncOverlay();
       this.resize();
 
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
@@ -1047,6 +1043,7 @@ export class Viewer
 
       this.syncOpenCloudVisualStyle(false);
       this.syncOptions();
+      this.syncOverlay();
       this.resize();
 
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
@@ -1082,6 +1079,7 @@ export class Viewer
     const visViewer = visLib.getViewer();
 
     this.setActiveDragger();
+    this.clearSlices();
     this.clearOverlay();
 
     visViewer.clear();
@@ -1089,6 +1087,7 @@ export class Viewer
 
     this.syncOpenCloudVisualStyle(true);
     this.syncOptions();
+    this.syncOverlay();
     this.resize();
 
     this.emitEvent({ type: "clear" });
@@ -1157,38 +1156,50 @@ export class Viewer
     return entityId;
   }
 
-  /**
-   * Sets the viewer state to the specified viewpoint.
-   *
-   * To get a list of available viewpoints from the server for a specific file, use the
-   * `File.getViewpoints()`.
-   *
-   * @param viewpoint - Viewpoint data.
-   */
   drawViewpoint(viewpoint: IViewpoint): void {
+    if (!this.visualizeJs) return;
+
+    const draggerName = this._activeDragger?.name;
+
+    this.setActiveDragger();
+    this.clearSlices();
+    this.clearOverlay();
+
+    this.clearSelected();
+    this.showAll();
+    this.explode();
+
     this.setOrthogonalCameraSettings(viewpoint.orthogonal_camera);
     this.setClippingPlanes(viewpoint.clipping_planes);
+    this.setSelection(viewpoint.selection);
     this._markup.setViewpoint(viewpoint);
+
+    this.setActiveDragger(draggerName);
+    this.emitEvent({ type: "drawviewpoint", data: viewpoint });
+    this.update();
   }
 
-  /**
-   * Saves the viewer state at the viewpoint.
-   *
-   * To save a viewpoint to the server for a specific file, use the `File.saveViewpoint()`.
-   */
   createViewpoint(): IViewpoint {
-    const viewpoint = this._markup.getViewpoint();
+    if (!this.visualizeJs) return {};
+
+    const viewpoint: IViewpoint = {};
+
     viewpoint.orthogonal_camera = this.getOrthogonalCameraSettings();
     viewpoint.clipping_planes = this.getClippingPlanes();
+    viewpoint.selection = this.getSelection();
+    viewpoint.description = new Date().toDateString();
+    this._markup.getViewpoint(viewpoint);
+
+    this.emitEvent({ type: "createviewpoint", data: viewpoint });
 
     return viewpoint;
   }
 
-  private getPoint3dFromArray(array) {
+  private getPoint3dFromArray(array: number[]) {
     return { x: array[0], y: array[1], z: array[2] };
   }
 
-  private getLogicalPoint3dAsArray(point3d) {
+  private getLogicalPoint3dAsArray(point3d: IPoint) {
     return [point3d.x, point3d.y, point3d.z];
   }
 
@@ -1209,10 +1220,6 @@ export class Viewer
     const visViewer = this.visViewer();
     const activeView = visViewer.activeView;
 
-    this.resetActiveDragger();
-    this.clearSlices();
-    this.clearOverlay();
-
     if (settings) {
       activeView.setView(
         this.getLogicalPoint3dAsArray(settings.view_point),
@@ -1222,9 +1229,8 @@ export class Viewer
         settings.field_height,
         true
       );
+      this.syncOverlay();
     }
-
-    this.syncOverlay();
   }
 
   private getClippingPlanes(): IClippingPlane[] {
@@ -1235,25 +1241,28 @@ export class Viewer
     for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
       const cuttingPlane = activeView.getCuttingPlane(i);
 
-      const plane = {
+      const clipping_plane = {
         location: this.getPoint3dFromArray(cuttingPlane.getOrigin()),
         direction: this.getPoint3dFromArray(cuttingPlane.normal()),
       };
 
-      clipping_planes.push(plane);
+      clipping_planes.push(clipping_plane);
     }
 
     return clipping_planes;
   }
 
-  private setClippingPlanes(clippingPlanes: IClippingPlane[]) {
-    if (clippingPlanes) {
+  private setClippingPlanes(clipping_planes: IClippingPlane[]) {
+    if (clipping_planes) {
       const visViewer = this.visViewer();
       const activeView = visViewer.activeView;
 
-      for (const plane of clippingPlanes) {
+      for (const clipping_plane of clipping_planes) {
         const cuttingPlane = new (this.visLib().OdTvPlane)();
-        cuttingPlane.set(this.getLogicalPoint3dAsArray(plane.location), this.getLogicalPoint3dAsArray(plane.direction));
+        cuttingPlane.set(
+          this.getLogicalPoint3dAsArray(clipping_plane.location),
+          this.getLogicalPoint3dAsArray(clipping_plane.direction)
+        );
 
         activeView.addCuttingPlane(cuttingPlane);
         activeView.setEnableCuttingPlaneFill(true, 0x66, 0x66, 0x66);
@@ -1261,6 +1270,14 @@ export class Viewer
     }
   }
 
+  private getSelection(): IComponent[] {
+    return this.getSelected().map((handle) => ({ handle }));
+  }
+
+  private setSelection(selection: IComponent[]) {
+    this.setSelected(selection?.map((component) => component.handle));
+  }
+
   /**
    * Executes the command denoted by the given command. If the command is not found, tries to
    * set active dragger with the specified name.