@shopware-ag/dive 1.18.4 → 1.18.5-beta.1

package/build/src/toolbox/select/SelectTool.d.ts

@@ -0,0 +1,26 @@
+import { DIVEScene } from '../../scene/Scene.ts';
+import { default as DIVETransformTool } from '../transform/TransformTool.ts';
+import { default as DIVEOrbitControls } from '../../controls/OrbitControls.ts';
+import { DIVESelectable } from '../../interface/Selectable.ts';
+import { DIVEBaseTool } from '../BaseTool.ts';
+export declare const isSelectTool: (tool: DIVEBaseTool) => tool is DIVESelectTool;
+export interface DIVEObjectEventMap {
+    select: object;
+}
+/**
+ * A Tool to select and move objects in the scene.
+ *
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
+ *
+ * @module
+ */
+export declare class DIVESelectTool extends DIVETransformTool {
+    readonly isSelectTool: boolean;
+    constructor(scene: DIVEScene, controller: DIVEOrbitControls);
+    Activate(): void;
+    Select(selectable: DIVESelectable): void;
+    Deselect(selectable: DIVESelectable): void;
+    AttachGizmo(selectable: DIVESelectable): void;
+    DetachGizmo(): void;
+    onClick(e: PointerEvent): void;
+}

package/build/src/toolbox/transform/TransformTool.d.ts

@@ -0,0 +1,27 @@
+import { DIVEBaseTool } from '../BaseTool.ts';
+import { DIVEScene } from '../../scene/Scene.ts';
+import { default as DIVEOrbitControls } from '../../controls/OrbitControls.ts';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
+import { DIVEGizmo } from '../../gizmo/Gizmo.ts';
+export declare const isTransformTool: (tool: DIVEBaseTool) => tool is DIVETransformTool;
+export interface DIVEObjectEventMap {
+    select: object;
+}
+/**
+ * A Tool to select and move objects in the scene.
+ *
+ * Objects have to implement the DIVESelectable interface to be selectable and DIVEMovable to be movable.
+ *
+ * @module
+ */
+export default class DIVETransformTool extends DIVEBaseTool {
+    readonly isTransformTool: boolean;
+    private _scaleLinked;
+    protected _gizmo: TransformControls | DIVEGizmo;
+    constructor(scene: DIVEScene, controller: DIVEOrbitControls);
+    Activate(): void;
+    SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
+    SetGizmoVisibility(active: boolean): void;
+    SetGizmoScaleLinked(linked: boolean): void;
+    private initGizmo;
+}

package/build/src/types/SceneData.d.ts

@@ -0,0 +1,19 @@
+import { Vector3Like } from 'three';
+import { COMGroup, COMLight, COMModel, COMPov, COMPrimitive } from '../dive';
+export type DIVESceneData = {
+    name: string;
+    mediaItem: null;
+    backgroundColor: string;
+    floorEnabled: boolean;
+    floorColor: string;
+    userCamera: {
+        position: Vector3Like;
+        target: Vector3Like;
+    };
+    spotmarks: object[];
+    lights: COMLight[];
+    objects: COMModel[];
+    cameras: COMPov[];
+    primitives: COMPrimitive[];
+    groups: COMGroup[];
+};

package/build/src/types/SceneObjects.d.ts

@@ -0,0 +1,7 @@
+import { DIVEGroup } from '../group/Group';
+import { default as DIVEAmbientLight } from '../light/AmbientLight';
+import { default as DIVEPointLight } from '../light/PointLight';
+import { default as DIVESceneLight } from '../light/SceneLight';
+import { DIVEModel } from '../model/Model';
+import { DIVEPrimitive } from '../primitive/Primitive';
+export type DIVESceneObject = DIVEModel | DIVEGroup | DIVEPrimitive | DIVEAmbientLight | DIVEPointLight | DIVESceneLight;

package/build/src/types/SceneType.d.ts

@@ -0,0 +1,4 @@
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+export type DIVESceneFileType = {
+    glb: GLTF;
+};

package/build/src/types/index.d.ts

@@ -0,0 +1,4 @@
+import { DIVESceneObject } from './SceneObjects';
+import { DIVESceneFileType } from './SceneType';
+import { DIVESceneData } from './SceneData';
+export { type DIVESceneObject, type DIVESceneFileType, type DIVESceneData };

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@shopware-ag/dive",
-    "version": "1.18.4",
+    "version": "1.18.5-beta.1",
     "description": "Shopware Spatial Framework",
     "type": "module",
