@shopware-ag/dive 1.16.26-beta.2 → 1.17.0

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

@@ -62,6 +62,16 @@ jest.mock('../../io/IO', () => {
     };
 });
 
+jest.mock('../../ar/AR', () => {
+    return {
+        DIVEAR: jest.fn(function () {
+            this.Launch = jest.fn();
+
+            return this;
+        }),
+    };
+});
+
 jest.mock('../../toolbox/select/SelectTool', () => {
     return {
         isSelectTool: jest.fn().mockReturnValue(true),
@@ -328,14 +338,40 @@ describe('dive/communication/DIVECommunication', () => {
 
     it('should perform action DELETE_OBJECT with existing object', () => {
         const payload = {
+            entityType: 'group',
+            id: 'group00',
+        } as COMGroup;
+
+        testCom.PerformAction('ADD_OBJECT', payload);
+
+        // additionally add a child to the group
+        testCom.PerformAction('ADD_OBJECT', {
             entityType: 'light',
             id: 'ambient00',
             type: 'ambient',
             intensity: 0.5,
             color: 'white',
-        } as COMLight;
+            parentId: 'group00',
+        } as COMLight);
 
-        testCom.PerformAction('ADD_OBJECT', payload);
+        // and one child that has NO parent
+        testCom.PerformAction('ADD_OBJECT', {
+            entityType: 'light',
+            id: 'ambient01',
+            type: 'ambient',
+            intensity: 0.5,
+            color: 'white',
+        } as COMLight);
+
+        // and one child that has A DIFFERENT parent
+        testCom.PerformAction('ADD_OBJECT', {
+            entityType: 'light',
+            id: 'ambient02',
+            type: 'ambient',
+            intensity: 0.5,
+            color: 'white',
+            parentId: 'group01',
+        } as COMLight);
 
         const successDelete = testCom.PerformAction('DELETE_OBJECT', payload);
         expect(mockScene.DeleteSceneObject).toHaveBeenCalledTimes(1);
@@ -934,6 +970,15 @@ describe('dive/communication/DIVECommunication', () => {
         expect(result).toBe(url);
     });
 
+    it('should perform action LAUNCH_AR', async () => {
+        const arLaunchSpy = jest
+            .spyOn(testCom['ar'], 'Launch')
+            .mockResolvedValueOnce();
+
+        const result = await testCom.PerformAction('LAUNCH_AR', undefined);
+        expect(arLaunchSpy).toHaveBeenCalledTimes(1);
+    });
+
     it('should warn of action is of invalid type ', () => {
         jest.spyOn(console, 'warn').mockImplementationOnce(() => {});
         testCom.PerformAction('INVALID_ACTION' as keyof Actions, {});

package/src/com/actions/index.ts

@@ -24,6 +24,7 @@ import COMPUTE_ENCOMPASSING_VIEW from './camera/computeencompassingview.ts';
 import USE_TOOL from './toolbox/usetool.ts';
 import SET_PARENT from './object/setparent.ts';
 import EXPORT_SCENE from './scene/exportscene.ts';
+import LAUNCH_AR from './scene/launchar.ts';
 
 export interface Actions {
     GET_ALL_SCENE_DATA: GET_ALL_SCENE_DATA;
@@ -52,6 +53,5 @@ export interface Actions {
     GENERATE_MEDIA: GENERATE_MEDIA;
     SET_PARENT: SET_PARENT;
     EXPORT_SCENE: EXPORT_SCENE;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    LAUNCH_AR: any;
+    LAUNCH_AR: LAUNCH_AR;
 }

package/src/com/actions/scene/launchar.ts

@@ -0,0 +1,7 @@
+import { type DIVEAROptions } from '../../../ar/AR';
+
+export default interface LAUNCH_AR {
+    DESCRIPTION: 'Launches AR mode in native capabilities. (iOS: AR Quick Look, Android: Google Scene Viewer)';
+    PAYLOAD?: DIVEAROptions;
+    RETURN: Promise<void>;
+}

package/src/dive.ts

@@ -95,22 +95,6 @@ export default class DIVE {
         dive.Communication.Subscribe('MODEL_LOADED', (data) => {
             if (data.id !== modelid) return;
 
-            // console.log(
-            //     dive.Communication.PerformAction('GET_OBJECTS', {
-            //         ids: [modelid],
-            //     })[0].position,
-            // );
-
-            // dive.Communication.PerformAction('PLACE_ON_FLOOR', {
-            //     id: modelid,
-            // });
-
-            // console.log(
-            //     dive.Communication.PerformAction('GET_OBJECTS', {
-            //         ids: [modelid],
-            //     }),
-            // );
-
             const transform = dive.Communication.PerformAction(
                 'COMPUTE_ENCOMPASSING_VIEW',
                 {},

package/src/exporters/usdz/USDZExporter.ts

@@ -0,0 +1,21 @@
+import { Object3D } from 'three';
+import {
+    USDZExporter,
+    USDZExporterOptions,
+} from 'three/examples/jsm/exporters/USDZExporter';
+
+export type DIVEUSDZExporterOptions = USDZExporterOptions & {
+    ar?: {
+        anchoring: { type: 'plane' | 'image' | 'face' | 'none' }; // source: https://developer.apple.com/documentation/realitykit/preliminary-anchoring-type
+        planeAnchoring: { alignment: 'horizontal' | 'vertical' | 'any' }; // source: https://developer.apple.com/documentation/realitykit/preliminary-planeanchoring-alignment
+    };
+};
+
+export class DIVEUSDZExporter extends USDZExporter {
+    public parse(
+        scene: Object3D,
+        options?: DIVEUSDZExporterOptions,
+    ): Promise<Uint8Array> {
+        return super.parse(scene, options);
+    }
+}

package/src/group/__test__/Group.test.ts

@@ -39,6 +39,7 @@ describe('dive/group/DIVEGroup', () => {
 
         expect(() => group.attach(mockObject)).not.toThrow();
         expect(group.children).toContain(mockObject);
+        expect(group.members).toContain(mockObject);
 
         jest.spyOn(DIVECommunication, 'get').mockReturnValueOnce(undefined);
         expect(() => group.attach(mockObject)).not.toThrow();
@@ -49,6 +50,7 @@ describe('dive/group/DIVEGroup', () => {
 
         expect(() => group.remove(mockObject)).not.toThrow();
         expect(group.children).not.toContain(mockObject);
+        expect(group.members).not.toContain(mockObject);
 
         jest.spyOn(DIVECommunication, 'get').mockReturnValueOnce(undefined);
         expect(() => group.remove(mockObject)).not.toThrow();

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

@@ -71,6 +71,16 @@ describe('dive/scene/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();

package/src/toolbox/transform/__test__/TransformTool.test.ts

@@ -187,9 +187,12 @@ describe('dive/toolbox/select/DIVETransformTool', () => {
 
     it('should set gizmo active', () => {
         const transformTool = new DIVETransformTool(mockScene, mockController);
+
         expect(() => transformTool.SetGizmoVisibility(true)).not.toThrow();
 
-        mockScene.Root.children.includes = jest.fn().mockReturnValue(true);
+        // mock that gizmo is in scene
+        jest.spyOn(mockScene.children, 'includes').mockReturnValueOnce(true);
+
         expect(() => transformTool.SetGizmoVisibility(false)).not.toThrow();
     });
 });