@shopware-ag/dive 1.17.2 → 1.18.0

package/src/io/gltf/__test__/GLTFIO.test.ts

@@ -2,83 +2,6 @@ import { Object3D } from 'three';
 import { DIVEGLTFIO } from '../GLTFIO';
 
 import { type GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
-import { GLTFExporterOptions } from 'three/examples/jsm/exporters/GLTFExporter';
-
-jest.mock('three', () => {
-    return {
-        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.traverse = jest.fn((callback) => {
-                callback(this.children[0]);
-            });
-            return this;
-        }),
-    };
-});
-
-jest.mock('three/examples/jsm/loaders/GLTFLoader', () => {
-    return {
-        GLTFLoader: jest.fn(function () {
-            this.loadAsync = (
-                uri: string,
-                progEvent: (p: ProgressEvent<EventTarget>) => void,
-            ) =>
-                new Promise<void>((resolve) => {
-                    progEvent({
-                        loaded: 0,
-                        total: 1,
-                    } as ProgressEvent<EventTarget>);
-
-                    resolve();
-                });
-
-            return this;
-        }),
-    };
-});
-
-jest.mock('three/examples/jsm/exporters/GLTFExporter', () => {
-    return {
-        GLTFExporter: jest.fn(function () {
-            this.parseAsync = (
-                object: Object3D,
-                options?: GLTFExporterOptions,
-            ) =>
-                new Promise<ArrayBuffer | { [key: string]: unknown }>(
-                    (resolve) => {
-                        resolve(new ArrayBuffer(0));
-                    },
-                );
-            return this;
-        }),
-    };
-});
 
 let testGLTFIO: DIVEGLTFIO;
 

package/src/light/PointLight.ts

@@ -14,7 +14,7 @@ import {
 } from '../constant/VisibilityLayerMask';
 import { DIVEMovable } from '../interface/Movable';
 import { DIVESelectable } from '../interface/Selectable';
