@inweb/viewer-three 27.5.0 → 27.6.0

package/src/Viewer/models/ModelImpl.ts

@@ -95,8 +95,8 @@ export class ModelImpl implements IModelImpl {
       if (object.material) disposeMaterials(object.material);
     }
 
-    this.handleToObjects = undefined;
-    this.originalObjects = undefined;
+    this.handleToObjects.clear();
+    this.originalObjects.clear();
 
     this.scene.traverse(disposeObject);
     this.scene.clear();
@@ -308,7 +308,7 @@ export class ModelImpl implements IModelImpl {
   }
 
   getVisibleObjects(): Object3D[] {
-    const objects = [];
+    const objects: Object3D[] = [];
     this.scene.traverseVisible((object) => object.userData.handle && objects.push(object));
     return objects;
   }
@@ -316,7 +316,7 @@ export class ModelImpl implements IModelImpl {
   getObjectsByHandles(handles: string | string[]): Object3D[] {
     if (!Array.isArray(handles)) handles = [handles];
 
-    const ownHandles = [];
+    const ownHandles: string[] = [];
     handles.forEach((handle) => {
       const index = handle.indexOf(":");
       if (index !== -1) {
@@ -328,7 +328,7 @@ export class ModelImpl implements IModelImpl {
 
     const handlesSet = new Set<string>(ownHandles);
 
-    const objects = [];
+    const objects: Object3D[][] = [];
     handlesSet.forEach((handle) => {
       objects.push(Array.from(this.handleToObjects.get(handle) || []));
     });
@@ -427,25 +427,40 @@ export class ModelImpl implements IModelImpl {
       return target;
     };
 
-    function calcExplodeDepth(object: Object3D, depth: number): number {
-      let result = depth;
+    const calcObjectOffset = (object: Object3D, target: Vector3): Vector3 => {
+      const parent = object.parent;
+      if (!parent || parent.userData.originalCenter === undefined) return target;
 
-      object.children.forEach((x: Object3D) => {
-        const objectDepth = calcExplodeDepth(x, depth + 1);
-        if (result < objectDepth) result = objectDepth;
-      });
+      return target.subVectors(object.userData.originalCenter, parent.userData.originalCenter);
+    };
+
+    const calcObjectDepth = (object: Object3D): number => {
+      if (object.userData.depth !== undefined) return object.userData.depth;
+
+      const parent = object.parent;
+      const depth = parent && object !== explodeRoot ? calcObjectDepth(parent) + 1 : 0;
 
+      object.userData.depth = depth;
       object.userData.originalPosition = object.position.clone();
       object.userData.originalCenter = calcObjectCenter(object, new Vector3());
+      object.userData.originalOffset = calcObjectOffset(object, new Vector3());
 
-      return result;
-    }
+      return depth;
+    };
 
     const explodeScale = scale / 100;
     const explodeRoot = this.scene;
+    const explodeObjects = this.getObjects();
+
+    if (explodeRoot.userData.explodeDepth === undefined) {
+      let maxDepth = 0;
 
-    if (!explodeRoot.userData.explodeDepth) {
-      explodeRoot.userData.explodeDepth = calcExplodeDepth(explodeRoot, 1);
+      explodeObjects.forEach((object: Object3D) => {
+        const depth = calcObjectDepth(object);
+        if (depth > maxDepth) maxDepth = depth;
+      });
+
+      explodeRoot.userData.explodeDepth = maxDepth;
     }
 
     const maxDepth = explodeRoot.userData.explodeDepth;
@@ -453,27 +468,25 @@ export class ModelImpl implements IModelImpl {
     const explodeDepth = 0 | scaledExplodeDepth;
     const currentSegmentFraction = scaledExplodeDepth - explodeDepth;
 
-    function explodeObject(object: any, depth: number) {
+    const explodeObject = (object: any) => {
       if (object.isCamera) return;
-      if (object.userData.isHighlightWireframe) return;
 
       object.position.copy(object.userData.originalPosition);
 
+      const depth = object.userData.depth;
+
       if (depth > 0 && depth <= explodeDepth) {
         let objectScale = explodeScale * coeff;
         if (depth === explodeDepth) objectScale *= currentSegmentFraction;
 
-        const parentCenter = object.parent.userData.originalCenter;
-        const objectCenter = object.userData.originalCenter;
-        const localOffset = objectCenter.clone().sub(parentCenter).multiplyScalar(objectScale);
-
-        object.position.add(localOffset);
+        object.position.addScaledVector(object.userData.originalOffset, objectScale);
       }
+    };
 
-      object.children.forEach((x: Object3D) => explodeObject(x, depth + 1));
-    }
+    explodeObjects.forEach((object: Object3D) => {
+      explodeObject(object);
+    });
 
-    explodeObject(explodeRoot, 0);
     this.scene.updateMatrixWorld();
 
     return this;