@shopware-ag/dive 1.16.0 → 1.16.2

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

@@ -2,7 +2,14 @@ import { DIVEModel } from '../Model';
 import { DIVECommunication } from '../../com/Communication';
 import { GLTF } from 'three/examples/jsm/Addons';
 import { DIVEScene } from '../../scene/Scene';
-import { Vector3, Box3, Mesh, MeshStandardMaterial, type Texture, Color } from 'three';
+import {
+    Vector3,
+    Box3,
+    Mesh,
+    MeshStandardMaterial,
+    type Texture,
+    Color,
+} from 'three';
 import { type COMMaterial } from '../../com/types';
 
 const intersectObjectsMock = jest.fn();
@@ -37,7 +44,7 @@ jest.mock('three', () => {
             this.setY = (y: number) => {
                 this.y = y;
                 return this;
-            }
+            };
             this.add = (vec3: Vector3) => {
                 this.x += vec3.x;
                 this.y += vec3.y;
@@ -68,15 +75,17 @@ jest.mock('three', () => {
                     far: 0,
                     fov: 0,
                 },
-            }
+            };
             this.add = jest.fn();
             this.sub = jest.fn();
-            this.children = [{
-                visible: true,
-                material: {
-                    color: {},
+            this.children = [
+                {
+                    visible: true,
+                    material: {
+                        color: {},
+                    },
                 },
-            }];
+            ];
             this.userData = {};
             this.position = new Vector3();
             this.rotation = {
@@ -96,7 +105,7 @@ jest.mock('three', () => {
             };
             this.mesh = new Mesh();
             this.traverse = jest.fn((callback) => {
-                callback(this.children[0])
+                callback(this.children[0]);
             });
             return this;
         }),
@@ -148,7 +157,7 @@ jest.mock('three', () => {
             this.set = jest.fn();
             return this;
         }),
-    }
+    };
 });
 
 jest.mock('../../com/Communication.ts', () => {
@@ -157,10 +166,10 @@ jest.mock('../../com/Communication.ts', () => {
             get: jest.fn(() => {
                 return {
                     PerformAction: jest.fn(),
-                }
+                };
             }),
         },
-    }
+    };
 });
 
 const gltf = {
@@ -193,7 +202,9 @@ const gltf = {
     },
 } as unknown as GLTF;
 
-jest.spyOn(DIVECommunication, 'get').mockReturnValue({ PerformAction: jest.fn() } as unknown as DIVECommunication);
+jest.spyOn(DIVECommunication, 'get').mockReturnValue({
+    PerformAction: jest.fn(),
+} as unknown as DIVECommunication);
 
 let model: DIVEModel;
 
@@ -245,14 +256,14 @@ describe('dive/model/DIVEModel', () => {
             }),
         } as unknown as Box3;
 
-
         const hitObject = new Mesh();
         hitObject.geometry.boundingBox = new Box3();
         hitObject.geometry.boundingBox.max = new Vector3(0, 2, 0);