-import type { TransformControls } from 'three/examples/jsm/Addons.js';
+import type { TransformControls } from 'three/examples/jsm/controls/TransformControls';
 
 /**
  * A basic point light.

package/src/light/__test__/AmbientLight.test.ts

@@ -1,30 +1,6 @@
 import { AmbientLight, Color, Object3D } from 'three';
 import DIVEAmbientLight from '../AmbientLight';
 
-jest.mock('three', () => {
-    return {
-        Color: jest.fn(function () {
-            return {};
-        }),
-        AmbientLight: jest.fn(function () {
-            this.color = {};
-            this.intensity = 0;
-            this.layers = {
-                mask: 0,
-            };
-            this.removeFromParent = jest.fn();
-            return this;
-        }),
-        Object3D: jest.fn(function () {
-            this.children = [];
-            this.add = (obj: Object3D) => {
-                this.children.push(obj);
-            };
-            return this;
-        }),
-    };
-});
-
 describe('dive/light/DIVEAmbientLight', () => {
     it('should instantiate', () => {
         const testLight = new DIVEAmbientLight();

package/src/light/__test__/PointLight.test.ts

@@ -2,67 +2,6 @@ import DIVEPointLight from '../PointLight.ts';
 import { DIVECommunication } from '../../com/Communication.ts';
 import { Color, MeshBasicMaterial, Object3D, PointLight } from 'three';
 
-const mockAdd = jest.fn();
-
-jest.mock('three', () => {
-    return {
-        Color: jest.fn(function () {
-            return {};
-        }),
-        PointLight: jest.fn(function () {
-            this.visible = true;
-            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 = mockAdd;
-            this.children = [
-                {
-                    material: {
-                        color: {},
-                    },
-                },
-            ];
-            return this;
-        }),
-        SphereGeometry: jest.fn(function () {
-            return this;
-        }),
-        MeshBasicMaterial: jest.fn(function () {
-            this.opacity = 1.0;
-            this.color = new Color();
-            return this;
-        }),
-        Mesh: jest.fn(function () {
-            this.layers = {
-                mask: 0,
-            };
-            this.visible = true;
-            this.material = new MeshBasicMaterial();
-            return this;
-        }),
-        Object3D: jest.fn(function () {
-            this.children = [];
-            this.add = (obj: Object3D) => {
-                this.children.push(obj);
-            };
-            this.userData = {};
-            return this;
-        }),
-    };
-});
-
 jest.mock('../../com/Communication.ts', () => {
     return {
         DIVECommunication: {

package/src/light/__test__/SceneLight.test.ts

@@ -14,95 +14,6 @@ jest.mock('../../com/Communication.ts', () => {
     };
 });
 
-const mockAdd = jest.fn();
-
-jest.mock('three', () => {
-    return {
-        Color: jest.fn(function () {
-            return {};
-        }),
-        PointLight: jest.fn(function () {
-            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 = mockAdd;
-            this.children = [
-                {
-                    material: {
-                        color: {},
-                    },
-                },
-            ];
-            this.userData = {};
-            return this;
-        }),
-        SphereGeometry: jest.fn(function () {
-            return this;
-        }),
-        MeshBasicMaterial: jest.fn(function () {
-            return this;
-        }),
-        Mesh: jest.fn(function () {
-            this.layers = {
-                mask: 0,
-            };
-            return this;
-        }),
-        Object3D: jest.fn(function () {
-            this.children = [];
-            this.add = (obj: Object3D) => {
-                this.children.push(obj);
-            };
-            return this;
-        }),
-        HemisphereLight: jest.fn(function () {
-            this.visible = true;
-            this.layers = {
-                mask: 0,
-            };
-            this.position = {
-                set: jest.fn(),
-            };
-            this.removeFromParent = mockAdd;
-            return this;
-        }),
-        DirectionalLight: jest.fn(function () {
-            this.visible = true;
-            this.layers = {
-                mask: 0,
-            };
-            this.position = {
-                set: jest.fn(),
-                multiplyScalar: jest.fn(),
-            };
-            this.shadow = {
-                radius: 0,
-                mapSize: { width: 0, height: 0 },
-                bias: 0,
-                camera: {
-                    near: 0,
-                    far: 0,
-                    fov: 0,
-                },
-            };
-            this.removeFromParent = mockAdd;
-            return this;
-        }),
-    };
-});
-
 jest.spyOn(DIVECommunication, 'get').mockReturnValue({
     PerformAction: jest.fn(),
 } as unknown as DIVECommunication);

package/src/loadingmanager/LoadingManager.ts

@@ -1,4 +1,5 @@
-import { DRACOLoader, GLTF, GLTFLoader } from 'three/examples/jsm/Addons.js';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
+import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 
 /**
  * A basic loading manager.

package/src/loadingmanager/__test__/LoadingManager.test.ts

@@ -1,39 +1,9 @@
 import { DIVELoadingManager } from '../LoadingManager';
 
-const mock_setDRACOLoader = jest.fn();
-const mock_setDecoderPath = jest.fn();
-
-jest.mock('three/examples/jsm/Addons.js', () => {
-    return {
-        GLTFLoader: jest.fn(function () {
-            this.loadAsync = (
-                uri: string,
-                progEvent: (p: ProgressEvent<EventTarget>) => void,
-            ) =>
-                new Promise<void>((resolve) => {
-                    progEvent({
-                        loaded: 0,
-                        total: 1,
-                    } as ProgressEvent<EventTarget>);
-                    resolve();
-                });
-            this.setDRACOLoader = mock_setDRACOLoader;
-            return this;
-        }),
-        DRACOLoader: jest.fn(() => {
-            return {
-                setDecoderPath: mock_setDecoderPath,
-            };
-        }),
-    };
-});
-
 describe('dive/loadingmanager/DIVELoadingManager', () => {
     it('should instantiate', () => {
         const testLight = new DIVELoadingManager();
         expect(testLight).toBeDefined();
-        expect(mock_setDecoderPath).toHaveBeenCalledTimes(1);
-        expect(mock_setDRACOLoader).toHaveBeenCalledTimes(1);
     });
 
     it('should return GLTF promise', () => {

package/src/math/degToRad/__test__/degToRad.test.ts

@@ -1,13 +1,6 @@
 import degToRad from '../degToRad';
 import { MathUtils } from 'three';
 
-// Mock the 'three' module, specifically MathUtils.degToRad
-jest.mock('three', () => ({
-    MathUtils: {
-        degToRad: jest.fn(),
-    },
-}));
-
 // Type assertion for the mocked MathUtils.degToRad
 const mockedDegToRad = MathUtils.degToRad as jest.Mock;
 

package/src/math/radToDeg/__test__/radToDeg.test.ts

@@ -1,13 +1,6 @@
 import radToDeg from '../radToDeg';
 import { MathUtils } from 'three';
 
-// Mock the 'three' module, specifically MathUtils.radToDeg
-jest.mock('three', () => ({
-    MathUtils: {
-        radToDeg: jest.fn(),
-    },
-}));
-
 // Type assertion for the mocked MathUtils.radToDeg
 const mockedRadToDeg = MathUtils.radToDeg as jest.Mock;
 

package/src/model/Model.ts

@@ -1,6 +1,6 @@
 import { Mesh, MeshStandardMaterial, Raycaster, Vector3 } from 'three';
 import { PRODUCT_LAYER_MASK } from '../constant/VisibilityLayerMask';
-import type { GLTF } from 'three/examples/jsm/Addons.js';
+import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 import { findSceneRecursive } from '../helper/findSceneRecursive/findSceneRecursive';
 import { type COMMaterial } from '../com/types';
 import { DIVENode } from '../node/Node';

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

@@ -1,6 +1,8 @@
+import { RaycasterIntersectObjectMock } from '../../../__mocks__/three';
+
 import { DIVEModel } from '../Model';
 import { DIVECommunication } from '../../com/Communication';
-import { GLTF } from 'three/examples/jsm/Addons';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 import { DIVEScene } from '../../scene/Scene';
 import {
     Vector3,
@@ -8,163 +10,10 @@ import {
     Mesh,
     MeshStandardMaterial,
     type Texture,
-    Color,
     Object3D,
 } from 'three';
 import { type COMMaterial } 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 = jest.fn((vec3: Vector3) => {
-                this.x = vec3.x;
-                this.y = vec3.y;
-                this.z = vec3.z;
-                return this;
-            });
-            this.set = jest.fn((x: number, y: number, z: number) => {
-                this.x = x;
-                this.y = y;
-                this.z = z;
-                return this;
-            });
-            this.multiply = jest.fn((vec3: Vector3) => {
-                this.x *= vec3.x;
-                this.y *= vec3.y;
-                this.z *= vec3.z;
-                return this;
-            });
-            this.clone = jest.fn(() => {
-                return new Vector3(this.x, this.y, this.z);
-            });
-            this.setY = jest.fn((y: number) => {
-                this.y = y;
-                return this;
-            });
-            this.add = jest.fn((vec3: Vector3) => {
-                this.x += vec3.x;
-                this.y += vec3.y;
-                this.z += vec3.z;
-                return this;
-            });
-            this.sub = jest.fn((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 = [];
-            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 = jest.fn((vec3: Vector3) => {
-                return vec3;
-            });
-            this.traverse = jest.fn((callback) => {
-                callback(this);
-                this.children.forEach((child: Object3D) => {
-                    callback(child);
-                });
-            });
-            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.makeEmpty = jest.fn();
-
-            return this;
-        }),
-        Raycaster: jest.fn(function () {
-            this.intersectObjects = intersectObjectsMock;
-            this.layers = {
-                mask: 0,
-            };
-            return this;
-        }),
-        Mesh: jest.fn(function () {
-            this.isMesh = true;
-            this.geometry = {
-                computeBoundingBox: jest.fn(),
-                boundingBox: new Box3(),
-            };
-            this.material = new MeshStandardMaterial();
-            this.castShadow = true;
-            this.receiveShadow = true;
-            this.layers = {
-                mask: 0,
-            };
-            this.updateWorldMatrix = jest.fn();
-            this.traverse = jest.fn();
-            this.removeFromParent = jest.fn();
-            this.localToWorld = jest.fn((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: {
@@ -195,6 +44,7 @@ let model: DIVEModel;
 describe('dive/model/DIVEModel', () => {
     beforeEach(() => {
         jest.clearAllMocks();
+        RaycasterIntersectObjectMock.mockClear();
         model = new DIVEModel();
     });
 
@@ -272,7 +122,7 @@ describe('dive/model/DIVEModel', () => {
         const hitObject = new Mesh();
         hitObject.geometry.boundingBox = new Box3();
         hitObject.geometry.boundingBox.max = new Vector3(0, 2, 0);
-        intersectObjectsMock.mockReturnValue([
+        RaycasterIntersectObjectMock.mockReturnValue([
             {
                 object: hitObject,
             },