@inweb/viewer-three 26.10.6 → 26.11.1

package/src/Viewer/models/ModelImpl.ts

@@ -22,21 +22,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { Box3, Object3D, Vector3 } from "three";
-import { ILoader } from "@inweb/viewer-core";
-
 import { IModelImpl } from "./IModelImpl";
-import { Viewer } from "../Viewer";
-
-// Basic model implementation.
 
 export class ModelImpl implements IModelImpl {
-  public handle: string;
+  public id: string;
   public scene: Object3D;
-  public loader: ILoader;
-  public viewer: Viewer;
 
   constructor(scene: Object3D) {
-    this.handle = "1";
     this.scene = scene;
   }
 
@@ -106,27 +98,49 @@ export class ModelImpl implements IModelImpl {
     return false;
   }
 
+  hasHandle(handle: string): boolean {
+    return !handle.includes(":") || handle.split(":", 1)[0] === this.id + "";
+  }
+
   getOwnObjects(objects: Object3D | Object3D[]): Object3D[] {
     if (!Array.isArray(objects)) objects = [objects];
     return objects.filter((object) => this.hasObject(object));
   }
 
+  getOwnHandles(handles: string | string[]): string[] {
+    if (!Array.isArray(handles)) handles = [handles];
+    return handles.filter((handle) => this.hasHandle(handle));
+  }
+
   getObjectsByHandles(handles: string | string[]): Object3D[] {
-    const handleSet = new Set(handles);
+    const ownHandles = this.getOwnHandles(handles);
+    if (ownHandles.length === 0) return [];
+
+    const handleSet = new Set(ownHandles.map((handle) => handle.slice(handle.indexOf(":") + 1)));
+
     const objects = [];
-    this.scene.traverse((object) => handleSet.has(object.userData.handle) && objects.push(object));
+    this.scene.traverse((object) => {
+      const handle = object.userData.handle;
+      if (handle && handleSet.has(handle)) objects.push(object);
+    });
+
     return objects;
   }
 
   getHandlesByObjects(objects: Object3D | Object3D[]): string[] {
-    if (!Array.isArray(objects)) objects = [objects];
-    const handlesSet = new Set<string>();
-    this.getOwnObjects(objects).forEach((object) => handlesSet.add(object.userData.handle));
-    return Array.from(handlesSet);
+    const ownObjects = this.getOwnObjects(objects);
+    if (ownObjects.length === 0) return [];
+
+    const handleSet = new Set<string>();
+    ownObjects.forEach((object) => {
+      const handle = object.userData.handle;
+      if (handle) handleSet.add(`${this.id}:${handle}`);
+    });
+
+    return Array.from(handleSet);
   }
 
   hideObjects(objects: Object3D | Object3D[]): this {
-    if (!Array.isArray(objects)) objects = [objects];
     this.getOwnObjects(objects).forEach((object) => (object.visible = false));
     return this;
   }
@@ -144,7 +158,6 @@ export class ModelImpl implements IModelImpl {
   }
 
   showObjects(objects: Object3D | Object3D[]): this {
-    if (!Array.isArray(objects)) objects = [objects];
     this.getOwnObjects(objects).forEach((object) => {
       object.visible = true;
       object.traverseAncestors((parent) => (parent.visible = true));