@shopware-ag/dive 1.4.1 → 1.5.0

package/build/dive.d.cts

@@ -376,6 +376,11 @@ interface DROP_IT {
     'RETURN': boolean;
 }
 
+interface SET_GIZMO_VISIBILITY {
+    'PAYLOAD': boolean;
+    'RETURN': boolean;
+}
+
 type Actions = {
     GET_ALL_SCENE_DATA: GET_ALL_SCENE_DATA;
     GET_ALL_OBJECTS: GET_ALL_OBJECTS;
@@ -395,6 +400,7 @@ type Actions = {
     SET_CAMERA_LAYER: SET_CAMERA_LAYER;
     ZOOM_CAMERA: ZOOM_CAMERA;
     SET_GIZMO_MODE: SET_GIZMO_MODE;
+    SET_GIZMO_VISIBILITY: SET_GIZMO_VISIBILITY;
     MODEL_LOADED: MODEL_LOADED;
     UPDATE_SCENE: UPDATE_SCENE;
     GENERATE_MEDIA: GENERATE_MEDIA;
@@ -473,6 +479,7 @@ declare class DIVEToolbox {
     GetActiveTool(): DIVEBaseTool;
     UseTool(tool: string): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
+    SetGizmoVisibility(active: boolean): void;
     onPointerMove(e: PointerEvent): void;
     onPointerDown(e: PointerEvent): void;
     onPointerUp(e: PointerEvent): void;
@@ -547,6 +554,7 @@ declare class DIVECommunication {
     private resetCamera;
     private zoomCamera;
     private setGizmoMode;
+    private setGizmoVisibility;
     private modelLoaded;
     private updateScene;
     private generateMedia;

package/build/dive.d.ts

@@ -376,6 +376,11 @@ interface DROP_IT {
     'RETURN': boolean;
 }
 
+interface SET_GIZMO_VISIBILITY {
+    'PAYLOAD': boolean;
+    'RETURN': boolean;
+}
+
 type Actions = {
     GET_ALL_SCENE_DATA: GET_ALL_SCENE_DATA;
     GET_ALL_OBJECTS: GET_ALL_OBJECTS;
@@ -395,6 +400,7 @@ type Actions = {
     SET_CAMERA_LAYER: SET_CAMERA_LAYER;
     ZOOM_CAMERA: ZOOM_CAMERA;
     SET_GIZMO_MODE: SET_GIZMO_MODE;
+    SET_GIZMO_VISIBILITY: SET_GIZMO_VISIBILITY;
     MODEL_LOADED: MODEL_LOADED;
     UPDATE_SCENE: UPDATE_SCENE;
     GENERATE_MEDIA: GENERATE_MEDIA;
@@ -473,6 +479,7 @@ declare class DIVEToolbox {
     GetActiveTool(): DIVEBaseTool;
     UseTool(tool: string): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
+    SetGizmoVisibility(active: boolean): void;
     onPointerMove(e: PointerEvent): void;
     onPointerDown(e: PointerEvent): void;
     onPointerUp(e: PointerEvent): void;
@@ -547,6 +554,7 @@ declare class DIVECommunication {
     private resetCamera;
     private zoomCamera;
     private setGizmoMode;
+    private setGizmoVisibility;
     private modelLoaded;
     private updateScene;
     private generateMedia;

package/build/dive.js

@@ -301,6 +301,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;
@@ -471,6 +475,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;
@@ -706,6 +714,11 @@ var DIVEModel = class extends Object3D5 {
   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);
@@ -820,7 +833,7 @@ var DIVEModelRoot = class extends Object3D6 {
     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) {
@@ -1366,8 +1379,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;
@@ -1401,6 +1414,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) {
@@ -1435,11 +1456,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) {
@@ -1510,6 +1532,9 @@ var DIVEToolbox = class {
   SetGizmoMode(mode) {
     this.selectTool.SetGizmoMode(mode);
   }
+  SetGizmoVisibility(active) {
+    this.selectTool.SetGizmoVisibility(active);
+  }
   onPointerMove(e) {
     this.activeTool.onPointerMove(e);
   }