@inweb/viewer-three 26.10.6 → 26.11.0

package/src/Viewer/commands/ClearSelected.ts

@@ -29,5 +29,7 @@ export function clearSelected(viewer: Viewer): void {
   selection.clearSelection();
 
   viewer.update();
-  viewer.emitEvent({ type: "select", data: undefined, handles: [] });
+
+  viewer.emitEvent({ type: "select", handles: [] });
+  viewer.emitEvent({ type: "select2", handles: [] });
 }

package/src/Viewer/commands/GetModels.ts

@@ -24,5 +24,5 @@
 import type { Viewer } from "../Viewer";
 
 export function getModels(viewer: Viewer): string[] {
-  return viewer.models.map((model) => model.handle);
+  return viewer.models.map((model) => model.id);
 }

package/src/Viewer/commands/GetSelected.ts

@@ -24,7 +24,7 @@
 import type { Viewer } from "../Viewer";
 
 export function getSelected(viewer: Viewer): string[] {
-  const handles = [];
-  viewer.models.forEach((model) => handles.push(...model.getHandlesByObjects(viewer.selected)));
+  const handles2 = viewer.executeCommand("getSelected2");
+  const handles = handles2.map((handle) => handle.slice(handle.indexOf(":") + 1));
   return handles;
 }

package/src/Viewer/commands/GetSelected2.ts

@@ -0,0 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
+// All rights reserved.
+//
+// This software and its documentation and related materials are owned by
+// the Alliance. The software may only be incorporated into application
+// programs owned by members of the Alliance, subject to a signed
+// Membership Agreement and Supplemental Software License Agreement with the
+// Alliance. The structure and organization of this software are the valuable
+// trade secrets of the Alliance and its suppliers. The software is also
+// protected by copyright law and international treaty provisions. Application
+// programs incorporating this software must include the following statement
+// with their copyright notices:
+//
+//   This application incorporates Open Design Alliance software pursuant to a
+//   license agreement with Open Design Alliance.
+//   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
+//   All rights reserved.
+//
+// By use of this software, its documentation or related materials, you
+// acknowledge and accept the above terms.
+///////////////////////////////////////////////////////////////////////////////
+
+import type { Viewer } from "../Viewer";
+
+export function getSelected2(viewer: Viewer): string[] {
+  const handles2 = [];
+
+  viewer.models.forEach((model) => {
+    handles2.push(...model.getHandlesByObjects(viewer.selected));
+  });
+
+  return handles2;
+}

package/src/Viewer/commands/HideSelected.ts

@@ -31,6 +31,8 @@ export function hideSelected(viewer: Viewer): void {
   selection.clearSelection();
 
   viewer.update();
+
   viewer.emitEvent({ type: "hide" });
-  viewer.emitEvent({ type: "select", data: undefined, handles: [] });
+  viewer.emitEvent({ type: "select", handles: [] });
+  viewer.emitEvent({ type: "select2", handles: [] });
 }

package/src/Viewer/commands/SelectModel.ts

@@ -24,14 +24,14 @@
 import type { Viewer } from "../Viewer";
 import type { SelectionComponent } from "../components/SelectionComponent";
 
