@shopware-ag/dive 1.6.4 → 1.6.5

package/package.json

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

package/src/__test__/DIVE.test.ts

@@ -137,6 +137,7 @@ jest.mock('../controls/OrbitControls.ts', () => {
             id: undefined,
         }
         this.removeFromParent = jest.fn();
+        this.Dispose = jest.fn();
         return this;
     });
 });

package/src/com/Communication.ts

@@ -41,10 +41,16 @@ export default class DIVECommunication {
     private static __instances: DIVECommunication[] = [];
 
     public static get(id: string): DIVECommunication | undefined {
+        const fromComID = this.__instances.find((instance) => instance.id === id);
+        if (fromComID) return fromComID;
         return this.__instances.find((instance) => Array.from(instance.registered.values()).find((object) => object.id === id));
     }
 
-    private id: string;
+    private _id: string;
+    public get id(): string {
+        return this._id;
+    }
+
     private renderer: DIVERenderer;
     private scene: DIVEScene;
     private controller: DIVEOrbitControls;
@@ -65,7 +71,7 @@ export default class DIVECommunication {
     private listeners: Map<keyof Actions, EventListener<keyof Actions>[]> = new Map();
 
     constructor(renderer: DIVERenderer, scene: DIVEScene, controls: DIVEOrbitControls, toolbox: DIVEToolbox) {
-        this.id = generateUUID();
+        this._id = generateUUID();
         this.renderer = renderer;
         this.scene = scene;
         this.controller = controls;

package/src/com/__test__/Communication.test.ts

@@ -186,10 +186,19 @@ describe('dive/communication/DIVECommunication', () => {
 
     it('should instantiate', () => {
         expect(testCom).toBeDefined();
-        expect(() => DIVECommunication.get('id')).not.toThrow();
         expect(DIVECommunication['__instances']).toHaveLength(1);
     });
 
+    it('should get instance', () => {
+        expect(testCom).toBeDefined();
+        expect(DIVECommunication.get(testCom.id)).toBeDefined();
+
+        testCom.PerformAction('ADD_OBJECT', {
+            id: 'someID',
+        } as COMModel);
+        expect(DIVECommunication.get('someID')).toBeDefined();
+    });
+
     it('should destroy instance', () => {
         expect(testCom).toBeDefined();
         testCom.DestroyInstance();
@@ -670,6 +679,14 @@ describe('dive/communication/DIVECommunication', () => {
         expect(visibility).toBe(false);
     });
 
+    it('should perform action USE_TOOL', () => {
+        let success = testCom.PerformAction('USE_TOOL', { tool: 'select' });
+        expect(success).toBe(true);
+
+        success = testCom.PerformAction('USE_TOOL', { tool: 'none' });
+        expect(success).toBe(true);
+    });
+
     it('should perform action MODEL_LOADED', () => {
         const payload = {
             entityType: "model",

package/src/controls/OrbitControls.ts

@@ -37,6 +37,8 @@ export default class DIVEOrbitControls extends OrbitControls {
     public object: DIVEPerspectiveCamera;
     public domElement: HTMLCanvasElement;
 
+    private _removePreRenderCallback: () => void = () => { };
+
     constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings: DIVEOrbitControlsSettings = DIVEOrbitControlsDefaultSettings) {
         super(camera, renderer.domElement);
 
@@ -46,14 +48,23 @@ export default class DIVEOrbitControls extends OrbitControls {
 
         this.object = camera;
 
-        renderer.AddPreRenderCallback(() => {
+        const id = renderer.AddPreRenderCallback(() => {
             this.preRenderCallback();
         });
 
+        this._removePreRenderCallback = () => {
+            renderer.RemovePreRenderCallback(id);
+        }
+
         this.enableDamping = settings.enableDamping;
         this.dampingFactor = settings.dampingFactor;
     }
 
+    public Dispose(): void {
+        this._removePreRenderCallback();
+        this.dispose();
+    }
+
     public ComputeEncompassingView(bb: Box3): { position: Vector3Like, target: Vector3Like } {
         const center = bb.getCenter(new Vector3());
         const size = bb.getSize(new Vector3());

package/src/controls/__test__/OrbitControls.test.ts

@@ -152,6 +152,11 @@ describe('dive/controls/DIVEOrbitControls', () => {
         expect(controller).toBeDefined();
     });
 
+    it('should dispose', () => {
+        const controller = new DIVEOrbitControls(mockCamera, mockRenderer, mockAnimSystem);
+        expect(() => controller.Dispose()).not.toThrow();
+    });
+
     it('should compute encompassing view', () => {
         const controller = new DIVEOrbitControls(mockCamera, mockRenderer, mockAnimSystem);
         expect(() => controller.ComputeEncompassingView(new Box3())).not.toThrow();

package/src/dive.ts

@@ -229,6 +229,7 @@ export default class DIVE {
     public Dispose(): void {
         this.removeResizeObserver();
         this.renderer.Dispose();
+        this.orbitControls.Dispose();
         this.axisCamera?.Dispose();
         this.animationSystem.Dispose();
         this.toolbox.Dispose();