@shopware-ag/dive 1.3.2 → 1.4.0

package/README.md

@@ -162,22 +162,25 @@ In the following you find a list of all available actions to perform on DIVEComm
 | Action                                                                    | Description
 | :---                                                                      | :---
 | [GET_ALL_SCENE_DATA](./src/com/actions/scene/getallscenedata.ts)          | Return all scene data that is currently set
+| [GET_ALL_OBJECTS](./src/com/actions/object/getallobjects.ts)              | Return a map of all objects
+| [GET_OBJECTS](./src/com/actions/object/getobjects.ts)                     | Return an array of all objects with given ids
+| [PLACE_ON_FLOOR](./src/com/actions/object/model/placeonfloor.ts)          | Set a model onto to the floor
+| [ADD_OBJECT](./src/com/actions/object/addobject.ts)                       | Add an object to the scene
+| [UPDATE_OBJECT](./src/com/actions/object/updateobject.ts)                 | Update an existing object
+| [DELETE_OBJECT](./src/com/actions/object/deleteobject.ts)                 | Delete an existing object
+| [SELECT_OBJECT](./src/com/actions/object/selectobject.ts)                 | Select an existing object in the scene
+| [DESELECT_OBJECT](./src/com/actions/object/deselectobject.ts)             | Deselect an existing object in the scene
 | [SET_BACKGROUND](./src/com/actions/scene/setbackground.ts)                | Set a background color
-| [UPDATE_SCENE](./src/com/actions/scene/updatescene.ts)                    | Update scene data
+| [DROP_IT](./src/com/actions/object/model/dropit.ts)                       | Places the model onto the next underlying object's bounding box
+| [PLACE_ON_FLOOR](./src/com/actions/object/model/placeonfloor.ts)          | Places the model onto the floor (zero plane)
+| [SET_CAMERA_TRANSFORM](./src/com/actions/camera/setcameratransform.ts)    | Set camera transformation (w/o animation, used to initially set up camera)
 | [GET_CAMERA_TRANSFORM](./src/com/actions/camera/getcameratransform.ts)    | Return currenty camera transformation
 | [MOVE_CAMERA](./src/com/actions/camera/movecamera.ts)                     | Move camera to a specific position or the position of a previously defined POV (with an animation)
 | [RESET_CAMERA](./src/com/actions/camera/resetcamera.ts)                   | Reset camera to original position after MOVE_CAMERA was performed
 | [SET_CAMERA_LAYER](./src/com/actions/camera/setcameralayer.ts)            | Set camera layer to switch between live view and editor view
-| [SET_CAMERA_TRANSFORM](./src/com/actions/camera/setcameratransform.ts)    | Set camera transformation (w/o animation, used to initially set up camera)
 | [ZOOM_CAMERA](./src/com/actions/camera/zoomcamera.ts)                     | Zoom in or out
-| [GENERATE_MEDIA](./src/com/actions/media/generatemedia.ts)                | Generate a screenshot with the specified parameters
-| [MODEL_LOADED](./src/com/actions/object/model/modelloaded.ts)             | Is performed when a model file is completely loaded
-| [DROP_IT](./src/com/actions/object/model/dropit.ts)                       | Places the model onto the nextg underlying object's bounding box
-| [PLACE_ON_FLOOR](./src/com/actions/object/model/placeonfloor.ts)          | Set a model onto to the floor
-| [ADD_OBJECT](./src/com/actions/object/addobject.ts)                       | Add an object to the scene
-| [UPDATE_OBJECT](./src/com/actions/object/updateobject.ts)                 | Update an existing object
-| [DELETE_OBJECT](./src/com/actions/object/deleteobject.ts)                 | Delete an existing object
-| [GET_ALL_OBJECTS](./src/com/actions/object/getallobjects.ts)              | Return a map of all objects
-| [GET_OBJECTS](./src/com/actions/object/getobjects.ts)                     | Return a map of all objects (with the opportunity to filter for ids)
-| [SELECT_OBJECT](./src/com/actions/object/selectobject.ts)                 | Select an existing object in the scene
 | [SET_GIZMO_MODE](./src/com/actions/toolbox/select/setgizmomode.ts)        | Set gizmo mode
+| [MODEL_LOADED](./src/com/actions/object/model/modelloaded.ts)             | Is performed when a model file is completely loaded
+
+| [UPDATE_SCENE](./src/com/actions/scene/updatescene.ts)                    | Update scene data
+| [GENERATE_MEDIA](./src/com/actions/media/generatemedia.ts)                | Generate a screenshot with the specified parameters

package/build/dive.cjs

@@ -292,6 +292,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;
@@ -427,7 +431,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;
   }
@@ -541,7 +556,7 @@ var DIVEPointLight = class extends import_three4.Object3D {
     const geometry = new import_three4.SphereGeometry(geoSize, geoSize * 320, geoSize * 320);
     const material = new import_three4.MeshBasicMaterial({ color: this.light.color, transparent: true, opacity: 0.8, side: import_three4.FrontSide });
     this.mesh = new import_three4.Mesh(geometry, material);
-    this.mesh.layers.mask = HELPER_LAYER_MASK;
+    this.mesh.layers.mask = UI_LAYER_MASK;
     this.add(this.mesh);
   }
   SetColor(color) {
@@ -559,6 +574,14 @@ var DIVEPointLight = class extends import_three4.Object3D {
     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
@@ -756,6 +779,14 @@ var DIVEModel = class extends import_three7.Object3D {
     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
@@ -1386,6 +1417,18 @@ var DIVETransformTool = class extends DIVEBaseTool {
     this.name = "DIVETransformTool";
     this._gizmo = new import_Addons3.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() {
@@ -1414,15 +1457,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];