@shopware-ag/dive 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/dive",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Shopware Spatial Framework",
   "type": "module",
   "main": "./build/dive.cjs",

package/src/com/Communication.ts

@@ -166,6 +166,10 @@ export default class DIVECommunication {
                 returnValue = this.setGizmoVisibility(payload as Actions['SET_GIZMO_VISIBILITY']['PAYLOAD']);
                 break;
             }
+            case 'USE_TOOL': {
+                returnValue = this.useTool(payload as Actions['USE_TOOL']['PAYLOAD']);
+                break;
+            }
             case 'MODEL_LOADED': {
                 returnValue = this.modelLoaded(payload as Actions['MODEL_LOADED']['PAYLOAD']);
                 break;
@@ -420,6 +424,11 @@ export default class DIVECommunication {
         return payload;
     }
 
+    private useTool(payload: Actions['USE_TOOL']['PAYLOAD']): Actions['USE_TOOL']['RETURN'] {
+        this.toolbox.UseTool(payload.tool);
+        return true;
+    }
+
     private modelLoaded(payload: Actions['MODEL_LOADED']['PAYLOAD']): Actions['MODEL_LOADED']['RETURN'] {
         (this.registered.get(payload.id) as COMModel).loaded = true;
         return true;

package/src/com/actions/index.ts

@@ -21,6 +21,7 @@ import GET_CAMERA_TRANSFORM from "./camera/getcameratransform.ts";
 import DROP_IT from "./object/model/dropit.ts";
 import SET_GIZMO_VISIBILITY from "./toolbox/transform/setgizmovisible.js";
 import COMPUTE_ENCOMPASSING_VIEW from "./camera/computeencompassingview.ts";
+import USE_TOOL from "./toolbox/usetool.ts";
 
 export type Actions = {
     GET_ALL_SCENE_DATA: GET_ALL_SCENE_DATA,
@@ -43,6 +44,7 @@ export type Actions = {
     ZOOM_CAMERA: ZOOM_CAMERA,
     SET_GIZMO_MODE: SET_GIZMO_MODE,
     SET_GIZMO_VISIBILITY: SET_GIZMO_VISIBILITY,
+    USE_TOOL: USE_TOOL,
     MODEL_LOADED: MODEL_LOADED,
     UPDATE_SCENE: UPDATE_SCENE,
     GENERATE_MEDIA: GENERATE_MEDIA,

package/src/com/actions/toolbox/usetool.ts

@@ -0,0 +1,6 @@
+import { type ToolType } from "../../../toolbox/Toolbox";
+
+export default interface USE_TOOL {
+    'PAYLOAD': { tool: ToolType },
+    'RETURN': boolean,
+}

package/src/model/Model.ts

@@ -97,7 +97,7 @@ export default class DIVEModel extends Object3D implements DIVESelectable, DIVEM
             const worldPos = mesh.localToWorld(meshBB.max.clone());
 
             const oldPos = this.position.clone();
-            const newPos = this.position.clone().setY(worldPos.y).add(new Vector3(0, bottomY, 0));
+            const newPos = this.position.clone().setY(worldPos.y).sub(new Vector3(0, bottomY, 0));
             this.position.copy(newPos);
 
             // if the position changed, update the object in communication

package/src/model/__test__/Model.test.ts

@@ -43,6 +43,12 @@ jest.mock('three', () => {
                 this.z += vec3.z;
                 return this;
             };
+            this.sub = (vec3: Vector3) => {
+                this.x -= vec3.x;
+                this.y -= vec3.y;
+                this.z -= vec3.z;
+                return this;
+            };
             return this;
         }),
         Object3D: jest.fn(function () {
@@ -63,6 +69,7 @@ jest.mock('three', () => {
                 },
             }
             this.add = jest.fn();
+            this.sub = jest.fn();
             this.children = [{
                 visible: true,
                 material: {
@@ -278,7 +285,7 @@ describe('dive/model/DIVEModel', () => {
         model.parent = scene.Root;
 
         expect(() => model.DropIt()).not.toThrow();
-        expect(model.position.y).toBe(1.5);
+        expect(model.position.y).toBe(2.5);
         expect(comMock.PerformAction).toHaveBeenCalledTimes(1);
 
         expect(() => model.DropIt()).not.toThrow();