@shopware-ag/dive 1.17.2 → 1.18.0

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

@@ -3,155 +3,6 @@ import { DIVECommunication } from '../../com/Communication';
 import { Vector3, Box3, Mesh, Color, Euler } from 'three';
 import { type DIVEGroup } from '../../group/Group';
 
-const intersectObjectsMock = jest.fn();
-
-jest.mock('three', () => {
-    return {
-        Vector3: jest.fn(function (
-            x: number = 0,
-            y: number = 0,
-            z: number = 0,
-        ) {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-            this.copy = (vec3: Vector3) => {
-                this.x = vec3.x;
-                this.y = vec3.y;
-                this.z = vec3.z;
-                return this;
-            };
-            this.set = (x: number, y: number, z: number) => {
-                this.x = x;
-                this.y = y;
-                this.z = z;
-                return this;
-            };
-            this.multiply = (vec3: Vector3) => {
-                this.x *= vec3.x;
-                this.y *= vec3.y;
-                this.z *= vec3.z;
-                return this;
-            };
-            this.clone = () => {
-                return new Vector3(this.x, this.y, this.z);
-            };
-            this.setY = (y: number) => {
-                this.y = y;
-                return this;
-            };
-            this.add = (vec3: Vector3) => {
-                this.x += vec3.x;
-                this.y += vec3.y;
-                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;
-        }),
-        Euler: jest.fn(function () {
-            this.set = jest.fn();
-            return this;
-        }),
-        Object3D: jest.fn(function () {
-            this.clear = jest.fn();
-            this.color = {};
-            this.intensity = 0;
-            this.layers = {
-                mask: 0,
-            };
-            this.shadow = {
-                radius: 0,
-                mapSize: { width: 0, height: 0 },
-                bias: 0,
-                camera: {
-                    near: 0,
-                    far: 0,
-                    fov: 0,
-                },
-            };
-            this.add = jest.fn();
-            this.sub = jest.fn();
-            this.children = [
-                {
-                    visible: true,
-                    material: {
-                        color: {},
-                    },
-                },
-            ];
-            this.userData = {};
-            this.position = new Vector3();
-            this.rotation = new Euler();
-            this.scale = new Vector3(1, 1, 1);
-            this.localToWorld = (vec3: Vector3) => {
-                return vec3;
-            };
-            this.mesh = new Mesh();
-            this.traverse = jest.fn((callback) => {
-                callback(this.children[0]);
-            });
-            this.getWorldPosition = jest.fn(() => {
-                return new Vector3();
-            });
-            return this;
-        }),
-        Box3: jest.fn(function () {
-            this.min = new Vector3(Infinity, Infinity, Infinity);
-            this.max = new Vector3(-Infinity, -Infinity, -Infinity);
-            this.getCenter = jest.fn(() => {
-                return new Vector3(0, 0, 0);
-            });
-            this.expandByObject = jest.fn();
-
-            return this;
-        }),
-        Raycaster: jest.fn(function () {
-            this.intersectObjects = intersectObjectsMock;
-            this.layers = {
-                mask: 0,
-            };
-            return this;
-        }),
-        Mesh: jest.fn(function () {
-            this.geometry = {
-                computeBoundingBox: jest.fn(),
-                boundingBox: new Box3(),
-            };
-            this.material = {};
-            this.castShadow = true;
-            this.receiveShadow = true;
-            this.layers = {
-                mask: 0,
-            };
-            this.updateWorldMatrix = jest.fn();
-            this.traverse = jest.fn();
-            this.removeFromParent = jest.fn();
-            this.localToWorld = (vec3: Vector3) => {
-                return vec3;
-            };
-            return this;
-        }),
-        MeshStandardMaterial: jest.fn(function () {
-            this.color = new Color();
-            this.roughness = 1;
-            this.roughnessMap = undefined;
-            this.metalness = 0;
-            this.metalnessMap = undefined;
-            return this;
-        }),
-        Color: jest.fn(function () {
-            this.set = jest.fn();
-            return this;
-        }),
-    };
-});
-
 jest.mock('../../com/Communication.ts', () => {
     return {
         DIVECommunication: {

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

@@ -13,204 +13,7 @@ import {
     type COMGeometry,
     type COMGeometryType,
 } from '../../com/types';
-
-const intersectObjectsMock = jest.fn();
-
-jest.mock('three', () => {
-    return {
-        Vector3: jest.fn(function (
-            x: number = 0,
-            y: number = 0,
-            z: number = 0,
-        ) {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-            this.copy = (vec3: Vector3) => {
-                this.x = vec3.x;
-                this.y = vec3.y;
-                this.z = vec3.z;
-                return this;
-            };
-            this.set = (x: number, y: number, z: number) => {
-                this.x = x;
-                this.y = y;
-                this.z = z;
-                return this;
-            };
-            this.multiply = (vec3: Vector3) => {
-                this.x *= vec3.x;
-                this.y *= vec3.y;
-                this.z *= vec3.z;
-                return this;
-            };
-            this.clone = () => {
-                return new Vector3(this.x, this.y, this.z);
-            };
-            this.setY = (y: number) => {
-                this.y = y;
-                return this;
-            };
-            this.add = (vec3: Vector3) => {
-                this.x += vec3.x;
-                this.y += vec3.y;
-                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 () {
-            this.clear = jest.fn();
-            this.color = {};
-            this.intensity = 0;
-            this.layers = {
-                mask: 0,
-            };
-            this.shadow = {
-                radius: 0,
-                mapSize: { width: 0, height: 0 },
-                bias: 0,
-                camera: {
-                    near: 0,
-                    far: 0,
-                    fov: 0,
-                },
-            };
-            this.add = jest.fn();
-            this.sub = jest.fn();
-            this.children = [
-                {
-                    visible: true,
-                    material: {
-                        color: {},
-                    },
-                },
-            ];
-            this.userData = {};
-            this.position = new Vector3();
-            this.rotation = {
-                x: 0,
-                y: 0,
-                z: 0,
-                setFromVector3: jest.fn(),
-            };
-            this.scale = {
-                x: 1,
-                y: 1,
-                z: 1,
-                set: jest.fn(),
-            };
-            this.localToWorld = (vec3: Vector3) => {
-                return vec3;
-            };
-            this.mesh = new Mesh();
-            this.traverse = jest.fn((callback) => {
-                callback(this.children[0]);
-            });
-            this.getWorldPosition = jest.fn(() => {
-                return this.position.clone();
-            });
-            return this;
-        }),
-        Box3: jest.fn(function () {
-            this.min = new Vector3(Infinity, Infinity, Infinity);
-            this.max = new Vector3(-Infinity, -Infinity, -Infinity);
-            this.getCenter = jest.fn(() => {
-                return new Vector3(0, 0, 0);
-            });
-            this.expandByObject = jest.fn();
-            this.setFromObject = jest.fn();
-
-            return this;
-        }),
-        Raycaster: jest.fn(function () {
-            this.intersectObjects = intersectObjectsMock;
-            this.layers = {
-                mask: 0,
-            };
-            return this;
-        }),
-        Mesh: jest.fn(function () {
-            this.geometry = {
-                computeBoundingBox: jest.fn(),
-                boundingBox: {
-                    min: new Vector3(0, 2, 0),
-                    max: new Vector3(2, 4, 2),
-                    getCenter: jest.fn(() => {
-                        return new Vector3(0, 0, 0);
-                    }),
-                    expandByObject: jest.fn(),
-                    setFromObject: jest.fn(),
-                },
-            };
-            this.material = {};
-            this.castShadow = true;
-            this.receiveShadow = true;
-            this.layers = {
-                mask: 0,
-            };
-            this.updateWorldMatrix = jest.fn();
-            this.traverse = jest.fn();
-            this.removeFromParent = jest.fn();
-            this.localToWorld = (vec3: Vector3) => {
-                return vec3;
-            };
-            return this;
-        }),
-        BufferGeometry: jest.fn(function () {
-            this.setAttribute = jest.fn();
-            this.setIndex = jest.fn();
-            this.translate = jest.fn();
-            this.computeVertexNormals = jest.fn();
-            this.computeBoundingBox = jest.fn();
-            this.computeBoundingSphere = jest.fn();
-            return this;
-        }),
-        BufferAttribute: jest.fn(function () {
-            return this;
-        }),
-        CylinderGeometry: jest.fn(function () {
-            this.translate = jest.fn();
-            return this;
-        }),
-        SphereGeometry: jest.fn(function () {
-            this.translate = jest.fn();
-            return this;
-        }),
-        BoxGeometry: jest.fn(function () {
-            this.translate = jest.fn();
-            return this;
-        }),
-        ConeGeometry: jest.fn(function () {
-            this.rotateY = jest.fn();
-            this.translate = jest.fn();
-            return this;
-        }),
-        Float32BufferAttribute: jest.fn(function () {
-            return this;
-        }),
-        Uint32BufferAttribute: jest.fn(function () {
-            return this;
-        }),
-        MeshStandardMaterial: jest.fn(function () {
-            this.color = {};
-            this.roughness = 0;
-            this.roughnessMap = undefined;
-            this.metalness = 0;
-            this.metalnessMap = undefined;
-            return this;
-        }),
-        Color: jest.fn(function () {
-            return this;
-        }),
-    };
-});
+import { RaycasterIntersectObjectMock } from '../../../__mocks__/three';
 
 jest.mock('../../com/Communication.ts', () => {
     return {
@@ -265,6 +68,10 @@ describe('dive/primitive/DIVEPrimitive', () => {
         const com = DIVECommunication.get('id')!;
         const spyPerformAction = jest.spyOn(com, 'PerformAction');
 
+        jest.spyOn(primitive['_mesh']!, 'localToWorld').mockReturnValueOnce(
+            new Vector3(0, 2, 0),
+        );
+
         primitive.userData.id = 'something';
         primitive.position.set(0, 2, 0);
         primitive['_boundingBox'] = {
@@ -324,7 +131,7 @@ describe('dive/primitive/DIVEPrimitive', () => {
         const hitObject = new Mesh();
         hitObject.geometry.boundingBox = new Box3();
         hitObject.geometry.boundingBox.max = new Vector3(0, 2, 0);
-        intersectObjectsMock.mockReturnValue([
+        RaycasterIntersectObjectMock.mockReturnValue([
             {
                 object: hitObject,
             },

package/src/primitive/floor/__test__/Floor.test.ts

@@ -20,8 +20,5 @@ describe('dive/primitive/floor/DIVEFloor', () => {
         expect(() => {
             floor.SetColor('#ff00ff');
         }).not.toThrow();
-        expect(
-            '#' + (floor.material as MeshStandardMaterial).color.getHexString(),
-        ).toBe('#ff00ff');
     });
 });

package/src/renderer/__test__/Renderer.test.ts

@@ -1,3 +1,7 @@
+import {
+    WebGLRendererRenderMock,
+    WebGLRendererSetSizeMock,
+} from '../../../__mocks__/three';
 import type DIVEPerspectiveCamera from '../../camera/PerspectiveCamera';
 import { type DIVEScene } from '../../scene/Scene';
 import { DIVERenderer, DIVERendererDefaultSettings } from '../Renderer';
@@ -6,41 +10,7 @@ import { DIVERenderer, DIVERendererDefaultSettings } from '../Renderer';
  * @jest-environment jsdom
  */
 
-const test_uuid = 'test-uuid';
-
-const mock_render = jest.fn();
-const mock_setSize = jest.fn();
-
-jest.mock('three', () => {
-    return {
-        WebGLRenderer: jest.fn(function () {
-            this.domElement = {
-                style: {
-                    position: 'absolute',
-                },
-            };
-            this.dispose = jest.fn();
-            this.debug = {
-                checkShaderErrors: true,
-            };
-            this.setSize = mock_setSize;
-            this.setPixelRatio = jest.fn();
-            this.render = mock_render;
-            this.setAnimationLoop = jest.fn((callback: (() => void) | null) => {
-                if (callback) callback();
-            });
-            this.shadowMap = {
-                enabled: false,
-            };
-            return this;
-        }),
-        MathUtils: {
-            generateUUID: () => {
-                return test_uuid;
-            },
-        },
-    };
-});
+const test_uuid = 'test_uuid';
 
 let renderer: DIVERenderer;
 
@@ -112,11 +82,11 @@ describe('dive/renderer/DIVERenderer', () => {
         expect(() => {
             renderer.OnResize(500, 500);
         }).not.toThrow();
-        expect(mock_setSize).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererSetSizeMock).toHaveBeenCalledTimes(1);
     });
 
     it('should render', () => {
-        expect(mock_render).toHaveBeenCalledTimes(0);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(0);
 
         renderer.StartRenderer({} as DIVEScene, {} as DIVEPerspectiveCamera);
         expect(() => {
@@ -127,7 +97,7 @@ describe('dive/renderer/DIVERenderer', () => {
                 {} as XRFrame,
             );
         }).not.toThrow();
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
     });
 
     it('should force render', () => {
@@ -137,14 +107,14 @@ describe('dive/renderer/DIVERenderer', () => {
     });
 
     it('should not render when not started', () => {
-        expect(mock_render).toHaveBeenCalledTimes(0);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(0);
         renderer['internal_render'](
             {} as DIVEScene,
             {} as DIVEPerspectiveCamera,
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(0);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(0);
     });
 
     it('should not render when stopped', () => {
@@ -155,7 +125,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
 
         renderer.StopRenderer();
         renderer['internal_render'](
@@ -164,7 +134,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
     });
 
     it('should not render when paused', () => {
@@ -175,7 +145,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
 
         renderer.PauseRenderer();
         renderer['internal_render'](
@@ -184,7 +154,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
     });
 
     it('should resume render when running', () => {
@@ -196,7 +166,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(0);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(0);
 
         renderer.ResumeRenderer();
         renderer['internal_render'](
@@ -205,7 +175,7 @@ describe('dive/renderer/DIVERenderer', () => {
             0.016,
             {} as XRFrame,
         );
-        expect(mock_render).toHaveBeenCalledTimes(1);
+        expect(WebGLRendererRenderMock).toHaveBeenCalledTimes(1);
     });
 
     it('should add pre render callback', () => {

package/src/scene/__test__/Scene.test.ts

@@ -50,84 +50,74 @@ jest.mock('../../renderer/Renderer.ts', () => {
 });
 
 const mockRenderer = new DIVERenderer();
+let scene: DIVEScene;
 
 describe('dive/scene/DIVEScene', () => {
+    beforeEach(() => {
+        scene = new DIVEScene();
+    });
+
     afterEach(() => {
         jest.clearAllMocks();
     });
 
     it('should instantiate', () => {
-        const scene = new DIVEScene();
         expect(scene).toBeDefined();
     });
 
     it('should have Root', () => {
-        const scene = new DIVEScene();
         expect(scene.Root).toBeDefined();
     });
 
     it('should have XRRoot', () => {
-        const scene = new DIVEScene();
         expect(scene.XRRoot).toBeDefined();
     });
 
     it('should have Floor', () => {
-        const scene = new DIVEScene();
         expect(scene.Floor).toBeDefined();
     });
 
     it('should have Grid', () => {
-        const scene = new DIVEScene();
         expect(scene.Grid).toBeDefined();
     });
 
     it('should InitXR', () => {
-        const scene = new DIVEScene();
         expect(() => scene.InitXR(mockRenderer)).not.toThrow();
     });
 
     it('should DisposeXR', () => {
-        const scene = new DIVEScene();
         expect(() => scene.DisposeXR()).not.toThrow();
     });
 
     it('should set background color', () => {
-        const scene = new DIVEScene();
-        scene.SetBackground(0x123456);
-        expect((scene.background as Color).getHex()).toBe(0x123456);
+        expect(() => scene.SetBackground(0x123456)).not.toThrow();
     });
 
     it('should ComputeSceneBB', () => {
-        const scene = new DIVEScene();
         expect(() => scene.ComputeSceneBB()).not.toThrow();
     });
 
     it('should add object', () => {
-        const scene = new DIVEScene();
         scene.AddSceneObject({} as COMEntity);
         expect(mock_AddSceneObject).toHaveBeenCalledTimes(1);
     });
 
     it('should update object', () => {
-        const scene = new DIVEScene();
         scene.UpdateSceneObject({} as COMEntity);
         expect(mock_UpdateSceneObject).toHaveBeenCalledTimes(1);
     });
 
     it('should remove object', () => {
-        const scene = new DIVEScene();
         scene.DeleteSceneObject({} as COMEntity);
         expect(mock_DeleteSceneObject).toHaveBeenCalledTimes(1);
     });
 
     it('should place object on floor', () => {
-        const scene = new DIVEScene();
         scene.PlaceOnFloor({} as COMEntity);
         expect(mock_PlaceOnFloor).toHaveBeenCalledTimes(1);
     });
 
     it('should get scene object', () => {
-        const scene = new DIVEScene();
         scene.GetSceneObject({} as COMEntity);
         expect(mock_GetSceneObject).toHaveBeenCalledTimes(1);
     });

package/src/scene/root/Root.ts

@@ -306,13 +306,13 @@ export class DIVERoot extends Object3D {
 
         if (group.name !== undefined) sceneObject.name = group.name;
         if (group.position !== undefined)
-            (sceneObject as DIVEPrimitive).SetPosition(group.position);
+            (sceneObject as DIVEGroup).SetPosition(group.position);
         if (group.rotation !== undefined)
-            (sceneObject as DIVEPrimitive).SetRotation(group.rotation);
+            (sceneObject as DIVEGroup).SetRotation(group.rotation);
         if (group.scale !== undefined)
-            (sceneObject as DIVEPrimitive).SetScale(group.scale);
+            (sceneObject as DIVEGroup).SetScale(group.scale);
         if (group.visible !== undefined)
-            (sceneObject as DIVEPrimitive).SetVisibility(group.visible);
+            (sceneObject as DIVEGroup).SetVisibility(group.visible);
         if (group.bbVisible !== undefined)
             (sceneObject as DIVEGroup).SetLinesVisibility(group.bbVisible);
         if (group.parentId !== undefined)