@shopware-ag/dive 1.17.0 → 1.17.2

package/build/dive.d.cts

@@ -1,4 +1,4 @@
-import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster } from 'three';
+import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster, Euler } from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
@@ -802,6 +802,41 @@ declare abstract class DIVEBaseTool {
     private pointerWasDragged;
 }
 
+declare class DIVEGizmoPlane extends Object3D {
+    private _meshX;
+    get XPlane(): Mesh;
+    private _meshY;
+    get YPlane(): Mesh;
+    private _meshZ;
+    get ZPlane(): Mesh;
+    constructor();
+    assemble(mode: DIVEGizmoMode, axis: DIVEGizmoAxis): void;
+}
+
+type DIVEGizmoMode = 'translate' | 'rotate' | 'scale';
+type DIVEGizmoAxis = 'x' | 'y' | 'z';
+declare class DIVEGizmo extends Object3D {
+    private _mode;
+    get mode(): DIVEGizmoMode;
+    set mode(value: DIVEGizmoMode);
+    set debug(value: boolean);
+    private _gizmoNode;
+    get gizmoNode(): Object3D;
+    private _translateGizmo;
+    private _rotateGizmo;
+    private _scaleGizmo;
+    private _gizmoPlane;
+    get gizmoPlane(): DIVEGizmoPlane;
+    private _object;
+    get object(): (Object3D & DIVESelectable) | null;
+    constructor(controller: DIVEOrbitControls);
+    attach(object: Object3D & DIVESelectable): this;
+    detach(): this;
+    onHover(mode: DIVEGizmoMode, axis: DIVEGizmoAxis, value: boolean): void;
+    onChange(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+    private assemble;
+}
+
 /**
  * A Tool to select and move objects in the scene.
  *
@@ -811,11 +846,12 @@ declare abstract class DIVEBaseTool {
  */
 declare class DIVETransformTool extends DIVEBaseTool {
     readonly isTransformTool: boolean;
-    protected _gizmo: TransformControls;
+    protected _gizmo: TransformControls | DIVEGizmo;
     constructor(scene: DIVEScene, controller: DIVEOrbitControls);
     Activate(): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
     SetGizmoVisibility(active: boolean): void;
+    private initGizmo;
 }
 
 /**

package/build/dive.d.ts

@@ -1,4 +1,4 @@
-import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster } from 'three';
+import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster, Euler } from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
@@ -802,6 +802,41 @@ declare abstract class DIVEBaseTool {
     private pointerWasDragged;
 }
 
+declare class DIVEGizmoPlane extends Object3D {
+    private _meshX;
+    get XPlane(): Mesh;
+    private _meshY;
+    get YPlane(): Mesh;
+    private _meshZ;
+    get ZPlane(): Mesh;
+    constructor();
+    assemble(mode: DIVEGizmoMode, axis: DIVEGizmoAxis): void;
+}
+
+type DIVEGizmoMode = 'translate' | 'rotate' | 'scale';
+type DIVEGizmoAxis = 'x' | 'y' | 'z';
+declare class DIVEGizmo extends Object3D {
+    private _mode;
+    get mode(): DIVEGizmoMode;
+    set mode(value: DIVEGizmoMode);
+    set debug(value: boolean);
+    private _gizmoNode;
+    get gizmoNode(): Object3D;
+    private _translateGizmo;
+    private _rotateGizmo;
+    private _scaleGizmo;
+    private _gizmoPlane;
+    get gizmoPlane(): DIVEGizmoPlane;
+    private _object;
+    get object(): (Object3D & DIVESelectable) | null;
+    constructor(controller: DIVEOrbitControls);
+    attach(object: Object3D & DIVESelectable): this;
+    detach(): this;
+    onHover(mode: DIVEGizmoMode, axis: DIVEGizmoAxis, value: boolean): void;
+    onChange(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+    private assemble;
+}
+
 /**
  * A Tool to select and move objects in the scene.
  *
@@ -811,11 +846,12 @@ declare abstract class DIVEBaseTool {
  */
 declare class DIVETransformTool extends DIVEBaseTool {
     readonly isTransformTool: boolean;
-    protected _gizmo: TransformControls;
+    protected _gizmo: TransformControls | DIVEGizmo;
     constructor(scene: DIVEScene, controller: DIVEOrbitControls);
     Activate(): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
     SetGizmoVisibility(active: boolean): void;
+    private initGizmo;
 }
 
 /**

package/build/dive.js

@@ -330,40 +330,7 @@ var init_TransformTool = __esm({
         super(scene, controller);
         this.isTransformTool = true;
         this.name = "DIVETransformTool";
-        this._gizmo = new TransformControls(
-          this._controller.object,
-          this._controller.domElement
-        );
-        this._gizmo.mode = "translate";
-        this._gizmo.addEventListener("mouseDown", () => {
-          controller.enabled = false;
-          if (!implementsInterface(
-            this._gizmo.object,
-            "isMovable"
-          ))
-            return;
-          if (!this._gizmo.object.onMoveStart) return;
-          this._gizmo.object.onMoveStart();
-        });
-        this._gizmo.addEventListener("objectChange", () => {
-          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();
-        });
+        this._gizmo = this.initGizmo();
         this._scene.add(this._gizmo);
       }
       Activate() {
@@ -375,19 +342,58 @@ var init_TransformTool = __esm({
         const contains = this._scene.children.includes(this._gizmo);
         if (active && !contains) {
           this._scene.add(this._gizmo);
+          if ("isTransformControls" in this._gizmo) {
+            this._gizmo.getRaycaster().layers.enableAll();
+          }
         } else if (!active && contains) {
           this._scene.remove(this._gizmo);
+          if ("isTransformControls" in this._gizmo) {
+            this._gizmo.getRaycaster().layers.disableAll();
+          }
         }
       }
+      // only used for optimizing pointer events with DIVEGizmo
       // public onPointerDown(e: PointerEvent): void {
       //     super.onPointerDown(e);
-      //     // if (this._hovered) {
-      //     //     this._dragRaycastOnObjects = this._gizmo.gizmoPlane.children;
-      //     // }
+      //     if (this._hovered) {
+      //         this._dragRaycastOnObjects = (
+      //             this._gizmo as DIVEGizmo
+      //         ).gizmoPlane?.children;
+      //     }
       // }
+      // only used for optimizing pointer events with DIVEGizmo
       // protected raycast(): Intersection[] {
-      //     return super.raycast(this._gizmo.gizmoNode.children);
+      //     return super.raycast((this._gizmo as DIVEGizmo).gizmoNode.children);
       // }
+      initGizmo() {
+        const g = new TransformControls(
+          // this._controller,
+          this._controller.object,
+          this._controller.domElement
+        );
+        g.mode = "translate";
+        g.addEventListener("mouseDown", () => {
+          this._controller.enabled = false;
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMoveStart) return;
+          g.object.onMoveStart();
+        });
+        g.addEventListener("objectChange", () => {
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMove) return;
+          g.object.onMove();
+        });
+        g.addEventListener("mouseUp", () => {
+          this._controller.enabled = true;
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMoveEnd) return;
+          g.object.onMoveEnd();
+        });
+        return g;
+      }
     };
   }
 });
@@ -2553,6 +2559,22 @@ var _DIVECommunication = class _DIVECommunication {
   deleteObject(payload) {
     const deletedObject = this.registered.get(payload.id);
     if (!deletedObject) return false;
+    if (deletedObject.parentId) {
+      this.setParent({
+        object: { id: deletedObject.id },
+        parent: null
+      });
+    }
+    if (deletedObject.entityType === "group") {
+      this.registered.forEach((object) => {
+        if (object.parentId === deletedObject.id) {
+          this.updateObject({
+            id: object.id,
+            parentId: null
+          });
+        }
+      });
+    }
     Object.assign(payload, deletedObject);
     this.registered.delete(payload.id);
     Array.from(this.registered.values()).forEach((object) => {
@@ -2715,6 +2737,10 @@ var _DIVECommunication = class _DIVECommunication {
     if (!sceneObject) return false;
     if (payload.parent === null) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     if (payload.object.id === payload.parent.id) {
@@ -2723,14 +2749,26 @@ var _DIVECommunication = class _DIVECommunication {
     const parent = this.registered.get(payload.parent.id);
     if (!parent) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     const parentObject = this.scene.GetSceneObject(parent);
     if (!parentObject) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     parentObject.attach(sceneObject);
+    this.updateObject({
+      id: object.id,
+      parentId: parent.id
+    });
     return true;
   }
   exportScene(payload) {
@@ -3005,12 +3043,15 @@ var DIVEModel = class extends DIVENode {
     }
   }
   PlaceOnFloor() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const worldPos = this.getWorldPosition(this._positionWorldBuffer);
     const oldWorldPos = worldPos.clone();
-    worldPos.y = (this._boundingBox.max.y - this._boundingBox.min.y) / 2;
+    (_b = (_a = this._mesh) == null ? void 0 : _a.geometry) == null ? void 0 : _b.computeBoundingBox();
+    const meshBB = (_d = (_c = this._mesh) == null ? void 0 : _c.geometry) == null ? void 0 : _d.boundingBox;
+    if (!meshBB || !this._mesh) return;
+    worldPos.y = worldPos.y - this._mesh.localToWorld(meshBB.min.clone()).y;
     if (worldPos.y === oldWorldPos.y) return;
-    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+    (_e = DIVECommunication.get(this.userData.id)) == null ? void 0 : _e.PerformAction(
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
@@ -3154,12 +3195,15 @@ var DIVEPrimitive = class extends DIVENode {
     if (this._mesh) this._mesh.material = primitiveMaterial;
   }
   PlaceOnFloor() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const worldPos = this.getWorldPosition(this._positionWorldBuffer);
     const oldWorldPos = worldPos.clone();
-    worldPos.y = (this._boundingBox.max.y - this._boundingBox.min.y) / 2;
+    (_b = (_a = this._mesh) == null ? void 0 : _a.geometry) == null ? void 0 : _b.computeBoundingBox();
+    const meshBB = (_d = (_c = this._mesh) == null ? void 0 : _c.geometry) == null ? void 0 : _d.boundingBox;
+    if (!meshBB || !this._mesh) return;
+    worldPos.y = worldPos.y - this._mesh.localToWorld(meshBB.min.clone()).y;
     if (worldPos.y === oldWorldPos.y) return;
-    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+    (_e = DIVECommunication.get(this.userData.id)) == null ? void 0 : _e.PerformAction(
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
@@ -4421,7 +4465,7 @@ import { generateUUID as generateUUID2 } from "three/src/math/MathUtils";
 // package.json
 var package_default = {
   name: "@shopware-ag/dive",
-  version: "1.17.0",
+  version: "1.17.2",
   description: "Shopware Spatial Framework",
   type: "module",
   main: "./build/dive.cjs",
@@ -4465,6 +4509,7 @@ var package_default = {
     globals: "^15.0.0",
     jest: "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "jest-junit": "^16.0.0",
     jsdom: "^24.0.0",
     prettier: "^3.3.3",
     "prettier-plugin-multiline-arrays": "^3.0.6",