@shopware-ag/dive 1.4.1 → 1.5.0

package/README.md

@@ -159,28 +159,28 @@ unsubscribe(); // <-- execute unsubscribe callback when done
 
 In the following you find a list of all available actions to perform on DIVECommunication class via `com.PerformAction()`.
 
-| 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
-| [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
-| [ZOOM_CAMERA](./src/com/actions/camera/zoomcamera.ts)                     | Zoom in or out
-| [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
+| 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
+| [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
+| [ZOOM_CAMERA](./src/com/actions/camera/zoomcamera.ts)                          | Zoom in or out
+| [SET_GIZMO_MODE](./src/com/actions/toolbox/select/setgizmomode.ts)             | Set gizmo mode
+| [SET_GIZMO_VISIBILITY](./src/com/actions/toolbox/select/setgizmovisibility.ts) | Set gizmo visibility
+| [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

@@ -336,6 +336,10 @@ var _DIVECommunication = class _DIVECommunication {
         returnValue = this.setGizmoMode(payload);
         break;
       }
+      case "SET_GIZMO_VISIBILITY": {
+        returnValue = this.setGizmoVisibility(payload);
+        break;
+      }
       case "MODEL_LOADED": {
         returnValue = this.modelLoaded(payload);
         break;
@@ -506,6 +510,10 @@ var _DIVECommunication = class _DIVECommunication {
     this.toolbox.SetGizmoMode(payload.mode);
     return true;
   }
+  setGizmoVisibility(payload) {
+    this.toolbox.SetGizmoVisibility(payload);
+    return payload;
+  }
   modelLoaded(payload) {
     this.registered.get(payload.id).loaded = true;
     return true;
@@ -741,6 +749,11 @@ var DIVEModel = class extends import_three7.Object3D {
   SetScale(scale) {
     this.scale.set(scale.x, scale.y, scale.z);
   }
+  SetVisibility(visible) {
+    this.traverse((child) => {
+      child.visible = visible;
+    });
+  }
   SetToWorldOrigin() {
     var _a;
     this.position.set(0, 0, 0);
@@ -855,7 +868,7 @@ var DIVEModelRoot = class extends import_three8.Object3D {
     if (object.position !== void 0) sceneObject.SetPosition(object.position);
     if (object.rotation !== void 0) sceneObject.SetRotation(object.rotation);
     if (object.scale !== void 0) sceneObject.SetScale(object.scale);
-    if (object.visible !== void 0) sceneObject.visible = object.visible;
+    if (object.visible !== void 0) sceneObject.SetVisibility(object.visible);
   }
   DeleteModel(object) {
     if (object.id === void 0) {
@@ -1401,8 +1414,8 @@ var DIVEBaseTool = class {
   onWheel(e) {
   }
   raycast(objects) {
-    if (objects !== void 0) return this._raycaster.intersectObjects(objects, true);
-    return this._raycaster.intersectObjects(this._scene.children, true);
+    if (objects !== void 0) return this._raycaster.intersectObjects(objects, true).filter((i) => i.object.visible);
+    return this._raycaster.intersectObjects(this._scene.children, true).filter((i) => i.object.visible);
   }
   pointerWasDragged() {
     return this._lastPointerDown.distanceTo(this._pointer) > this.POINTER_DRAG_THRESHOLD;
@@ -1436,6 +1449,14 @@ var DIVETransformTool = class extends DIVEBaseTool {
   SetGizmoMode(mode) {
     this._gizmo.mode = mode;
   }
+  SetGizmoVisibility(active) {
+    const contains = this._scene.children.includes(this._gizmo);
+    if (active && !contains) {
+      this._scene.add(this._gizmo);
+    } else if (!active && contains) {
+      this._scene.remove(this._gizmo);
+    }
+  }
   // public onPointerDown(e: PointerEvent): void {
   //     super.onPointerDown(e);
   //     // if (this._hovered) {
@@ -1470,11 +1491,12 @@ var DIVESelectTool = class extends DIVETransformTool {
     if ("isMoveable" in selectable) {
       const movable = selectable;
       this._gizmo.attach(movable);
+      this.SetGizmoVisibility(movable.visible);
     }
   }
   onClick(e) {
     super.onClick(e);
-    const first = this._raycaster.intersectObjects(this._scene.Root.children, true)[0];
+    const first = this._raycaster.intersectObjects(this._scene.Root.children, true).filter((intersect) => intersect.object.visible)[0];
     const selectable = this.findSelectableInterface(first == null ? void 0 : first.object);
     if (!first || !selectable) {
       if (this._gizmo.object) {
@@ -1545,6 +1567,9 @@ var DIVEToolbox = class {
   SetGizmoMode(mode) {
     this.selectTool.SetGizmoMode(mode);
   }
+  SetGizmoVisibility(active) {
+    this.selectTool.SetGizmoVisibility(active);
+  }
   onPointerMove(e) {
     this.activeTool.onPointerMove(e);
   }