-        intersectObjectsMock.mockReturnValue([{
-            object: hitObject,
-
-        }]);
+        intersectObjectsMock.mockReturnValue([
+            {
+                object: hitObject,
+            },
+        ]);
 
         const scene = {
             parent: null,
@@ -283,8 +294,6 @@ describe('dive/model/DIVEModel', () => {
         jest.spyOn(DIVECommunication, 'get').mockReturnValueOnce(undefined);
         expect(() => model.DropIt()).not.toThrow();
         expect(comMock.PerformAction).toHaveBeenCalledTimes(1);
-
-
     });
 
     it('should set material', () => {
@@ -292,41 +301,59 @@ describe('dive/model/DIVEModel', () => {
         expect(() => model.SetMaterial({} as COMMaterial)).not.toThrow();
         expect(model['_material']).not.toBeNull();
 
-        expect(() => model.SetMaterial({
-            color: 0xffffff,
-            roughness: 0,
-            metalness: 1,
-        } as COMMaterial)).not.toThrow();
+        expect(() =>
+            model.SetMaterial({
+                color: 0xffffff,
+                roughness: 0,
+                metalness: 1,
+            } as COMMaterial),
+        ).not.toThrow();
         expect((model['_material'] as MeshStandardMaterial).roughness).toBe(0);
-        expect((model['_material'] as MeshStandardMaterial).roughnessMap).toBeUndefined();
+        expect(
+            (model['_material'] as MeshStandardMaterial).roughnessMap,
+        ).toBeUndefined();
         expect((model['_material'] as MeshStandardMaterial).metalness).toBe(1);
-        expect((model['_material'] as MeshStandardMaterial).metalnessMap).toBeUndefined();
-
-        expect(() => model.SetMaterial({
-            color: 0xff00ff,
-            vertexColors: true,
-            map: 'This_Is_A_Texture' as unknown as Texture,
-            normalMap: 'This_Is_A_Texture' as unknown as Texture,
-            roughness: 0,
-            roughnessMap: 'This_Is_A_Texture' as unknown as Texture,
-            metalness: 1,
-            metalnessMap: 'This_Is_A_Texture' as unknown as Texture,
-        } as COMMaterial)).not.toThrow();
+        expect(
+            (model['_material'] as MeshStandardMaterial).metalnessMap,
+        ).toBeUndefined();
+
+        expect(() =>
+            model.SetMaterial({
+                color: 0xff00ff,
+                vertexColors: true,
+                map: 'This_Is_A_Texture' as unknown as Texture,
+                normalMap: 'This_Is_A_Texture' as unknown as Texture,
+                roughness: 0,
+                roughnessMap: 'This_Is_A_Texture' as unknown as Texture,
+                metalness: 1,
+                metalnessMap: 'This_Is_A_Texture' as unknown as Texture,
+            } as COMMaterial),
+        ).not.toThrow();
         expect((model['_material'] as MeshStandardMaterial).roughness).toBe(1);
-        expect((model['_material'] as MeshStandardMaterial).roughnessMap).toBeDefined();
+        expect(
+            (model['_material'] as MeshStandardMaterial).roughnessMap,
+        ).toBeDefined();
         expect((model['_material'] as MeshStandardMaterial).metalness).toBe(1);
-        expect((model['_material'] as MeshStandardMaterial).metalnessMap).toBeDefined();
+        expect(
+            (model['_material'] as MeshStandardMaterial).metalnessMap,
+        ).toBeDefined();
     });
 
     it('should set model material when material already set before', () => {
         model.SetMaterial({ roughness: 0.5 } as COMMaterial);
         expect(() => model.SetModel(gltf)).not.toThrow();
-        expect((model['_mesh']?.material as MeshStandardMaterial).roughness).toBe(0.5);
+        expect(
+            (model['_mesh']?.material as MeshStandardMaterial).roughness,
+        ).toBe(0.5);
     });
 
     it('should set material to model when model already set before', () => {
         model.SetModel(gltf);
-        expect(() => model.SetMaterial({ roughness: 0.5 } as COMMaterial)).not.toThrow();
-        expect((model['_mesh']?.material as MeshStandardMaterial).roughness).toBe(0.5);
+        expect(() =>
+            model.SetMaterial({ roughness: 0.5 } as COMMaterial),
+        ).not.toThrow();
+        expect(
+            (model['_mesh']?.material as MeshStandardMaterial).roughness,
+        ).toBe(0.5);
     });
-});
+});

package/src/node/Node.ts

@@ -1,11 +1,11 @@
-import { Box3, Object3D, type Vector3Like } from "three";
-import { PRODUCT_LAYER_MASK } from "../constant/VisibilityLayerMask";
-import { DIVECommunication } from "../com/Communication";
+import { Box3, Object3D, type Vector3Like } from 'three';
+import { PRODUCT_LAYER_MASK } from '../constant/VisibilityLayerMask';
+import { DIVECommunication } from '../com/Communication';
 
