@inweb/viewer-visualize 27.10.0 → 27.11.0

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

@@ -258,27 +258,34 @@ export class OrbitAction {
   }
 
   private getCenter(): any {
+    const handles = this._subject.getSelected();
+    const selectionSet = this._subject.models[0].getSelectionSetByHandles(handles);
+
     const viewer = this.getViewer();
-    let center;
-
-    const pSet = viewer.getSelected();
-    if (!pSet.isNull() && pSet.numItems() !== 0) {
-      const itr = pSet.getIterator();
-      let ext, entId, extSelected;
-      for (; !itr.done(); itr.step()) {
-        entId = itr.getEntity();
-        ext = entId.getWCSExtents();
-        if (extSelected) extSelected.addExt(ext);
-        else extSelected = ext;
+    let center: any;
+
+    if (selectionSet.numItems() > 0) {
+      let extSelected: any;
+
+      const itemItr = selectionSet.getIterator();
+      while (!itemItr.done()) {
+        const entityId = itemItr.getEntity();
+
+        const entityExt = entityId.getWCSExtents();
+        if (extSelected) extSelected.addExt(entityExt);
+        else extSelected = entityExt;
+
+        itemItr.step();
       }
-      center = extSelected.center();
+      itemItr.delete();
 
-      extSelected.delete();
-      itr.delete();
+      center = extSelected.center();
     } else {
       center = viewer.getActiveExtents().center();
     }
 
+    selectionSet.delete();
+
     return center;
   }
 

package/src/Viewer/Draggers/Common/OdBaseDragger.ts

@@ -55,23 +55,23 @@ export class OdBaseDragger extends OdaGeAction {
     this.click = this.click.bind(this);
     this.dblclick = this.dblclick.bind(this);
 
-    this.subject.addEventListener("pointerdown", this.pointerdown);
-    this.subject.addEventListener("pointerup", this.pointerup);
-    this.subject.addEventListener("pointercancel", this.pointercancel);
-    this.subject.addEventListener("pointermove", this.pointermove);
-    this.subject.addEventListener("click", this.click);
-    this.subject.addEventListener("dblclick", this.dblclick);
+    this.subject.canvas.addEventListener("pointerdown", this.pointerdown);
+    this.subject.canvas.addEventListener("pointerup", this.pointerup);
+    this.subject.canvas.addEventListener("pointercancel", this.pointercancel);
+    this.subject.canvas.addEventListener("pointermove", this.pointermove);
+    this.subject.canvas.addEventListener("click", this.click);
+    this.subject.canvas.addEventListener("dblclick", this.dblclick);
 
     this.getViewer().setEnableAutoSelect(false);
   }
 
   public dispose(): void {
-    this.subject.removeEventListener("pointerdown", this.pointerdown);
-    this.subject.removeEventListener("pointerup", this.pointerup);
-    this.subject.removeEventListener("pointercancel", this.pointercancel);
-    this.subject.removeEventListener("pointermove", this.pointermove);
-    this.subject.removeEventListener("click", this.click);
-    this.subject.removeEventListener("dblclick", this.dblclick);
+    this.subject.canvas.removeEventListener("pointerdown", this.pointerdown);
+    this.subject.canvas.removeEventListener("pointerup", this.pointerup);
+    this.subject.canvas.removeEventListener("pointercancel", this.pointercancel);
+    this.subject.canvas.removeEventListener("pointermove", this.pointermove);
+    this.subject.canvas.removeEventListener("click", this.click);
+    this.subject.canvas.removeEventListener("dblclick", this.dblclick);
   }
 
   protected relativeCoords(event: MouseEvent): Point2d {
@@ -130,7 +130,6 @@ export class OdBaseDragger extends OdaGeAction {
   }
 
   protected click(ev: MouseEvent): void {
-    const viewer = this.getViewer();
     const relCoord = this.relativeCoords(ev);
     const x = relCoord.x;
     const y = relCoord.y;
@@ -139,42 +138,43 @@ export class OdBaseDragger extends OdaGeAction {
       Math.abs(x - this.mouseDownPosition.x) < CLICK_DELTA && Math.abs(y - this.mouseDownPosition.y) < CLICK_DELTA;
 
     if (this.autoSelect && isNotDragging) {
-      viewer.unselect();
-      viewer.select(x, y, x, y);
-      this.subject.update();
+      const viewer = this.getViewer();
+      const view = viewer.activeView;
+      const model = viewer.getActiveModel();
+
+      const opt = new this.m_module.OdTvSelectionOptions();
+      opt.setMode(this.m_module.SelectionMode.kPoint);
 
-      const selectionSet = viewer.getSelected();
+      const selectionSet = view.select([x, y], opt, model);
+      const handles = this.subject.models[0].getHandlesBySelectionSet(selectionSet);
 
-      this.subject.emitEvent({ type: "select", data: selectionSet, handles: this.subject.getSelected() });
-      this.subject.emitEvent({ type: "select2", data: selectionSet, handles: this.subject.getSelected2() });
+      selectionSet.delete();
+      opt.delete();
+
+      if (handles.length > 0) {
+        if (!ev.shiftKey) this.subject.setSelected(handles);
+        else this.subject.toggleSelection(handles);
+      } else {
+        if (!ev.shiftKey) this.subject.clearSelected();
+      }
     }
   }
 
   protected dblclick(ev: MouseEvent): void {
-    const viewer = this.getViewer();
     const relCoord = this.relativeCoords(ev);
     const x = relCoord.x;
     const y = relCoord.y;
 
+    const viewer = this.getViewer();
     const device = viewer.getActiveDevice();
+
     const clickView = device.viewAt([x, y]);
     if (clickView && !clickView.active) {
       viewer.activeView = clickView;
       clickView.delete();
       this.subject.update();
     } else if (this.autoSelect) {
-      const pSelected = viewer.getSelected();
-
-      if (!pSelected.isNull() && pSelected.numItems() !== 0) {
-        const itr = pSelected.getIterator();
-        const entity = itr.getEntity();
-        viewer.zoomToEntity(entity);
-
-        this.subject.emitEvent({ type: "zoomtoentity", data: entity });
-        this.subject.update();
-
-        this.deleteAll([itr, entity]);
-      }
+      this.subject.zoomToSelected();
     }
 
     device.delete();

package/src/Viewer/Draggers/OdZoomWheelDragger.ts

@@ -36,7 +36,7 @@ export class OdZoomWheelDragger extends OdBaseDragger {
     super(subject);
 
     this.wheel = this.wheel.bind(this);
-    this.subject.addEventListener("wheel", this.wheel);
+    this.subject.canvas.addEventListener("wheel", this.wheel);
 
     this._zoomAction = new ZoomAction(this.m_module, this.subject);
     this._endInteractivityTimeOutId = undefined;
@@ -46,7 +46,7 @@ export class OdZoomWheelDragger extends OdBaseDragger {
   override dispose(): void {
     super.dispose();
 
-    this.subject.removeEventListener("wheel", this.wheel);
+    this.subject.canvas.removeEventListener("wheel", this.wheel);
 
     if (this._endInteractivityTimeOutId) {
       clearTimeout(this._endInteractivityTimeOutId);

package/src/Viewer/Draggers/OrbitAroundBuildingDragger.ts

@@ -146,24 +146,26 @@ export class OrbitAroundBuildingDragger extends OdBaseDragger {
   }
 
   getCenter(): any {
-    const viewer = this.getViewer();
+    const handles = this.subject.getSelected();
+    const selectionSet = this.subject.models[0].getSelectionSetByHandles(handles);
 
+    const viewer = this.getViewer();
     let ext = viewer.getActiveExtents();
 
-    const pSet = viewer.getSelected();
-    if (!pSet.isNull() && pSet.numItems() !== 0) {
-      const itr = pSet.getIterator();
-      const entId = itr.getEntity();
+    if (selectionSet.numItems() > 0) {
+      const itemItr = selectionSet.getIterator();
+      const entityId = itemItr.getEntity();
 
-      if (entId.getType() === 1) {
-        const obj = entId.openObject();
+      const type = entityId.getType();
+      if (type === this.m_module.OdTvEntityType.kEntity.value) {
+        const obj = entityId.openObject();
 
         ext.delete();
         ext = obj.getExtents();
 
         obj.delete();
-      } else if (entId.getType() === 2) {
-        const obj = entId.openObjectAsInsert();
+      } else if (type === this.m_module.OdTvEntityType.kInsert.value) {
+        const obj = entityId.openObjectAsInsert();
         const extTuple = obj.getExtents();
 
         ext.delete();
@@ -173,9 +175,11 @@ export class OrbitAroundBuildingDragger extends OdBaseDragger {
         obj.delete();
       }
 
-      itr.delete();
+      itemItr.delete();
     }
 
+    selectionSet.delete();
+
     const center = ext.center();
 
     ext.delete();

package/src/Viewer/Draggers/index.ts

@@ -60,11 +60,11 @@ import { OdaTextDragger } from "./OdaTextDragger";
  *
  *   constructor(viewer: Viewer) {
  *     this.viewer = viewer;
- *     this.viewer.addEventListener("pointermove", this.onPointerMove);
+ *     this.viewer.canvas.addEventListener("pointermove", this.onPointerMove);
  *   }
  *
  *   override dispose() {
- *     this.viewer.removeEventListener("pointermove", this.onPointerMove);
+ *     this.viewer.canvas.removeEventListener("pointermove", this.onPointerMove);
  *   }
  *
  *   onPointerMove = (event: PointerEvent) => {

package/src/Viewer/Loaders/VSFCloudLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Loader } from "@inweb/viewer-core";
+import { Loader, LoadParams } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { ModelImpl } from "../Models/ModelImpl";
 
@@ -42,7 +42,7 @@ export class VSFCloudLoader extends Loader {
     );
   }
 
-  override async load(model: any, format?: string): Promise<this> {
+  override async load(model: any, format?: string, params: LoadParams = {}): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
     const visViewer = this.viewer.visViewer();
@@ -69,8 +69,9 @@ export class VSFCloudLoader extends Loader {
       }
 
       if (i === 0) {
-        const modelImpl = new ModelImpl();
-        modelImpl.id = model.file.id;
+        const modelImpl = new ModelImpl(this.viewer.visualizeJs);
+        modelImpl.id = params.modelId || model.file.id;
+        modelImpl.initialize();
 
         this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/VSFFileLoader.ts

@@ -69,8 +69,9 @@ export class VSFFileLoader extends Loader {
       throw error;
     }
 
-    const modelImpl = new ModelImpl();
+    const modelImpl = new ModelImpl(this.viewer.visualizeJs);
     modelImpl.id = params.modelId || this.extractFileName(file);
+    modelImpl.initialize();
 
     this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/VSFXCloudLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Loader } from "@inweb/viewer-core";
+import { Loader, LoadParams } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { ModelImpl } from "../Models/ModelImpl";
 
@@ -43,7 +43,7 @@ export class VSFXCloudLoader extends Loader {
     );
   }
 
-  override async load(model: any): Promise<this> {
+  override async load(model: any, format?: string, params: LoadParams = {}): Promise<this> {
     if (!this.viewer.visualizeJs) return Promise.resolve(this);
 
     const visViewer = this.viewer.visViewer();
@@ -64,8 +64,9 @@ export class VSFXCloudLoader extends Loader {
       throw error;
     }
 
-    const modelImpl = new ModelImpl();
-    modelImpl.id = model.file.id;
+    const modelImpl = new ModelImpl(this.viewer.visualizeJs);
+    modelImpl.id = params.modelId || model.file.id;
+    modelImpl.initialize();
 
     this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/VSFXCloudPartialLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Loader } from "@inweb/viewer-core";
+import { Loader, LoadParams } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { ModelImpl } from "../Models/ModelImpl";
 
@@ -49,7 +49,7 @@ export class VSFXCloudPartialLoader extends Loader {
     );
   }
 
-  override async load(model: any): Promise<this> {
+  override async load(model: any, format?: string, params: LoadParams = {}): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
     type Range = { requestId: number; begin: number; end: number };
@@ -80,8 +80,9 @@ export class VSFXCloudPartialLoader extends Loader {
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
 
       if (isDatabaseChunk) {
-        const modelImpl = new ModelImpl();
-        modelImpl.id = model.file.id;
+        const modelImpl = new ModelImpl(this.viewer.visualizeJs);
+        modelImpl.id = params.modelId || model.file.id;
+        modelImpl.initialize();
 
         this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/VSFXCloudStreamingLoader.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Loader } from "@inweb/viewer-core";
+import { Loader, LoadParams } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { ModelImpl } from "../Models/ModelImpl";
 
@@ -45,7 +45,7 @@ export class VSFXCloudStreamingLoader extends Loader {
     );
   }
 
-  override async load(model: any): Promise<this> {
+  override async load(model: any, format?: string, params: LoadParams = {}): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
     const visLib = this.viewer.visLib();
@@ -76,8 +76,9 @@ export class VSFXCloudStreamingLoader extends Loader {
       }
 
       if (isDatabaseChunk) {
-        const modelImpl = new ModelImpl();
-        modelImpl.id = model.file.id;
+        const modelImpl = new ModelImpl(this.viewer.visualizeJs);
+        modelImpl.id = params.modelId || model.file.id;
+        modelImpl.initialize();
 
         this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/VSFXFileLoader.ts

@@ -69,8 +69,9 @@ export class VSFXFileLoader extends Loader {
       throw error;
     }
 
-    const modelImpl = new ModelImpl();
+    const modelImpl = new ModelImpl(this.viewer.visualizeJs);
     modelImpl.id = params.modelId || this.extractFileName(file);
+    modelImpl.initialize();
 
     this.viewer.models.push(modelImpl);
 

package/src/Viewer/Loaders/index.ts

@@ -79,10 +79,12 @@ import { VSFXCloudPartialLoader } from "./VSFXCloudPartialLoader";
  *    // load VSFX data from file (custom loading logic)
  *     const data = await fetch(file).then((result) => result.arrayBuffer());
  *
- *     const modelImpl = new ModelImpl();
+ *     this.viewer.visViewer().parseVsfx(new Uint8Array(data));
+ *
+ *     const modelImpl = new ModelImpl(this.viewer.visualizeJs);
  *     modelImpl.id = params.modelId;
+ *     modelImpl.initialize();
  *
- *     this.viewer.visViewer().parseVsfx(new Uint8Array(data));
  *     this.viewer.models.push(modelImpl);
  *
  *     this.viewer.syncOptions();

package/src/Viewer/Models/ModelImpl.ts

@@ -23,10 +23,157 @@
 
 import { IModelImpl } from "./ModelImpl.types";
 
-// Basic model implementation.
-
 export class ModelImpl implements IModelImpl {
   public id = "";
+  public visualizeJs: any;
+
+  constructor(visualizeJs: any) {
+    this.id = "";
+    this.visualizeJs = visualizeJs;
+  }
 
   dispose(): void {}
+
+  initialize(): void {
+    // reserved for future use
+  }
+
+  getHandlesByEntityIterator(iterator: any): string[] {
+    const handles2: string[] = [];
+
+    while (!iterator.done()) {
+      const entityId = iterator.getEntity();
+
+      const entityType = entityId.getType();
+      let entityPtr = null;
+      if (entityType === this.visualizeJs.OdTvEntityType.kEntity.value) entityPtr = entityId.openObject();
+      if (entityType === this.visualizeJs.OdTvEntityType.kInsert.value) entityPtr = entityId.openObjectAsInsert();
+
+      if (entityPtr) {
+        const handle = entityPtr.getNativeDatabaseHandle();
+        if (handle !== "-1") handles2.push(handle);
+        entityPtr.delete();
+      }
+      iterator.step();
+    }
+
+    return handles2;
+  }
+
+  getHandlesBySelectionSet(selectionSet: any): string[] {
+    const iterator = selectionSet.getIterator();
+    const handles = this.getHandlesByEntityIterator(iterator);
+    iterator.delete();
+    return handles;
+  }
+
+  getSelectionSetByHandles(handles: string[]): any {
+    const viewer = this.visualizeJs.getViewer();
+    const selectionSet = viewer.getEntitySetByOriginalHandles(handles);
+
+    return selectionSet;
+  }
+
+  // IModel
+
+  hide(handles: string[]): this {
+    const viewer = this.visualizeJs.getViewer();
+    const model = viewer.getActiveModel();
+
+    const selectionSet = this.getSelectionSetByHandles(handles);
+    model.hideBySelectionSet(selectionSet, false);
+    selectionSet.delete();
+
+    return this;
+  }
+
+  hideAll(): this {
+    const viewer = this.visualizeJs.getViewer();
+    const model = viewer.getActiveModel();
+    const selectionSet = new this.visualizeJs.OdTvSelectionSet();
+
+    const entityItr = model.getEntitiesIterator();
+    while (!entityItr.done()) {
+      const entityId = entityItr.getEntity();
+
+      const entityType = entityId.getType();
+      const isEntity = entityType === this.visualizeJs.OdTvEntityType.kEntity.value;
+      const isInsert = entityType === this.visualizeJs.OdTvEntityType.kInsert.value;
+
+      if (isEntity || isInsert) selectionSet.appendEntity(entityId);
+
+      entityItr.step();
+    }
+    entityItr.delete();
+
+    model.hideBySelectionSet(selectionSet, false);
+    selectionSet.delete();
+
+    return this;
+  }
+
+  isolate(handles: string[]): this {
+    if (handles.length > 0) {
+      const viewer = this.visualizeJs.getViewer();
+      const model = viewer.getActiveModel();
+
+      const selectionSet = this.getSelectionSetByHandles(handles);
+      model.isolateBySelectionSet(selectionSet, false);
+      selectionSet.delete();
+    } else {
+      this.hideAll();
+    }
+
+    return this;
+  }
+
+  show(handles: string[]): this {
+    const viewer = this.visualizeJs.getViewer();
+    const model = viewer.getActiveModel();
+
+    const selectionSet = this.getSelectionSetByHandles(handles);
+    model.unHideBySelectionSet(selectionSet, true, false);
+    selectionSet.delete();
+
+    return this;
+  }
+
+  showAll(): this {
+    const viewer = this.visualizeJs.getViewer();
+    const model = viewer.getActiveModel();
+
+    model.unIsolate(false);
+
+    return this;
+  }
+
+  highlight(handles: string[]): this {
+    const viewer = this.visualizeJs.getViewer();
+    const view = viewer.activeView;
+
+    const selectionSet = this.getSelectionSetByHandles(handles);
+    view.highlightAll(selectionSet, true);
+    selectionSet.delete();
+
+    return this;
+  }
+
+  unhighlight(handles: string[]): this {
+    const viewer = this.visualizeJs.getViewer();
+    const view = viewer.activeView;
+
+    const selectionSet = this.getSelectionSetByHandles(handles);
+    view.highlightAll(selectionSet, false);
+    selectionSet.delete();
+
+    return this;
+  }
+
+  explode(scale: 0, coeff = 4): this {
+    const viewer = this.visualizeJs.getViewer();
+
+    viewer.explode(scale);
+
+    return this;
+  }
 }

package/src/Viewer/Models/ModelImpl.types.ts

@@ -26,4 +26,12 @@ import { IModel } from "@inweb/viewer-core";
 /**
  * Basic model implementation.
  */
-export type IModelImpl = IModel;
+export interface IModelImpl extends IModel {
+  initialize(): void;
+
+  getHandlesByEntityIterator(iterator: any): string[];
+
+  getHandlesBySelectionSet(selectionSet: any): string[];
+
+  getSelectionSetByHandles(handles: string[]): any;
+}