@inweb/viewer-visualize 27.9.1 → 27.11.0

package/src/Viewer/Viewer.ts

@@ -40,9 +40,12 @@ import {
   IPoint,
   IViewer,
   IViewpoint,
+  IVisibility,
   Options,
   OptionsEventMap,
+  Selector,
   ViewerEventMap,
+  VisibilityManager,
 } from "@inweb/viewer-core";
 import { IMarkup, IWorldTransform } from "@inweb/markup";
 
@@ -50,10 +53,11 @@ import { draggers } from "./Draggers";
 import { commands } from "./Commands";
 import { components } from "./Components";
 import { loaders } from "./Loaders";
-import { IModelImpl } from "./Models/IModelImpl";
+import { IModelImpl } from "./Models/ModelImpl.types";
 
 import { loadVisualizeJs } from "./utils";
 import { MarkupFactory, MarkupType } from "./Markup/MarkupFactory";
+import { toHandles2 } from "./Commands/ToHandles2";
 
 const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
 
@@ -82,8 +86,12 @@ export class Viewer
   private _viewer: any;
   private _crossOrigin;
 
+  public selector: Selector;
+  public visibilityManager: VisibilityManager;
+  public explodeScale: number;
+
   private _activeDragger: IDragger | null;
-  private _components: IComponent[];
+  private _components: Map<string, IComponent>;
 
   private _renderNeeded: boolean;
   private _renderTime: DOMHighResTimeStamp;
@@ -127,9 +135,13 @@ export class Viewer
     this.canvasEvents = CANVAS_EVENTS.slice();
     this.canvaseventlistener = (event: Event) => this.emit(event);
 
+    this.selector = new Selector(this.models);
+    this.visibilityManager = new VisibilityManager(this.models);
+    this.explodeScale = 0;
+
     this._visualizeTimestamp = 0;
     this._activeDragger = null;
-    this._components = [];
+    this._components = new Map();
 
     this._renderNeeded = false;
     this._renderTime = 0;
@@ -276,7 +288,7 @@ export class Viewer
 
     for (const name of components.getComponents().keys()) {
       const component = components.createComponent(name, this);
-      if (component) this._components.push(component);
+      if (component) this._components.set(name, component);
     }
 
     this.syncOptions();
@@ -300,7 +312,7 @@ export class Viewer
     this.setActiveDragger();
 
     this._components.forEach((component: IComponent) => component.dispose());
-    this._components.length = 0;
+    this._components.clear();
 
     this._markup.dispose();
 