-import { type DIVEMovable } from "../interface/Movable";
-import { type DIVESelectable } from "../interface/Selectable";
-import { type TransformControls } from "three/examples/jsm/controls/TransformControls";
-import { type DIVEGroup } from "../group/Group";
+import { type DIVEMovable } from '../interface/Movable';
+import { type DIVESelectable } from '../interface/Selectable';
+import { type TransformControls } from 'three/examples/jsm/controls/TransformControls';
+import { type DIVEGroup } from '../group/Group';
 
 export class DIVENode extends Object3D implements DIVESelectable, DIVEMovable {
     readonly isDIVENode: true = true;
@@ -42,11 +42,27 @@ export class DIVENode extends Object3D implements DIVESelectable, DIVEMovable {
 
     public SetToWorldOrigin(): void {
         this.position.set(0, 0, 0);
-        DIVECommunication.get(this.userData.id)?.PerformAction('UPDATE_OBJECT', { id: this.userData.id, position: this.position, rotation: this.rotation, scale: this.scale });
+        DIVECommunication.get(this.userData.id)?.PerformAction(
+            'UPDATE_OBJECT',
+            {
+                id: this.userData.id,
+                position: this.position,
+                rotation: this.rotation,
+                scale: this.scale,
+            },
+        );
     }
 
     public onMove(): void {
-        DIVECommunication.get(this.userData.id)?.PerformAction('UPDATE_OBJECT', { id: this.userData.id, position: this.position, rotation: this.rotation, scale: this.scale });
+        DIVECommunication.get(this.userData.id)?.PerformAction(
+            'UPDATE_OBJECT',
+            {
+                id: this.userData.id,
+                position: this.position,
+                rotation: this.rotation,
+                scale: this.scale,
+            },
+        );
 
         if (this.parent && 'isDIVEGroup' in this.parent) {
             (this.parent as unknown as DIVEGroup).UpdateLineTo(this);
@@ -54,10 +70,16 @@ export class DIVENode extends Object3D implements DIVESelectable, DIVEMovable {
     }
 
     public onSelect(): void {
-        DIVECommunication.get(this.userData.id)?.PerformAction('SELECT_OBJECT', { id: this.userData.id });
+        DIVECommunication.get(this.userData.id)?.PerformAction(
+            'SELECT_OBJECT',
+            { id: this.userData.id },
+        );
     }
 
     public onDeselect(): void {
-        DIVECommunication.get(this.userData.id)?.PerformAction('DESELECT_OBJECT', { id: this.userData.id });
+        DIVECommunication.get(this.userData.id)?.PerformAction(
+            'DESELECT_OBJECT',
+            { id: this.userData.id },
+        );
     }
-}
+}

package/src/node/__test__/Node.test.ts

@@ -35,7 +35,7 @@ jest.mock('three', () => {
             this.setY = (y: number) => {
                 this.y = y;
                 return this;
-            }
+            };
             this.add = (vec3: Vector3) => {
                 this.x += vec3.x;
                 this.y += vec3.y;
@@ -70,15 +70,17 @@ jest.mock('three', () => {
                     far: 0,
                     fov: 0,
                 },
-            }
+            };
             this.add = jest.fn();
             this.sub = jest.fn();
-            this.children = [{
-                visible: true,
-                material: {
-                    color: {},
+            this.children = [
+                {
+                    visible: true,
+                    material: {
+                        color: {},
+                    },
                 },
-            }];
+            ];
             this.userData = {};
             this.position = new Vector3();
             this.rotation = new Euler();
@@ -88,7 +90,7 @@ jest.mock('three', () => {
             };
             this.mesh = new Mesh();
             this.traverse = jest.fn((callback) => {
-                callback(this.children[0])
+                callback(this.children[0]);
             });
             return this;
         }),
@@ -140,7 +142,7 @@ jest.mock('three', () => {
             this.set = jest.fn();
             return this;
         }),
-    }
+    };
 });
 
 jest.mock('../../com/Communication.ts', () => {
@@ -149,13 +151,15 @@ jest.mock('../../com/Communication.ts', () => {
             get: jest.fn(() => {
                 return {
                     PerformAction: jest.fn(),
-                }
+                };
             }),
         },
-    }
+    };
 });
 
-jest.spyOn(DIVECommunication, 'get').mockReturnValue({ PerformAction: jest.fn() } as unknown as DIVECommunication);
+jest.spyOn(DIVECommunication, 'get').mockReturnValue({
+    PerformAction: jest.fn(),
+} as unknown as DIVECommunication);
 
 let node: DIVENode;
 
