@shopware-ag/dive 1.15.2 → 1.15.4

package/build/dive.d.cts

@@ -405,9 +405,11 @@ interface COMPUTE_ENCOMPASSING_VIEW {
  *
  * @module
  */
-interface DIVEMoveable {
-    isMoveable: true;
+interface DIVEMovable {
+    isMovable: true;
+    onMoveStart?: () => void;
     onMove?: () => void;
+    onMoveEnd?: () => void;
 }
 
 /**
@@ -415,17 +417,16 @@ interface DIVEMoveable {
  *
  * @module
  */
-
 interface DIVESelectable {
     isSelectable: true;
     onSelect?: () => void;
     onDeselect?: () => void;
 }
 
-declare class DIVENode extends Object3D implements DIVESelectable, DIVEMoveable {
+declare class DIVENode extends Object3D implements DIVESelectable, DIVEMovable {
     readonly isDIVENode: true;
     readonly isSelectable: true;
-    readonly isMoveable: true;
+    readonly isMovable: true;
     gizmo: TransformControls | null;
     protected _boundingBox: Box3;
     constructor();
@@ -441,23 +442,21 @@ declare class DIVENode extends Object3D implements DIVESelectable, DIVEMoveable
 
 declare class DIVEGroup extends DIVENode {
     readonly isDIVEGroup: true;
-    private _boxMesh;
+    private _members;
+    private _lines;
     constructor();
-    SetBoundingBoxVisibility(visible: boolean): void;
+    SetLinesVisibility(visible: boolean, object?: Object3D): void;
     attach(object: DIVESceneObject): this;
     remove(object: DIVESceneObject): this;
+    UpdateLineTo(object: Object3D): void;
     /**
-     * Recalculates the position of the group based on it's bounding box.
-     * Children's world positions are kept.
+     * Adds a line to this grouo as last child.
      */
-    private recalculatePosition;
+    private createLine;
     /**
-     * Updates the bounding box of the group.
-     * @returns {Vector3} The new center of the bounding box.
+     * Updates a line to the object.
      */
-    private updateBB;
-    private updateBoxMesh;
-    onMove(): void;
+    private updateLineTo;
 }
 
 /**
@@ -486,10 +485,10 @@ declare class DIVEAmbientLight extends Object3D {
  *
  * @module
  */
-declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMoveable {
+declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMovable {
     readonly isDIVELight: true;
     readonly isDIVEPointLight: true;
-    readonly isMoveable: true;
+    readonly isMovable: true;
     readonly isSelectable: true;
     gizmo: TransformControls$1 | null;
     private light;
@@ -662,6 +661,12 @@ declare class DIVEScene extends Scene {
     }): void;
 }
 
+/**
+ * Interface for objects that can be hovered in the scene.
+ *
+ * @module
+ */
+
 interface DIVEDraggable {
     isDraggable: true;
     onDragStart?: (e: DraggableEvent) => void;
@@ -669,6 +674,12 @@ interface DIVEDraggable {
     onDragEnd?: (e: DraggableEvent) => void;
 }
 
+/**
+ * Interface for objects that can be hovered in the scene.
+ *
+ * @module
+ */
+
 interface DIVEHoverable {
     isHoverable: true;
     onPointerEnter?: (i: Intersection) => void;
@@ -723,7 +734,7 @@ declare abstract class DIVEBaseTool {
 /**
  * A Tool to select and move objects in the scene.
  *
- * Objects have to implement the DIVESelectable interface to be selectable and DIVEMoveable to be moveable.
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
  *
  * @module
  */
@@ -739,7 +750,7 @@ declare class DIVETransformTool extends DIVEBaseTool {
 /**
  * A Tool to select and move objects in the scene.
  *
- * Objects have to implement the DIVESelectable interface to be selectable and DIVEMoveable to be moveable.
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
  *
  * @module
  */

package/build/dive.d.ts

@@ -405,9 +405,11 @@ interface COMPUTE_ENCOMPASSING_VIEW {
  *
  * @module
  */
-interface DIVEMoveable {
-    isMoveable: true;
+interface DIVEMovable {
+    isMovable: true;
+    onMoveStart?: () => void;
     onMove?: () => void;
+    onMoveEnd?: () => void;
 }
 
 /**
@@ -415,17 +417,16 @@ interface DIVEMoveable {
  *
  * @module
  */
-
 interface DIVESelectable {
     isSelectable: true;
     onSelect?: () => void;
     onDeselect?: () => void;
 }
 
-declare class DIVENode extends Object3D implements DIVESelectable, DIVEMoveable {
+declare class DIVENode extends Object3D implements DIVESelectable, DIVEMovable {
     readonly isDIVENode: true;
     readonly isSelectable: true;
-    readonly isMoveable: true;
+    readonly isMovable: true;
     gizmo: TransformControls | null;
     protected _boundingBox: Box3;
     constructor();
@@ -441,23 +442,21 @@ declare class DIVENode extends Object3D implements DIVESelectable, DIVEMoveable
 
 declare class DIVEGroup extends DIVENode {
     readonly isDIVEGroup: true;
-    private _boxMesh;
+    private _members;
+    private _lines;
     constructor();
-    SetBoundingBoxVisibility(visible: boolean): void;
+    SetLinesVisibility(visible: boolean, object?: Object3D): void;
     attach(object: DIVESceneObject): this;
     remove(object: DIVESceneObject): this;
+    UpdateLineTo(object: Object3D): void;
     /**
-     * Recalculates the position of the group based on it's bounding box.
-     * Children's world positions are kept.
+     * Adds a line to this grouo as last child.
      */
-    private recalculatePosition;
+    private createLine;
     /**
-     * Updates the bounding box of the group.
-     * @returns {Vector3} The new center of the bounding box.
+     * Updates a line to the object.
      */
-    private updateBB;
-    private updateBoxMesh;
-    onMove(): void;
+    private updateLineTo;
 }
 
 /**
@@ -486,10 +485,10 @@ declare class DIVEAmbientLight extends Object3D {
  *
  * @module
  */
-declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMoveable {
+declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMovable {
     readonly isDIVELight: true;
     readonly isDIVEPointLight: true;
-    readonly isMoveable: true;
+    readonly isMovable: true;
     readonly isSelectable: true;
     gizmo: TransformControls$1 | null;
     private light;
@@ -662,6 +661,12 @@ declare class DIVEScene extends Scene {
     }): void;
 }
 
+/**
+ * Interface for objects that can be hovered in the scene.
+ *
+ * @module
+ */
+
 interface DIVEDraggable {
     isDraggable: true;
     onDragStart?: (e: DraggableEvent) => void;
@@ -669,6 +674,12 @@ interface DIVEDraggable {
     onDragEnd?: (e: DraggableEvent) => void;
 }
 
+/**
+ * Interface for objects that can be hovered in the scene.
+ *
+ * @module
+ */
+
 interface DIVEHoverable {
     isHoverable: true;
     onPointerEnter?: (i: Intersection) => void;
@@ -723,7 +734,7 @@ declare abstract class DIVEBaseTool {
 /**
  * A Tool to select and move objects in the scene.
  *
- * Objects have to implement the DIVESelectable interface to be selectable and DIVEMoveable to be moveable.
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
  *
  * @module
  */
@@ -739,7 +750,7 @@ declare class DIVETransformTool extends DIVEBaseTool {
 /**
  * A Tool to select and move objects in the scene.
  *
- * Objects have to implement the DIVESelectable interface to be selectable and DIVEMoveable to be moveable.
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
  *
  * @module
  */

package/build/dive.js

@@ -69,45 +69,27 @@ var init_VisibilityLayerMask = __esm({
   }
 });
 
-// src/interface/Draggable.ts
-var isDraggable, findDraggableInterface;
-var init_Draggable = __esm({
-  "src/interface/Draggable.ts"() {
+// src/helper/isInterface/implementsInterface.ts
+function implementsInterface(object, discriminator) {
+  if (!object) return false;
+  return discriminator in object;
+}
+var init_implementsInterface = __esm({
+  "src/helper/isInterface/implementsInterface.ts"() {
     "use strict";
-    isDraggable = (object) => {
-      return "isDraggable" in object;
-    };
-    findDraggableInterface = (child) => {
-      if (child === void 0) return void 0;
-      if (child.parent === null) {
-        return void 0;
-      }
-      if (isDraggable(child)) {
-        return child;
-      }
-      return findDraggableInterface(child.parent);
-    };
   }
 });
 
-// src/interface/Hoverable.ts
-var isHoverable, findHoverableInterface;
-var init_Hoverable = __esm({
-  "src/interface/Hoverable.ts"() {
+// src/helper/findInterface/findInterface.ts
+function findInterface(object, discriminator) {
+  if (!object) return void 0;
+  if (implementsInterface(object, discriminator)) return object;
+  return findInterface(object.parent, discriminator);
+}
+var init_findInterface = __esm({
+  "src/helper/findInterface/findInterface.ts"() {
     "use strict";
-    isHoverable = (object) => {
-      return "isHoverable" in object;
-    };
-    findHoverableInterface = (child) => {
-      if (child === void 0) return void 0;
-      if (child.parent === null) {
-        return void 0;
-      }
-      if (isHoverable(child)) {
-        return child;
-      }
-      return findHoverableInterface(child.parent);
-    };
+    init_implementsInterface();
   }
 });
 
@@ -118,8 +100,7 @@ var init_BaseTool = __esm({
   "src/toolbox/BaseTool.ts"() {
     "use strict";
     init_VisibilityLayerMask();
-    init_Draggable();
-    init_Hoverable();
+    init_findInterface();
     DIVEBaseTool = class {
       constructor(scene, controller) {
         this.POINTER_DRAG_THRESHOLD = 1e-3;
@@ -166,7 +147,7 @@ var init_BaseTool = __esm({
             break;
         }
         this._lastPointerDown.copy(this._pointer);
-        this._draggable = findDraggableInterface((_a = this._intersects[0]) == null ? void 0 : _a.object) || null;
+        this._draggable = findInterface((_a = this._intersects[0]) == null ? void 0 : _a.object, "isDraggable") || null;
       }
       onDragStart(e) {
         if (!this._draggable) return;
@@ -195,7 +176,7 @@ var init_BaseTool = __esm({
         this._pointer.y = -(e.offsetY / this._canvas.clientHeight) * 2 + 1;
         this._raycaster.setFromCamera(this._pointer, this._controller.object);
         this._intersects = this.raycast(this._scene.children);
-        const hoverable = findHoverableInterface((_a = this._intersects[0]) == null ? void 0 : _a.object);
+        const hoverable = findInterface((_a = this._intersects[0]) == null ? void 0 : _a.object, "isHoverable");
         if (this._intersects[0] && hoverable) {
           if (!this._hovered) {
             if (hoverable.onPointerEnter) hoverable.onPointerEnter(this._intersects[0]);
@@ -307,6 +288,7 @@ var init_TransformTool = __esm({
   "src/toolbox/transform/TransformTool.ts"() {
     "use strict";
     init_BaseTool();
+    init_implementsInterface();
     DIVETransformTool = class extends DIVEBaseTool {
       constructor(scene, controller) {
         super(scene, controller);
@@ -316,16 +298,21 @@ var init_TransformTool = __esm({
         this._gizmo.mode = "translate";
         this._gizmo.addEventListener("mouseDown", () => {
           controller.enabled = false;
-        });
-        this._gizmo.addEventListener("mouseUp", () => {
-          controller.enabled = true;
+          if (!implementsInterface(this._gizmo.object, "isMovable")) return;
+          if (!this._gizmo.object.onMoveStart) return;
+          this._gizmo.object.onMoveStart();
         });
         this._gizmo.addEventListener("objectChange", () => {
-          if (!this._gizmo.object) return;
-          if (!("isMoveable" in this._gizmo.object)) return;
-          if (!("onMove" in this._gizmo.object)) return;
+          if (!implementsInterface(this._gizmo.object, "isMovable")) return;
+          if (!this._gizmo.object.onMove) return;
           this._gizmo.object.onMove();
         });
+        this._gizmo.addEventListener("mouseUp", () => {
+          controller.enabled = true;
+          if (!implementsInterface(this._gizmo.object, "isMovable")) return;
+          if (!this._gizmo.object.onMoveEnd) return;
+          this._gizmo.object.onMoveEnd();
+        });
         scene.add(this._gizmo);
       }
       Activate() {
@@ -354,26 +341,6 @@ var init_TransformTool = __esm({
   }
 });
 
-// src/interface/Selectable.ts
-function isSelectable(object) {
-  return "isSelectable" in object;
-}
-function findSelectableInterface(child) {
-  if (child === void 0) return void 0;
-  if (child.parent === null) {
-    return void 0;
-  }
-  if (isSelectable(child)) {
-    return child;
-  }
-  return findSelectableInterface(child.parent);
-}
-var init_Selectable = __esm({
-  "src/interface/Selectable.ts"() {
-    "use strict";
-  }
-});
-
 // src/toolbox/select/SelectTool.ts
 var SelectTool_exports = {};
 __export(SelectTool_exports, {
@@ -385,7 +352,7 @@ var init_SelectTool = __esm({
   "src/toolbox/select/SelectTool.ts"() {
     "use strict";
     init_TransformTool();
-    init_Selectable();
+    init_findInterface();
     isSelectTool = (tool) => {
       return tool.isSelectTool !== void 0;
     };
@@ -406,7 +373,7 @@ var init_SelectTool = __esm({
         this.DetachGizmo();
       }
       AttachGizmo(selectable) {
-        if ("isMoveable" in selectable) {
+        if ("isMovable" in selectable) {
           const movable = selectable;
           this._gizmo.attach(movable);
           this.SetGizmoVisibility(movable.visible);
@@ -418,7 +385,7 @@ var init_SelectTool = __esm({
       onClick(e) {
         super.onClick(e);
         const first = this._raycaster.intersectObjects(this._scene.Root.children, true).filter((intersect) => intersect.object.visible)[0];
-        const selectable = findSelectableInterface(first == null ? void 0 : first.object);
+        const selectable = findInterface(first == null ? void 0 : first.object, "isSelectable");
         if (!first || !selectable) {
           if (this._gizmo.object) {
             this.Deselect(this._gizmo.object);
@@ -1066,7 +1033,7 @@ var DIVEPointLight = class extends Object3D3 {
     super();
     this.isDIVELight = true;
     this.isDIVEPointLight = true;
-    this.isMoveable = true;
+    this.isMovable = true;
     this.isSelectable = true;
     this.gizmo = null;
     this.name = "DIVEPointLight";
@@ -1170,7 +1137,7 @@ var DIVENode = class extends Object3D5 {
     super();
     this.isDIVENode = true;
     this.isSelectable = true;
-    this.isMoveable = true;
+    this.isMovable = true;
     this.gizmo = null;
     this.layers.mask = PRODUCT_LAYER_MASK;
     this._boundingBox = new Box3();
@@ -1195,6 +1162,9 @@ var DIVENode = class extends Object3D5 {
   onMove() {
     var _a;
     (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("UPDATE_OBJECT", { id: this.userData.id, position: this.position, rotation: this.rotation, scale: this.scale });
+    if (this.parent && "isDIVEGroup" in this.parent) {
+      this.parent.UpdateLineTo(this);
+    }
   }
   onSelect() {
     var _a;
@@ -1472,68 +1442,120 @@ var DIVEPrimitive = class extends DIVENode {
 };
 
 // src/group/Group.ts
-import { BoxGeometry as BoxGeometry2, Mesh as Mesh4, MeshBasicMaterial as MeshBasicMaterial2, Vector3 as Vector34 } from "three";
+import { BufferGeometry as BufferGeometry2, Line, LineDashedMaterial, Vector3 as Vector34 } from "three";
 var DIVEGroup = class extends DIVENode {
+  // lines to children
   constructor() {
     super();
     this.isDIVEGroup = true;
     this.name = "DIVEGroup";
-    this._boxMesh = new Mesh4(new BoxGeometry2(0, 0, 0), new MeshBasicMaterial2({ color: 16711680, wireframe: true }));
-    this._boxMesh.visible = false;
-    this.add(this._boxMesh);
+    this._members = [];
+    this._lines = [];
   }
-  SetBoundingBoxVisibility(visible) {
-    this._boxMesh.visible = visible;
+  SetLinesVisibility(visible, object) {
+    if (!object) {
+      this._lines.forEach((line) => {
+        line.visible = visible;
+      });
+      return;
+    }
+    const index = this._members.indexOf(object);
+    if (index === -1) return;
+    this._lines[index].visible = visible;
   }
   attach(object) {
+    const line = this.createLine();
+    this.add(line);
+    this._lines.push(line);
     super.attach(object);
-    this.recalculatePosition();
-    this.updateBoxMesh();
+    this._members.push(object);
+    this.updateLineTo(line, object);
+    this.SetLinesVisibility(true, object);
     return this;
   }
   remove(object) {
+    const index = this._members.indexOf(object);
+    if (index === -1) return this;
+    const line = this._lines[index];
+    super.remove(line);
+    this._lines.splice(index, 1);
     super.remove(object);
-    this.recalculatePosition();
-    this.updateBoxMesh();
+    this._members.splice(index, 1);
     return this;
   }
+  UpdateLineTo(object) {
+    const index = this._members.indexOf(object);
+    if (index === -1) return;
+    this.updateLineTo(this._lines[index], object);
+  }
   /**
-   * Recalculates the position of the group based on it's bounding box.
-   * Children's world positions are kept.
+   * Adds a line to this grouo as last child.
    */
-  recalculatePosition() {
-    var _a;
-    const childrensWorldPositions = this.children.map((child) => child.getWorldPosition(new Vector34()));
-    const bbcenter = this.updateBB();
-    this.position.copy(bbcenter);
-    this.children.forEach((child, i) => {
-      if (child.uuid === this._boxMesh.uuid) return;
-      child.position.copy(this.worldToLocal(childrensWorldPositions[i]));
+  createLine() {
+    const geo = new BufferGeometry2();
+    const mat = new LineDashedMaterial({
+      color: 6710886,
+      dashSize: 0.05,
+      gapSize: 0.025
     });
-    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("UPDATE_OBJECT", { id: this.userData.id, position: this.position });
+    const line = new Line(geo, mat);
+    line.visible = false;
+    return line;
   }
   /**
-   * Updates the bounding box of the group.
-   * @returns {Vector3} The new center of the bounding box.
+   * Updates a line to the object.
    */
-  updateBB() {
-    this._boundingBox.makeEmpty();
-    this.children.forEach((child) => {
-      if (child.uuid === this._boxMesh.uuid) return;
-      this._boundingBox.expandByObject(child);
-    });
-    return this._boundingBox.getCenter(new Vector34());
-  }
-  updateBoxMesh() {
-    this._boxMesh.quaternion.copy(this.quaternion.clone().invert());
-    this._boxMesh.scale.set(1 / this.scale.x, 1 / this.scale.y, 1 / this.scale.z);
-    this._boxMesh.geometry = new BoxGeometry2(this._boundingBox.max.x - this._boundingBox.min.x, this._boundingBox.max.y - this._boundingBox.min.y, this._boundingBox.max.z - this._boundingBox.min.z);
-  }
-  onMove() {
-    super.onMove();
-    this.updateBB();
-    this.updateBoxMesh();
-  }
+  updateLineTo(line, object) {
+    line.geometry.setFromPoints([new Vector34(0, 0, 0), object.position.clone()]);
+    line.computeLineDistances();
+  }
+  // public SetBoundingBoxVisibility(visible: boolean): void {
+  //     this._boxMesh.visible = visible;
+  // }
+  // /**
+  //  * Recalculates the position of the group based on it's bounding box.
+  //  * Children's world positions are kept.
+  //  */
+  // private recalculatePosition(): void {
+  //     // store all children's world positions
+  //     const childrensWorldPositions: Vector3[] = this.children.map((child) => child.getWorldPosition(new Vector3()));
+  //     // calculate new center and set it as the group's position
+  //     const bbcenter = this.updateBB();
+  //     this.position.copy(bbcenter);
+  //     // set childrens's positions so their world positions are kept
+  //     this.children.forEach((child, i) => {
+  //         if (child.uuid === this._boxMesh.uuid) return;
+  //         child.position.copy(this.worldToLocal(childrensWorldPositions[i]));
+  //     });
+  //     DIVECommunication.get(this.userData.id)?.PerformAction('UPDATE_OBJECT', { id: this.userData.id, position: this.position });
+  // }
+  // /**
+  //  * Updates the bounding box of the group.
+  //  * @returns {Vector3} The new center of the bounding box.
+  //  */
+  // private updateBB(): Vector3 {
+  //     this._boundingBox.makeEmpty();
+  //     if (this.children.length === 1) {
+  //         // because we always have the box mesh as 1 child
+  //         return this.position.clone();
+  //     }
+  //     this.children.forEach((child) => {
+  //         if (child.uuid === this._boxMesh.uuid) return;
+  //         this._boundingBox.expandByObject(child);
+  //     });
+  //     return this._boundingBox.getCenter(new Vector3());
+  // }
+  // private updateBoxMesh(): void {
+  //     if (this.children.length === 1) {
+  //         // because we always have the box mesh as 1 child
+  //         this._boxMesh.visible = false;
+  //         return;
+  //     }
+  //     this._boxMesh.quaternion.copy(this.quaternion.clone().invert());
+  //     this._boxMesh.scale.set(1 / this.scale.x, 1 / this.scale.y, 1 / this.scale.z);
+  //     this._boxMesh.geometry = new BoxGeometry(this._boundingBox.max.x - this._boundingBox.min.x, this._boundingBox.max.y - this._boundingBox.min.y, this._boundingBox.max.z - this._boundingBox.min.z);
+  //     this._boxMesh.visible = true;
+  // }
 };
 
 // src/scene/root/Root.ts
@@ -1554,7 +1576,14 @@ var DIVERoot = class extends Object3D6 {
     return bb;
   }
   GetSceneObject(object) {
-    return this.children.find((object3D) => object3D.userData.id === object.id);
+    let foundObject;
+    this.traverse((object3D) => {
+      if (foundObject) return;
+      if (object3D.userData.id === object.id) {
+        foundObject = object3D;
+      }
+    });
+    return foundObject;
   }
   AddSceneObject(object) {
     switch (object.entityType) {
@@ -1723,7 +1752,7 @@ var DIVERoot = class extends Object3D6 {
     if (group.rotation !== void 0) sceneObject.SetRotation(group.rotation);
     if (group.scale !== void 0) sceneObject.SetScale(group.scale);
     if (group.visible !== void 0) sceneObject.SetVisibility(group.visible);
-    if (group.bbVisible !== void 0) sceneObject.SetBoundingBoxVisibility(group.bbVisible);
+    if (group.bbVisible !== void 0) sceneObject.SetLinesVisibility(group.bbVisible);
     if (group.parent !== void 0) this.setParent(__spreadProps(__spreadValues({}, group), { parent: group.parent }));
   }
   deleteLight(light) {
@@ -1823,8 +1852,8 @@ var DIVEGrid = class extends Object3D7 {
 
 // src/primitive/floor/Floor.ts
 init_VisibilityLayerMask();
-import { Color as Color6, Mesh as Mesh5, MeshStandardMaterial as MeshStandardMaterial3, PlaneGeometry } from "three";
-var DIVEFloor = class extends Mesh5 {
+import { Color as Color6, Mesh as Mesh4, MeshStandardMaterial as MeshStandardMaterial3, PlaneGeometry } from "three";
+var DIVEFloor = class extends Mesh4 {
   constructor() {
     super(new PlaneGeometry(1e4, 1e4), new MeshStandardMaterial3({ color: new Color6(150 / 255, 150 / 255, 150 / 255) }));
     this.isFloor = true;