@@ -359,7 +371,7 @@ export class Viewer
    */
   update(force: boolean | number = false) {
     const time = performance.now();
-    if (typeof force === "number" && time - this._renderTime >= force) force = true;
+    if (typeof force === "number") force = time - this._renderTime >= force;
 
     if (this._enableAutoUpdate) {
       this._renderNeeded = true;
@@ -538,6 +550,7 @@ export class Viewer
 
     const loader = loaders.createLoader(this, model, format);
     if (!loader) throw new Error(`Format not supported (${format})`);
+
     this.loaders.push(loader);
 
     this.emitEvent({ type: "geometrystart", file, model });
@@ -837,38 +850,86 @@ export class Viewer
     this.update();
   }
 
-  getSelected(): string[] {
-    return this.executeCommand("getSelected");
-  }
-
-  setSelected(handles?: string[]): void {
-    this.executeCommand("setSelected", handles);
+  getSelected(multimodel?: boolean): string[] {
+    return this.executeCommand("getSelected", multimodel);
   }
 
   getSelected2(): string[] {
     return this.executeCommand("getSelected2");
   }
 
+  setSelected(handles?: string[]): void {
+    this.executeCommand("setSelected", handles);
+  }
+
   setSelected2(handles?: string[]): void {
     this.executeCommand("setSelected2", handles);
   }
 
+  select(handles: string | string[]): void {
+    this.executeCommand("select", handles);
+  }
+
+  deselect(handles: string | string[]): void {
+    this.executeCommand("deselect", handles);
+  }
+
+  toggleSelection(handles: string | string[]): void {
+    this.executeCommand("toggleSelection", handles);
+  }
+
   clearSelected(): void {
     this.executeCommand("clearSelected");
   }
 
+  getHidden(multimodel?: boolean): string[] {
+    return this.executeCommand("getHidden", multimodel);
+  }
+
+  getIsolated(multimodel?: boolean): string[] {
+    return this.executeCommand("getIsolated", multimodel);
+  }
+
+  hide(handle: string | string[]): void {
+    this.executeCommand("hide", handle);
+  }
+
+  hideAll(): void {
+    this.executeCommand("hideAll");
+  }
+
   hideSelected(): void {
     this.executeCommand("hideSelected");
   }
 
+  isolate(handle: string | string[]): void {
+    this.executeCommand("isolate", handle);
+  }
+
   isolateSelected(): void {
     this.executeCommand("isolateSelected");
   }
 
+  show(handle: string | string[]): void {
+    this.executeCommand("show", handle);
+  }
+
   showAll(): void {
     this.executeCommand("showAll");
   }
 
+  zoomExtents(): void {
+    this.executeCommand("zoomExtents");
+  }
+
+  zoomTo(handles: string | string[]): void {
+    this.executeCommand("zoomTo", handles);
+  }
+
+  zoomToSelected(): void {
+    this.executeCommand("zoomToSelected");
+  }
+
   explode(index = 0): void {
     this.executeCommand("explode", index);
   }
@@ -915,7 +976,7 @@ export class Viewer
   }
 
   getComponent(name: string): IComponent | null {
-    return this._components.find((component) => component.name === name) || null;
+    return this._components.get(name) || null;
   }
 
   drawViewpoint(viewpoint: IViewpoint): void {
@@ -998,7 +1059,22 @@ export class Viewer
     };
 
     const setSelection = (selection: IEntity[]) => {
-      if (selection) this.setSelected(selection.map((component) => component.handle));
+      if (selection) {
+        this.setSelected(selection.map(({ handle }) => handle));
+      }
+    };
+
+    const setVisibility = (visibility: IVisibility) => {
+      if (visibility && visibility.exceptions)
+        if (visibility.default_visibility) {
+          this.hide(visibility.exceptions.map(({ handle }) => handle));
+        } else {
+          this.isolate(visibility.exceptions.map(({ handle }) => handle));
+        }
+    };
+
+    const setExplodeScale = (scale: number) => {
+      if (scale > 0) this.explode(scale);
     };
 
     const draggerName = this._activeDragger?.name;
@@ -1007,14 +1083,16 @@ export class Viewer
     this.clearSlices();
     this.clearOverlay();
     this.clearSelected();
-
     this.showAll();
     this.explode();
 
     setOrthogonalCamera(viewpoint.orthogonal_camera);
     setPerspectiveCamera(viewpoint.perspective_camera);
     setClippingPlanes(viewpoint.clipping_planes);
+    setVisibility(viewpoint.custom_fields?.visibility2 || viewpoint.visibility);
     setSelection(viewpoint.custom_fields?.selection2 || viewpoint.selection);
+    setExplodeScale(viewpoint.custom_fields?.explodeScale);
+
     this._markup.setViewpoint(viewpoint);
 
     this.syncOverlay();
@@ -1095,11 +1173,31 @@ export class Viewer
     };
 
     const getSelection = (): IEntity[] => {
-      return this.getSelected().map((handle) => ({ handle }));
+      const selected = Array.from(this.selector.selected);
+      return selected.map((handle) => ({ handle }));
     };
 
     const getSelection2 = (): IEntity[] => {
-      return this.getSelected2().map((handle) => ({ handle }));
+      const selected = Array.from(this.selector.selected);
+      const selected2 = toHandles2(this, selected);
+      return selected2.map((handle) => ({ handle }));
+    };
+
+    const getVisibility = (): IVisibility => {
+      const exceptions = Array.from(this.visibilityManager.exceptions);
+      return {
+        default_visibility: this.visibilityManager.defaultVisible,
+        exceptions: exceptions.map((handle) => ({ handle })),
+      };
+    };
+
+    const getVisibility2 = (): IVisibility => {
+      const exceptions = Array.from(this.visibilityManager.exceptions);
+      const exceptions2 = toHandles2(this, exceptions);
+      return {
+        default_visibility: this.visibilityManager.defaultVisible,
+        exceptions: exceptions2.map((handle) => ({ handle })),
+      };
     };
 
     const viewpoint: IViewpoint = { custom_fields: {} };
@@ -1108,12 +1206,16 @@ export class Viewer
     viewpoint.perspective_camera = getPerspectiveCamera();
     viewpoint.clipping_planes = getClippingPlanes();
     viewpoint.selection = getSelection();
+    viewpoint.visibility = getVisibility();
     viewpoint.description = new Date().toDateString();
     viewpoint.snapshot = { data: this.getSnapshot() };
 
-    this._markup.getViewpoint(viewpoint);
-
     viewpoint.custom_fields.selection2 = getSelection2();
+    viewpoint.custom_fields.visibility2 = getVisibility2();
+    viewpoint.custom_fields.explodeScale = this.explodeScale;
+    viewpoint.custom_fields.files = this.models.map((model) => model.id);
+
+    this._markup.getViewpoint(viewpoint);
 
     this.emitEvent({ type: "createviewpoint", data: viewpoint });
 

package/lib/Viewer/Commands/ZoomToExtents.d.ts

@@ -1,2 +0,0 @@
-import { Viewer } from "../Viewer";
-export declare function zoomToExtents(viewer: Viewer, force?: boolean, animate?: boolean): void;

package/lib/Viewer/Commands/ZoomToObjects.d.ts

@@ -1,2 +0,0 @@
-import { Viewer } from "../Viewer";
-export declare function zoomToObjects(viewer: Viewer, handles?: string[]): void;

package/lib/Viewer/Models/IModelImpl.d.ts

@@ -1,5 +0,0 @@
-import { IModel } from "@inweb/viewer-core";
-/**
- * Basic model implementation.
- */
-export type IModelImpl = IModel;