@@ -230,4 +234,4 @@ describe('dive/node/DIVENode', () => {
         jest.spyOn(DIVECommunication, 'get').mockReturnValueOnce(undefined);
         expect(() => node.onDeselect()).not.toThrow();
     });
-});
+});

package/src/primitive/Primitive.ts

@@ -1,4 +1,15 @@
-import { BoxGeometry, BufferGeometry, Color, ConeGeometry, CylinderGeometry, Mesh, MeshStandardMaterial, Raycaster, SphereGeometry, Vector3 } from 'three';
+import {
+    BoxGeometry,
+    BufferGeometry,
+    Color,
+    ConeGeometry,
+    CylinderGeometry,
+    Mesh,
+    MeshStandardMaterial,
+    Raycaster,
+    SphereGeometry,
+    Vector3,
+} from 'three';
 import { DIVECommunication } from '../com/Communication';
 import { PRODUCT_LAYER_MASK } from '../constant/VisibilityLayerMask';
 import { findSceneRecursive } from '../helper/findSceneRecursive/findSceneRecursive';
@@ -94,24 +105,40 @@ export class DIVEPrimitive extends DIVENode {
 
     public PlaceOnFloor(): void {
         this.position.y = -this._boundingBox.min.y * this.scale.y;
-        DIVECommunication.get(this.userData.id)?.PerformAction('UPDATE_OBJECT', { id: this.userData.id, position: this.position, rotation: this.rotation, scale: this.scale });
+        DIVECommunication.get(this.userData.id)?.PerformAction(
+            'UPDATE_OBJECT',
+            {
+                id: this.userData.id,
+                position: this.position,
+                rotation: this.rotation,
+                scale: this.scale,
+            },
+        );
     }
 
     public DropIt(): void {
         if (!this.parent) {
-            console.warn('DIVEPrimitive: DropIt() called on a model that is not in the scene.', this);
+            console.warn(
+                'DIVEPrimitive: DropIt() called on a model that is not in the scene.',
+                this,
+            );
             return;
         }
 
         // calculate the bottom center of the bounding box
         const bottomY = this._boundingBox.min.y * this.scale.y;
-        const bbBottomCenter = this.localToWorld(this._boundingBox.getCenter(new Vector3()).multiply(this.scale));
+        const bbBottomCenter = this.localToWorld(
+            this._boundingBox.getCenter(new Vector3()).multiply(this.scale),
+        );
         bbBottomCenter.y = bottomY + this.position.y;
 
         // set up raycaster and raycast all scene objects (product layer)
         const raycaster = new Raycaster(bbBottomCenter, new Vector3(0, -1, 0));
         raycaster.layers.mask = PRODUCT_LAYER_MASK;
-        const intersections = raycaster.intersectObjects(findSceneRecursive(this).Root.children, true);
+        const intersections = raycaster.intersectObjects(
+            findSceneRecursive(this).Root.children,
+            true,
+        );
 
         // if we hit something, move the model to the top on the hit object's bounding box
         if (intersections.length > 0) {
@@ -121,12 +148,23 @@ export class DIVEPrimitive extends DIVENode {
             const worldPos = mesh.localToWorld(meshBB.max.clone());
 
             const oldPos = this.position.clone();
-            const newPos = this.position.clone().setY(worldPos.y).sub(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
             if (this.position.y === oldPos.y) return;
-            DIVECommunication.get(this.userData.id)?.PerformAction('UPDATE_OBJECT', { id: this.userData.id, position: this.position, rotation: this.rotation, scale: this.scale });
+            DIVECommunication.get(this.userData.id)?.PerformAction(
+                'UPDATE_OBJECT',
+                {
+                    id: this.userData.id,
+                    position: this.position,
+                    rotation: this.rotation,
+                    scale: this.scale,
+                },
+            );
         }
     }
 
@@ -147,14 +185,22 @@ export class DIVEPrimitive extends DIVENode {
             case 'plane':
                 return this.createPlaneGeometry(geometry);
             default: {
-                console.warn('DIVEPrimitive: Invalid geometry type:', geometry.name.toLowerCase());
+                console.warn(
+                    'DIVEPrimitive: Invalid geometry type:',
+                    geometry.name.toLowerCase(),
+                );
                 return new BufferGeometry();
             }
         }
     }
 
     private createCylinderGeometry(geometry: COMGeometry): BufferGeometry {
-        const geo = new CylinderGeometry(geometry.width / 2, geometry.width / 2, geometry.height, 64);
+        const geo = new CylinderGeometry(
+            geometry.width / 2,
+            geometry.width / 2,
+            geometry.height,
+            64,
+        );
         geo.translate(0, geometry.height / 2, 0);
         return geo;
     }
@@ -165,14 +211,24 @@ export class DIVEPrimitive extends DIVENode {
     }
 
     private createPyramidGeometry(geometry: COMGeometry): BufferGeometry {
-        const geo = new ConeGeometry(geometry.width / 2, geometry.height, 4, 1, true);
+        const geo = new ConeGeometry(
+            geometry.width / 2,
+            geometry.height,
+            4,
+            1,
+            true,
+        );
         geo.rotateY(Math.PI / 4);
         geo.translate(0, geometry.height / 2, 0);
         return geo;
     }
 
     private createBoxGeometry(geometry: COMGeometry): BufferGeometry {
-        const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+        const geo = new BoxGeometry(
+            geometry.width,
+            geometry.height,
+            geometry.depth,
+        );
         geo.translate(0, geometry.height / 2, 0);
         return geo;
     }
@@ -184,13 +240,22 @@ export class DIVEPrimitive extends DIVENode {
     }
 
     private createWallGeometry(geometry: COMGeometry): BufferGeometry {
-        const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth || 0.05, 16);
+        const geo = new BoxGeometry(
+            geometry.width,
+            geometry.height,
+            geometry.depth || 0.05,
+            16,
+        );
         geo.translate(0, geometry.height / 2, 0);
         return geo;
     }
 
     private createPlaneGeometry(geometry: COMGeometry): BufferGeometry {
-        const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+        const geo = new BoxGeometry(
+            geometry.width,
+            geometry.height,
+            geometry.depth,
+        );
         geo.translate(0, geometry.height / 2, 0);
         return geo;
     }

package/src/primitive/__test__/Primitive.test.ts

@@ -1,6 +1,12 @@
 import { DIVEPrimitive } from '../Primitive';
 import { DIVECommunication } from '../../com/Communication';
-import { Vector3, Box3, Mesh, type Texture, type MeshStandardMaterial } from 'three';
+import {
+    Vector3,
+    Box3,
+    Mesh,
+    type Texture,
+    type MeshStandardMaterial,
+} from 'three';
 import type { DIVEScene } from '../../scene/Scene';
 import { type COMMaterial, type COMGeometry } from '../../com/types';
 
@@ -36,7 +42,7 @@ jest.mock('three', () => {
             this.setY = (y: number) => {
                 this.y = y;
                 return this;
-            }
+            };
             this.add = (vec3: Vector3) => {
                 this.x += vec3.x;
                 this.y += vec3.y;
@@ -67,15 +73,17 @@ jest.mock('three', () => {
                     far: 0,
                     fov: 0,
                 },
-            }
+            };
             this.add = jest.fn();
             this.sub = jest.fn();
-            this.children = [{
-                visible: true,
-                material: {
-                    color: {},
+            this.children = [
+                {
+                    visible: true,
+                    material: {
+                        color: {},
+                    },
                 },
-            }];
+            ];
             this.userData = {};
             this.position = new Vector3();
             this.rotation = {
@@ -95,7 +103,7 @@ jest.mock('three', () => {
             };
             this.mesh = new Mesh();
             this.traverse = jest.fn((callback) => {
-                callback(this.children[0])
+                callback(this.children[0]);
             });
             return this;
         }),
@@ -176,7 +184,7 @@ jest.mock('three', () => {
         Color: jest.fn(function () {
             return this;
         }),
-    }
+    };
 });
 
 jest.mock('../../com/Communication.ts', () => {
@@ -185,13 +193,15 @@ jest.mock('../../com/Communication.ts', () => {
             get: jest.fn(() => {
                 return {
                     PerformAction: jest.fn(),
-                }
+                };
             }),
         },
-    }
+    };
 });
 
