@shopware-ag/dive 1.18.5-beta.2 → 1.18.5-beta.3

package/build/dive.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("./dive-_-yiZbhn.cjs");exports.DIVE=e.DIVE;exports.DIVECommunication=e.DIVECommunication;exports.DIVEDefaultSettings=e.DIVEDefaultSettings;exports.DIVEMath=e.DIVEMath;exports.default=e.DIVE;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("./dive-BTQZqHRt.cjs");exports.DIVE=e.DIVE;exports.DIVECommunication=e.DIVECommunication;exports.DIVEDefaultSettings=e.DIVEDefaultSettings;exports.DIVEMath=e.DIVEMath;exports.default=e.DIVE;
 //# sourceMappingURL=dive.cjs.map

package/build/dive.js

@@ -1,4 +1,4 @@
-import { A as s, E as D, z as E, F as e, A as o } from "./dive-Mi8g8Khn.js";
+import { A as s, E as D, z as E, F as e, A as o } from "./dive-Dk0rFfvA.js";
 export {
   s as DIVE,
   D as DIVECommunication,

package/build/src/ar/arquicklook/ARQuickLook.d.ts

@@ -1,8 +1,7 @@
 import { DIVEScene } from '../../scene/Scene';
 import { DIVEAROptions } from '../AR';
 export declare class DIVEARQuickLook {
-    private static _usdzExporter;
     static Launch(scene: DIVEScene, options?: DIVEAROptions): Promise<void>;
-    private static extractModels;
-    private static launchARFromNode;
+    private static launchARQuickLook;
+    private static findARQuickLookSrc;
 }

package/package.json

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

package/src/ar/arquicklook/ARQuickLook.ts

@@ -1,66 +1,93 @@
-import { Object3D } from 'three';
-import { DIVEUSDZExporter } from '../../exporters/usdz/USDZExporter';
 import { type DIVEScene } from '../../scene/Scene';
 import { type DIVEAROptions } from '../AR';
 
 export class DIVEARQuickLook {
-    private static _usdzExporter: DIVEUSDZExporter = new DIVEUSDZExporter();
-
     public static Launch(
         scene: DIVEScene,
         options?: DIVEAROptions,
     ): Promise<void> {
-        // create node to build usdz from
-        const quickLookScene = new Object3D();
-
-        // extract models from scene
-        const rootCopy = scene.Root.clone(true);
-
-        quickLookScene.add(...rootCopy.children);
+        const url = this.findARQuickLookSrc(scene);
 
         // launch ARQuickLook
-        return this.launchARFromNode(quickLookScene, options);
+        return this.launchARQuickLook(url, options);
     }
 
-    private static extractModels(scene: DIVEScene): Object3D[] {
-        // extract models
-        return scene.Root.children;
-    }
-
-    private static launchARFromNode(
-        node: Object3D,
+    private static launchARQuickLook(
+        uri: string,
         options?: DIVEAROptions,
     ): Promise<void> {
-        // bundle USDZ
-        return this._usdzExporter
-            .parse(node, {
-                quickLookCompatible: true,
-                ar: {
-                    anchoring: { type: 'plane' },
-                    planeAnchoring: {
-                        alignment:
-                            options?.arPlacement === 'vertical'
-                                ? 'vertical'
-                                : 'horizontal',
-                    },
-                },
-            })
-            .then((usdz: Uint8Array) => {
-                // create blob
-                const blob = new Blob([usdz], { type: 'model/vnd.usdz+zip' });
-                let url = URL.createObjectURL(blob);
+        return new Promise((resolve) => {
+            if (options?.arScale === 'fixed') {
+                uri = uri.concat('#allowsContentScaling=0');
+            }
+
+            // launch ARQuickLook
+            const a = document.createElement('a');
+            a.innerHTML = '<picture></picture>'; // This is actually needed so the viewer opens instantly
+            a.rel = 'ar';
+            a.href = uri;
+            a.download = 'scene.usdz';
+            resolve();
+            a.click();
+        });
+    }
 
-                if (options?.arScale === 'fixed') {
-                    url = url.concat('#allowsContentScaling=0');
-                }
+    private static findARQuickLookSrc(scene: DIVEScene): string {
+        let uri: string | null = null;
 
-                // launch ARQuickLook
-                const a = document.createElement('a');
-                a.innerHTML = '<picture></picture>'; // This is actually needed so the viewer opens instantly
-                a.rel = 'ar';
-                a.href = url;
-                a.download = 'scene.usdz';
-                a.click();
-            });
+        scene.traverse((object) => {
+            if (uri) return;
+            if (object.userData.uri) {
+                uri = object.userData.uri;
+            }
+        });
+
+        if (!uri) {
+            throw new Error('No model found in scene');
+        }
+
+        return uri;
     }
+
+    // private static extractModels(scene: DIVEScene): Object3D[] {
+    //     // extract models
+    //     return scene.Root.children;
+    // }
+
+    // private static launchARFromNode(
+    //     node: Object3D,
+    //     options?: DIVEAROptions,
+    // ): Promise<void> {
+    //     // bundle USDZ
+    //     return this._usdzExporter
+    //         .parse(node, {
+    //             quickLookCompatible: true,
+    //             ar: {
+    //                 anchoring: { type: 'plane' },
+    //                 planeAnchoring: {
+    //                     alignment:
+    //                         options?.arPlacement === 'vertical'
+    //                             ? 'vertical'
+    //                             : 'horizontal',
+    //                 },
+    //             },
+    //         })
+    //         .then((usdz: Uint8Array) => {
+    //             // create blob
+    //             const blob = new Blob([usdz], { type: 'model/vnd.usdz+zip' });
+    //             let url = URL.createObjectURL(blob);
+
+    //             if (options?.arScale === 'fixed') {
+    //                 url = url.concat('#allowsContentScaling=0');
+    //             }
+
+    //             // launch ARQuickLook
+    //             const a = document.createElement('a');
+    //             a.innerHTML = '<picture></picture>'; // This is actually needed so the viewer opens instantly
+    //             a.rel = 'ar';
+    //             a.href = url;
+    //             a.download = 'scene.usdz';
+    //             a.click();
+    //         });
+    // }
 }

package/src/ar/arquicklook/__test__/ARQuickLook.test.ts

@@ -1,16 +1,22 @@
-import { Object3D } from 'three';
+import { Box3, Color, Euler, Mesh, Object3D, Vector3 } from 'three';
 import { DIVEScene } from '../../../scene/Scene';
 import { DIVEAROptions } from '../../AR';
 import { DIVEARQuickLook } from '../ARQuickLook';
 
-jest.mock('../../../exporters/usdz/USDZExporter', () => {
+jest.mock('../../../scene/Scene', () => {
     return {
-        DIVEUSDZExporter: jest.fn().mockImplementation(() => {
-            return {
-                parse: jest.fn(() => {
-                    return Promise.resolve(new Uint8Array());
-                }),
+        DIVEScene: jest.fn(function () {
+            this.add = jest.fn();
+            this.children = [];
+            this.Root = {
+                children: [],
             };
+            this.traverse = jest.fn((callback) => {
+                this.Root.children.forEach((child: Object3D) => {
+                    callback(child);
+                });
+            });
+            return this;
         }),
     };
 });
@@ -26,10 +32,12 @@ describe('DIVEARQuickLook', () => {
         mockModels = [
             new Object3D(),
             new Object3D(),
+            new Object3D(),
         ];
-        mockScene = {
-            Root: new Object3D(),
-        } as DIVEScene;
+        mockModels[1].userData = {
+            uri: 'https://example.com',
+        };
+        mockScene = new DIVEScene();
         mockOptions = {
             arPlacement: 'horizontal',
             arScale: 'auto',
@@ -41,88 +49,45 @@ describe('DIVEARQuickLook', () => {
             expect(DIVEARQuickLook.Launch).toBeInstanceOf(Function);
         });
 
-        it('should return a promise', () => {
-            expect(
-                DIVEARQuickLook.Launch(mockScene, mockOptions),
-            ).toBeInstanceOf(Promise);
-        });
-
-        it('should not throw when called without options', () => {
-            const usdzParseSpy = jest.spyOn(
-                DIVEARQuickLook['_usdzExporter'],
-                'parse',
-            );
-
-            expect(
-                async () => await DIVEARQuickLook.Launch(mockScene),
-            ).not.toThrow();
-
-            expect(usdzParseSpy).toHaveBeenCalled();
-        });
-
-        it('should not throw when called with empty scene', () => {
-            const usdzParseSpy = jest.spyOn(
-                DIVEARQuickLook['_usdzExporter'],
-                'parse',
-            );
-
-            expect(
-                async () =>
-                    await DIVEARQuickLook.Launch(mockScene, mockOptions),
-            ).not.toThrow();
+        it('should not throw without options', () => {
+            mockScene.Root.children = mockModels;
 
-            expect(usdzParseSpy).toHaveBeenCalled();
+            expect(() => {
+                DIVEARQuickLook.Launch(mockScene);
+            }).not.toThrow();
         });
 
-        it('should not throw when called with filled scene', () => {
-            const usdzParseSpy = jest.spyOn(
-                DIVEARQuickLook['_usdzExporter'],
-                'parse',
-            );
-
+        it('should not throw with options', () => {
             mockScene.Root.children = mockModels;
 
-            expect(
-                async () =>
-                    await DIVEARQuickLook.Launch(mockScene, mockOptions),
-            ).not.toThrow();
-
-            expect(usdzParseSpy).toHaveBeenCalled();
+            expect(() => {
+                DIVEARQuickLook.Launch(mockScene, mockOptions);
+            }).not.toThrow();
         });
 
-        it('should pass options to exporter', async () => {
-            const usdzParseSpy = jest.spyOn(
-                DIVEARQuickLook['_usdzExporter'],
-                'parse',
-            );
-
-            mockOptions.arPlacement = 'vertical';
-            mockOptions.arScale = 'fixed';
+        it('should not throw with alternated options', () => {
+            mockScene.Root.children = mockModels;
 
-            await DIVEARQuickLook.Launch(mockScene, mockOptions);
+            mockOptions = {
+                arPlacement: 'vertical',
+                arScale: 'fixed',
+            } as DIVEAROptions;
 
-            expect(usdzParseSpy).toHaveBeenCalledWith(expect.any(Object3D), {
-                quickLookCompatible: true,
-                ar: {
-                    anchoring: { type: 'plane' },
-                    planeAnchoring: {
-                        alignment: 'vertical',
-                    },
-                },
-            });
+            expect(() => {
+                DIVEARQuickLook.Launch(mockScene, mockOptions);
+            }).not.toThrow();
         });
 
-        it('should reject when USDZExporter fails', async () => {
-            const usdzParseSpy = jest.spyOn(
-                DIVEARQuickLook['_usdzExporter'],
-                'parse',
-            );
-
-            usdzParseSpy.mockReturnValueOnce(Promise.reject());
+        it('should throw if no url is found', () => {
+            mockScene.Root.children = [
+                new Object3D(),
+                new Object3D(),
+                new Object3D(),
+            ];
 
-            await expect(
-                DIVEARQuickLook.Launch(mockScene, mockOptions),
-            ).rejects.toBeUndefined();
+            expect(() => {
+                DIVEARQuickLook.Launch(mockScene, mockOptions);
+            }).toThrow();
         });
     });
 });

package/src/ar/sceneviewer/__test__/SceneViewer.test.ts

@@ -21,18 +21,6 @@ jest.mock('../../../scene/Scene', () => {
     };
 });
 
-jest.mock('../../../exporters/usdz/USDZExporter', () => {
-    return {
-        DIVEUSDZExporter: jest.fn().mockImplementation(() => {
-            return {
-                parse: jest.fn(() => {
-                    return Promise.resolve(new Uint8Array());
-                }),
-            };
-        }),
-    };
-});
-
 URL.createObjectURL = jest.fn(() => 'blob:http://localhost:8080/');
 
 describe('DIVESceneViewer', () => {