-export function selectModel(viewer: Viewer, handle: string): void {
+export function selectModel(viewer: Viewer, id: string): void {
   const selection = viewer.getComponent("SelectionComponent") as SelectionComponent;
   selection.clearSelection();
 
-  viewer.models
-    .filter((model) => model.handle === handle)
-    .forEach((model) => selection.select(model.getObjects(), model));
+  viewer.models.filter((model) => model.id === id).forEach((model) => selection.select(model.getObjects(), model));
 
   viewer.update();
-  viewer.emit({ type: "select", data: [] });
+
+  viewer.emitEvent({ type: "select", handles: viewer.getSelected() });
+  viewer.emitEvent({ type: "select2", handles: viewer.getSelected2() });
 }

package/src/Viewer/commands/SetSelected.ts

@@ -22,19 +22,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import type { Viewer } from "../Viewer";
-import type { SelectionComponent } from "../components/SelectionComponent";
 
 export function setSelected(viewer: Viewer, handles: string[] = []): void {
-  const selection = viewer.getComponent("SelectionComponent") as SelectionComponent;
-  selection.clearSelection();
+  const handles2 = [];
 
-  viewer.models.forEach((model) => {
-    const objects = model.getObjectsByHandles(handles);
-    model.showObjects(objects);
-    selection.select(objects, model);
+  handles.forEach((handle) => {
+    if (handle.includes(":")) {
+      handles2.push(handle);
+    } else
+      viewer.models.forEach((model) => {
+        handles2.push(`${model.id}:${handle}`);
+      });
   });
 
-  viewer.update();
-  viewer.emitEvent({ type: "show" });
-  viewer.emitEvent({ type: "select", data: undefined, handles });
+  viewer.executeCommand("setSelected2", handles2);
 }

package/src/Viewer/commands/SetSelected2.ts

@@ -0,0 +1,42 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
+// All rights reserved.
+//
+// This software and its documentation and related materials are owned by
+// the Alliance. The software may only be incorporated into application
+// programs owned by members of the Alliance, subject to a signed
+// Membership Agreement and Supplemental Software License Agreement with the
+// Alliance. The structure and organization of this software are the valuable
+// trade secrets of the Alliance and its suppliers. The software is also
+// protected by copyright law and international treaty provisions. Application
+// programs incorporating this software must include the following statement
+// with their copyright notices:
+//
+//   This application incorporates Open Design Alliance software pursuant to a
+//   license agreement with Open Design Alliance.
+//   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
+//   All rights reserved.
+//
+// By use of this software, its documentation or related materials, you
+// acknowledge and accept the above terms.
+///////////////////////////////////////////////////////////////////////////////
+
+import type { Viewer } from "../Viewer";
+import type { SelectionComponent } from "../components/SelectionComponent";
+
+export function setSelected2(viewer: Viewer, handles: string[] = []): void {
+  const selectionComponent = viewer.getComponent("SelectionComponent") as SelectionComponent;
+  selectionComponent.clearSelection();
+
+  viewer.models.forEach((model) => {
+    const objects = model.getObjectsByHandles(handles);
+    model.showObjects(objects);
+    selectionComponent.select(objects, model);
+  });
+
+  viewer.update();
+
+  viewer.emitEvent({ type: "show" });
+  viewer.emitEvent({ type: "select", data: undefined, handles: viewer.getSelected() });
+  viewer.emitEvent({ type: "select2", data: undefined, handles });
+}

package/src/Viewer/commands/ZoomToObjects.ts

@@ -26,13 +26,12 @@ import type { Viewer } from "../Viewer";
 import { zoomTo } from "./ZoomTo";
 
 export function zoomToObjects(viewer: Viewer, handles: string[] = []): void {
-  const handleSet = new Set(handles);
-  const objects = [];
-  viewer.scene.traverseVisible((child) => {
-    if (handleSet.has(child.userData?.handle)) objects.push(child);
-  });
+  const extents = new Box3();
 
-  const extents = objects.reduce((result: Box3, object) => result.expandByObject(object), new Box3());
+  viewer.models.forEach((model) => {
+    const objects = model.getObjectsByHandles(handles);
+    objects.forEach((object) => extents.expandByObject(object));
+  });
   if (extents.isEmpty()) extents.copy(viewer.extents);
 
   zoomTo(viewer, extents);

package/src/Viewer/commands/ZoomToSelected.ts

@@ -26,7 +26,9 @@ import type { Viewer } from "../Viewer";
 import { zoomTo } from "./ZoomTo";
 
 export function zoomToSelected(viewer: Viewer): void {
-  const extents = viewer.selected.reduce((result: Box3, object) => result.expandByObject(object), new Box3());
+  const extents = new Box3();
+
+  viewer.selected.forEach((object) => extents.expandByObject(object));
   if (extents.isEmpty()) extents.copy(viewer.extents);
 
   zoomTo(viewer, extents);

package/src/Viewer/commands/index.ts

@@ -32,6 +32,7 @@ import { explode, collect } from "./Explode";
 import { getDefaultViewPositions } from "./GetDefaultViewPositions";
 import { getModels } from "./GetModels";
 import { getSelected } from "./GetSelected";
+import { getSelected2 } from "./GetSelected2";
 import { hideSelected } from "./HideSelected";
 import { isolateSelected } from "./IsolateSelected";
 import { regenerateAll } from "./RegenerateAll";
@@ -41,6 +42,7 @@ import { setActiveDragger } from "./SetActiveDragger";
 import { setDefaultViewPosition } from "./SetDefaultViewPosition";
 import { setMarkupColor } from "./SetMarkupColor";
 import { setSelected } from "./SetSelected";
+import { setSelected2 } from "./SetSelected2";
 import { showAll } from "./ShowAll";
 import { zoomToExtents } from "./ZoomToExtents";
 import { zoomToObjects } from "./ZoomToObjects";
@@ -86,6 +88,7 @@ commands.registerCommand("explode", explode);
 commands.registerCommand("getDefaultViewPositions", getDefaultViewPositions);
 commands.registerCommand("getModels", getModels);
 commands.registerCommand("getSelected", getSelected);
+commands.registerCommand("getSelected2", getSelected2);
 commands.registerCommand("hideSelected", hideSelected);
 commands.registerCommand("isolateSelected", isolateSelected);
 commands.registerCommand("regenerateAll", regenerateAll);
@@ -95,6 +98,7 @@ commands.registerCommand("setActiveDragger", setActiveDragger);
 commands.registerCommand("setDefaultViewPosition", setDefaultViewPosition);
 commands.registerCommand("setMarkupColor", setMarkupColor);
 commands.registerCommand("setSelected", setSelected);
+commands.registerCommand("setSelected2", setSelected2);
 commands.registerCommand("showAll", showAll);
 commands.registerCommand("zoomToExtents", zoomToExtents);
 commands.registerCommand("zoomToObjects", zoomToObjects);

package/src/Viewer/components/CameraComponent.ts

@@ -119,9 +119,14 @@ export class CameraComponent implements IComponent {
   };
 
   geometryEnd = () => {
+    // do not change the camera after opening the second file in assembly
+    if (this.viewer.models.length > 1) {
+      this.switchCamera(this.viewer.camera);
+      return;
+    }
+
     let camera: any;
 
-    // TODO: do not change the camera and target after opening the second model in "append" mode
     this.viewer.scene.traverse((object: any) => {
       if (object.isCamera)
         if (!camera) camera = object;

package/src/Viewer/components/ExtentsComponent.ts

@@ -53,8 +53,11 @@ export class ExtentsComponent implements IComponent {
   syncExtents = () => {
     const extents = new Box3();
     this.viewer.models.forEach((model) => model.getExtents(extents));
-
     this.viewer.extents.copy(extents);
+
+    // do not change target after opening the second file in assembly
+    if (this.viewer.models.length > 1) return;
+
     this.viewer.extents.getCenter(this.viewer.target);
   };
 }

package/src/Viewer/components/SelectionComponent.ts

@@ -21,22 +21,21 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { Intersection, Object3D, Raycaster, Vector2 } from "three";
+import { Object3D, Vector2 } from "three";
 
 import type { IComponent } from "@inweb/viewer-core";
 import type { Viewer } from "../Viewer";
 import type { IModelImpl } from "../models/IModelImpl";
 import type { HighlighterComponent } from "./HighlighterComponent";
+import { Snapper } from "../measurement/Snapper";
 
 export class SelectionComponent implements IComponent {
   protected viewer: Viewer;
-  protected raycaster: Raycaster;
   protected downPosition: Vector2;
   protected highlighter: HighlighterComponent;
 
   constructor(viewer: Viewer) {
     this.viewer = viewer;
-    this.raycaster = new Raycaster();
     this.downPosition = new Vector2();
 
     this.viewer.addEventListener("pointerdown", this.onPointerDown);
@@ -64,10 +63,12 @@ export class SelectionComponent implements IComponent {
     const upPosition = this.getMousePosition(event, new Vector2());
     if (upPosition.distanceTo(this.downPosition) !== 0) return;
 
+    const snapper = new Snapper(this.viewer.camera, this.viewer.renderer, this.viewer.canvas);
+
     let intersections = [];
     this.viewer.models.forEach((model) => {
       const objects = model.getVisibleObjects();
-      const intersects = this.getPointerIntersects(upPosition, objects);
+      const intersects = snapper.getPointerIntersects(upPosition, objects);
       if (intersects.length > 0) intersections.push({ ...intersects[0], model });
     });
     intersections = intersections.sort((a, b) => a.distance - b.distance);
@@ -84,7 +85,9 @@ export class SelectionComponent implements IComponent {
     }
 
     this.viewer.update();
+
     this.viewer.emitEvent({ type: "select", data: undefined, handles: this.viewer.getSelected() });
+    this.viewer.emitEvent({ type: "select2", data: undefined, handles: this.viewer.getSelected2() });
   };
 
   onDoubleClick = (event: MouseEvent) => {
@@ -97,32 +100,6 @@ export class SelectionComponent implements IComponent {
     return target.set(event.clientX, event.clientY);
   }
 
-  getPointerIntersects(mouse: Vector2, objects: Object3D[]): Array<Intersection<Object3D>> {
-    const rect = this.viewer.canvas.getBoundingClientRect();
-    const x = ((mouse.x - rect.left) / rect.width) * 2 - 1;
-    const y = (-(mouse.y - rect.top) / rect.height) * 2 + 1;
-
-    const coords = new Vector2(x, y);
-    this.raycaster.setFromCamera(coords, this.viewer.camera);
-
-    this.raycaster.params = {
-      Mesh: {},
-      Line: { threshold: 0.05 },
-      Line2: { threshold: 0.05 },
-      LOD: {},
-      Points: { threshold: 0.01 },
-      Sprite: {},
-    };
-
-    let intersects = this.raycaster.intersectObjects(objects, false);
-
-    (this.viewer.renderer.clippingPlanes || []).forEach((plane) => {
-      intersects = intersects.filter((intersect) => plane.distanceToPoint(intersect.point) >= 0);
-    });
-
-    return intersects;
-  }
-
   select(objects: Object3D | Object3D[], model?: IModelImpl) {
     if (!model) {
       this.viewer.models.forEach((model) => this.select(objects, model));

package/src/Viewer/components/index.ts

@@ -41,8 +41,8 @@ import { ResetComponent } from "./ResetComponent";
  *
  * 1. Define a component class implements {@link IComponent}.
  * 2. Define a constructor with a `viewer` parameter and add mouse event listeners for the specified viewer.
- * 3. Define the component logic in the event listeners. For example, listen for the `mousedown` event and
- *    select objects when the left mouse button is pressed.
+ * 3. Define the component logic in the event listeners. For example, listen for the `geometryend` event and
+ *    implement post-processing logic for the model.
  * 4. Override {@link IComponent.dispose} and remove mouse event listeners from the viewer.
  * 5. Register component provider in the components registry by calling the
  *    {@link components.registerComponent}.
@@ -57,15 +57,15 @@ import { ResetComponent } from "./ResetComponent";
  *
  *   constructor(viewer: Viewer) {
  *     this.viewer = viewer;
- *     this.viewer.addEventListener("mousedown", this.onMouseDown);
+ *     this.viewer.addEventListener("geometryend", this.onGeometryEnd);
  *   }
  *
  *   override dispose() {
- *     this.viewer.removeEventListener("mousedown", this.onMouseDown);
+ *     this.viewer.removeEventListener("geometryend", this.onGeometryEnd);
  *   }
  *
- *   onMouseDown = (event: PointerEvent) => {
- *     // place custom logic here
+ *   onGeometryEnd = (event: MouseEvent) => {
+ *     this.viewer.executeCommand("zoomToExtents");
  *   };
  * }
  *