-    "main": "./build/dive.cjs",
-    "module": "./build/dive.js",
-    "types": "./build/dive.d.ts",
+    "main": "build/dive.cjs",
+    "module": "build/dive.js",
+    "types": "build/dive.d.ts",
     "files": [
         "build",
         "LICENSE",
@@ -51,13 +51,14 @@
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "tsc": "^2.0.4",
-        "tsup": "^8.0.2",
         "typescript": "^5.4.5",
-        "typescript-eslint": "^7.7.1"
+        "typescript-eslint": "^7.7.1",
+        "vite": "^6.2.1",
+        "vite-plugin-dts": "^4.5.3"
     },
     "scripts": {
-        "build": "tsup --env.DIVE_NODE_ENV production",
-        "dev": "tsup --watch --env.DIVE_NODE_ENV development",
+        "build": "vite build",
+        "dev": "vite build --watch",
         "lint": "eslint",
         "lint:actions": "yarn lint:actions:transpile && yarn lint:actions:check && yarn lint:actions:cleanup",
         "lint:actions:transpile": "yarn tsc --resolveJsonModule --esModuleInterop ci/lint/lint-actions.ts && mv ci/lint/lint-actions.js ci/lint/lint-actions.cjs",

package/src/camera/PerspectiveCamera.ts

@@ -14,7 +14,7 @@ export type DIVEPerspectiveCameraSettings = {
 
 export const DIVEPerspectiveCameraDefaultSettings: DIVEPerspectiveCameraSettings =
     {
-        fov: 80,
+        fov: 70,
         near: 0.1,
         far: 1000,
     };

package/src/com/Communication.ts

@@ -99,13 +99,30 @@ export class DIVECommunication {
     }
 
     private _ar: DIVEAR | null;
-    private get ar(): DIVEAR {
+    private get ar(): Promise<DIVEAR> {
         if (!this._ar) {
-            const DIVEAR = require('../ar/AR.ts')
-                .DIVEAR as typeof import('../ar/AR.ts').DIVEAR;
-            this._ar = new DIVEAR(this.renderer, this.scene, this.controller);
+            return new Promise((resolve, reject) => {
+                import('../ar/AR.ts')
+                    .then((module) => {
+                        const DIVEAR = module.DIVEAR;
+                        this._ar = new DIVEAR(
+                            this.renderer,
+                            this.scene,
+                            this.controller,
+                        );
+                        resolve(this._ar);
+                    })
+                    .catch((error) => {
+                        console.error(
+                            'DIVE: Error while lazy-loading AR module:',
+                            error,
+                        );
+                        reject(error);
+                    });
+            });
         }
-        return this._ar;
+
+        return Promise.resolve(this._ar);
     }
 
     private registered: Map<string, COMEntity> = new Map();
@@ -311,9 +328,17 @@ export class DIVECommunication {
                 break;
             }
             case 'LAUNCH_AR': {
-                returnValue = this.ar.Launch(
-                    payload as Actions['LAUNCH_AR']['PAYLOAD'],
-                );
+                returnValue = new Promise<void>((resolve, reject) => {
+                    this.ar
+                        .then((arModule) => {
+                            resolve(
+                                arModule.Launch(
+                                    payload as Actions['LAUNCH_AR']['PAYLOAD'],
+                                ),
+                            );
+                        })
+                        .catch(reject);
+                });
                 break;
             }
             default: {

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

@@ -965,8 +965,9 @@ describe('dive/communication/DIVECommunication', () => {
     });
 
     it('should perform action LAUNCH_AR', async () => {
+        const arModule = await testCom['ar'];
         const arLaunchSpy = jest
-            .spyOn(testCom['ar'], 'Launch')
+            .spyOn(arModule, 'Launch')
             .mockResolvedValueOnce();
 
         const result = await testCom.PerformAction('LAUNCH_AR', undefined);

package/src/dive.ts

@@ -277,9 +277,6 @@ export default class DIVE {
         };
 
         console.log(`DIVE ${pkgjson.version} initialized successfully!`);
-        if (process.env.DIVE_NODE_ENV === 'development') {
-            console.log('DIVE is running in development mode.');
-        }
         console.log(`
                     @@@@@@@@@@@@@@@@@@@@@@@              @@@@@@@@@@@@@@@@@@@@@@@
                @@@@+-:::::::---------------------==------------------------------=#@@@@