@shopware-ag/dive 1.3.2 → 1.4.1

package/build/dive.d.cts

@@ -354,6 +354,13 @@ interface SELECT_OBJECT {
     'RETURN': boolean;
 }
 
+interface DESELECT_OBJECT {
+    'PAYLOAD': Partial<COMEntity> & {
+        id: string;
+    };
+    'RETURN': boolean;
+}
+
 interface GET_CAMERA_TRANSFORM {
     'PAYLOAD': object;
     'RETURN': {
@@ -377,6 +384,7 @@ type Actions = {
     UPDATE_OBJECT: UPDATE_OBJECT;
     DELETE_OBJECT: DELETE_OBJECT;
     SELECT_OBJECT: SELECT_OBJECT;
+    DESELECT_OBJECT: DESELECT_OBJECT;
     SET_BACKGROUND: SET_BACKGROUND;
     DROP_IT: DROP_IT;
     PLACE_ON_FLOOR: PLACE_ON_FLOOR;
@@ -528,6 +536,7 @@ declare class DIVECommunication {
     private updateObject;
     private deleteObject;
     private selectObject;
+    private deselectObject;
     private setBackground;
     private dropIt;
     private placeOnFloor;

package/build/dive.d.ts

@@ -354,6 +354,13 @@ interface SELECT_OBJECT {
     'RETURN': boolean;
 }
 
+interface DESELECT_OBJECT {
+    'PAYLOAD': Partial<COMEntity> & {
+        id: string;
+    };
+    'RETURN': boolean;
+}
+
 interface GET_CAMERA_TRANSFORM {
     'PAYLOAD': object;
     'RETURN': {
@@ -377,6 +384,7 @@ type Actions = {
     UPDATE_OBJECT: UPDATE_OBJECT;
     DELETE_OBJECT: DELETE_OBJECT;
     SELECT_OBJECT: SELECT_OBJECT;
+    DESELECT_OBJECT: DESELECT_OBJECT;
     SET_BACKGROUND: SET_BACKGROUND;
     DROP_IT: DROP_IT;
     PLACE_ON_FLOOR: PLACE_ON_FLOOR;
@@ -528,6 +536,7 @@ declare class DIVECommunication {
     private updateObject;
     private deleteObject;
     private selectObject;
+    private deselectObject;
     private setBackground;
     private dropIt;
     private placeOnFloor;

package/build/dive.js

@@ -257,6 +257,10 @@ var _DIVECommunication = class _DIVECommunication {
         returnValue = this.selectObject(payload);
         break;
       }
+      case "DESELECT_OBJECT": {
+        returnValue = this.deselectObject(payload);
+        break;
+      }
       case "SET_BACKGROUND": {
         returnValue = this.setBackground(payload);
         break;
@@ -392,7 +396,18 @@ var _DIVECommunication = class _DIVECommunication {
     if (!sceneObject) return false;
     if (!("isSelectable" in sceneObject)) return false;
     this.toolbox.UseTool("select");
-    this.toolbox.GetActiveTool().Select(sceneObject);
+    this.toolbox.GetActiveTool().AttachGizmo(sceneObject);
+    Object.assign(payload, object);
+    return true;
+  }
+  deselectObject(payload) {
+    const object = this.registered.get(payload.id);
+    if (!object) return false;
+    const sceneObject = this.scene.GetSceneObject(object);
+    if (!sceneObject) return false;
+    if (!("isSelectable" in sceneObject)) return false;
+    this.toolbox.UseTool("select");
+    this.toolbox.GetActiveTool().DetachGizmo();
     Object.assign(payload, object);
     return true;
   }
@@ -506,7 +521,7 @@ var DIVEPointLight = class extends Object3D2 {
     const geometry = new SphereGeometry(geoSize, geoSize * 320, geoSize * 320);
     const material = new MeshBasicMaterial({ color: this.light.color, transparent: true, opacity: 0.8, side: FrontSide });
     this.mesh = new Mesh(geometry, material);
-    this.mesh.layers.mask = HELPER_LAYER_MASK;
+    this.mesh.layers.mask = UI_LAYER_MASK;
     this.add(this.mesh);
   }
   SetColor(color) {
@@ -524,6 +539,14 @@ var DIVEPointLight = class extends Object3D2 {
     var _a;
     (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("UPDATE_OBJECT", { id: this.userData.id, position: this.position });
   }
+  onSelect() {
+    var _a;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("SELECT_OBJECT", { id: this.userData.id });
+  }
+  onDeselect() {
+    var _a;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("DESELECT_OBJECT", { id: this.userData.id });
+  }
 };
 
 // src/light/SceneLight.ts
@@ -721,6 +744,14 @@ var DIVEModel = class extends Object3D5 {
     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 });
   }
+  onSelect() {
+    var _a;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("SELECT_OBJECT", { id: this.userData.id });
+  }
+  onDeselect() {
+    var _a;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction("DESELECT_OBJECT", { id: this.userData.id });
+  }
 };
 
 // src/loadingmanager/LoadingManager.ts
@@ -1351,6 +1382,18 @@ var DIVETransformTool = class extends DIVEBaseTool {
     this.name = "DIVETransformTool";
     this._gizmo = new TransformControls(this._controller.object, this._controller.domElement);
     this._gizmo.mode = "translate";
+    this._gizmo.addEventListener("mouseDown", () => {
+      controller.enabled = false;
+    });
+    this._gizmo.addEventListener("mouseUp", () => {
+      controller.enabled = true;
+    });
+    this._gizmo.addEventListener("objectChange", () => {
+      if (!this._gizmo.object) return;
+      if (!("isMoveable" in this._gizmo.object)) return;
+      if (!("onMove" in this._gizmo.object)) return;
+      this._gizmo.object.onMove();
+    });
     scene.add(this._gizmo);
   }
   Activate() {
@@ -1379,15 +1422,21 @@ var DIVESelectTool = class extends DIVETransformTool {
   }
   Select(selectable) {
     if (selectable.onSelect) selectable.onSelect();
-    if ("isMoveable" in selectable) {
-      const movable = selectable;
-      this._gizmo.attach(movable);
-    }
+    this.AttachGizmo(selectable);
   }
   Deselect(selectable) {
     if (selectable.onDeselect) selectable.onDeselect();
+    this.DetachGizmo();
+  }
+  DetachGizmo() {
     this._gizmo.detach();
   }
+  AttachGizmo(selectable) {
+    if ("isMoveable" in selectable) {
+      const movable = selectable;
+      this._gizmo.attach(movable);
+    }
+  }
   onClick(e) {
     super.onClick(e);
     const first = this._raycaster.intersectObjects(this._scene.Root.children, true)[0];
@@ -1422,15 +1471,19 @@ var DIVEToolbox = class {
     this.removeListenersCallback = () => {
     };
     this.selectTool = new DIVESelectTool(scene, controller);
-    controller.domElement.addEventListener("pointermove", this.onPointerMove.bind(this));
-    controller.domElement.addEventListener("pointerdown", this.onPointerDown.bind(this));
-    controller.domElement.addEventListener("pointerup", this.onPointerUp.bind(this));
-    controller.domElement.addEventListener("wheel", this.onWheel.bind(this));
+    const pointerMove = this.onPointerMove.bind(this);
+    const pointerDown = this.onPointerDown.bind(this);
+    const pointerUp = this.onPointerUp.bind(this);
+    const wheel = this.onWheel.bind(this);
+    controller.domElement.addEventListener("pointermove", pointerMove);
+    controller.domElement.addEventListener("pointerdown", pointerDown);
+    controller.domElement.addEventListener("pointerup", pointerUp);
+    controller.domElement.addEventListener("wheel", wheel);
     this.removeListenersCallback = () => {
-      controller.domElement.removeEventListener("pointermove", this.onPointerMove.bind(this));
-      controller.domElement.removeEventListener("pointerdown", this.onPointerDown.bind(this));
-      controller.domElement.removeEventListener("pointerup", this.onPointerUp.bind(this));
-      controller.domElement.removeEventListener("wheel", this.onWheel.bind(this));
+      controller.domElement.removeEventListener("pointermove", pointerMove);
+      controller.domElement.removeEventListener("pointerdown", pointerDown);
+      controller.domElement.removeEventListener("pointerup", pointerUp);
+      controller.domElement.removeEventListener("wheel", wheel);
     };
     this.activeTool = this.selectTool;
     this.activeTool.Activate();