-jest.spyOn(DIVECommunication, 'get').mockReturnValue({ PerformAction: jest.fn() } as unknown as DIVECommunication);
+jest.spyOn(DIVECommunication, 'get').mockReturnValue({
+    PerformAction: jest.fn(),
+} as unknown as DIVECommunication);
 
 let primitive: DIVEPrimitive;
 
@@ -246,14 +256,14 @@ describe('dive/primitive/DIVEPrimitive', () => {
             }),
         } as unknown as Box3;
 
-
         const hitObject = new Mesh();
         hitObject.geometry.boundingBox = new Box3();
         hitObject.geometry.boundingBox.max = new Vector3(0, 2, 0);
-        intersectObjectsMock.mockReturnValue([{
-            object: hitObject,
-
-        }]);
+        intersectObjectsMock.mockReturnValue([
+            {
+                object: hitObject,
+            },
+        ]);
 
         const scene = {
             parent: null,
@@ -284,8 +294,6 @@ describe('dive/primitive/DIVEPrimitive', () => {
         jest.spyOn(DIVECommunication, 'get').mockReturnValueOnce(undefined);
         expect(() => primitive.DropIt()).not.toThrow();
         expect(comMock.PerformAction).toHaveBeenCalledTimes(1);
-
-
     });
 
     it('should set geometry', () => {
@@ -363,36 +371,39 @@ describe('dive/primitive/DIVEPrimitive', () => {
     });
 
     it('should set material', () => {
-        const material = (primitive['_mesh'].material as MeshStandardMaterial);
+        const material = primitive['_mesh'].material as MeshStandardMaterial;
 
         // apply invalid material should not crash
         expect(() => primitive.SetMaterial({} as COMMaterial)).not.toThrow();
         expect(material).toBeDefined();
 
-
-        expect(() => primitive.SetMaterial({
-            color: 0xffffff,
-            roughness: 0,
-            metalness: 1,
-        } as COMMaterial)).not.toThrow();
+        expect(() =>
+            primitive.SetMaterial({
+                color: 0xffffff,
+                roughness: 0,
+                metalness: 1,
+            } as COMMaterial),
+        ).not.toThrow();
         expect((material as MeshStandardMaterial).roughness).toBe(0);
         expect((material as MeshStandardMaterial).roughnessMap).toBeUndefined();
         expect((material as MeshStandardMaterial).metalness).toBe(1);
         expect((material as MeshStandardMaterial).metalnessMap).toBeUndefined();
 
-        expect(() => primitive.SetMaterial({
-            color: 0xff00ff,
-            vertexColors: true,
-            map: 'This_Is_A_Texture' as unknown as Texture,
-            normalMap: 'This_Is_A_Texture' as unknown as Texture,
-            roughness: 0,
-            roughnessMap: 'This_Is_A_Texture' as unknown as Texture,
-            metalness: 1,
-            metalnessMap: 'This_Is_A_Texture' as unknown as Texture,
-        } as COMMaterial)).not.toThrow();
+        expect(() =>
+            primitive.SetMaterial({
+                color: 0xff00ff,
+                vertexColors: true,
+                map: 'This_Is_A_Texture' as unknown as Texture,
+                normalMap: 'This_Is_A_Texture' as unknown as Texture,
+                roughness: 0,
+                roughnessMap: 'This_Is_A_Texture' as unknown as Texture,
+                metalness: 1,
+                metalnessMap: 'This_Is_A_Texture' as unknown as Texture,
+            } as COMMaterial),
+        ).not.toThrow();
         expect((material as MeshStandardMaterial).roughness).toBe(1);
         expect((material as MeshStandardMaterial).roughnessMap).toBeDefined();
         expect((material as MeshStandardMaterial).metalness).toBe(0);
         expect((material as MeshStandardMaterial).metalnessMap).toBeDefined();
     });
-});
+});