@shopware-ag/dive 1.17.1 → 1.18.0

package/build/dive.d.cts

@@ -1,9 +1,8 @@
-import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster } from 'three';
+import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster, Euler } from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
-import { TransformControls as TransformControls$1, GLTF } from 'three/examples/jsm/Addons.js';
-import { GLTF as GLTF$1 } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 
 type DIVERendererSettings = {
     antialias: boolean;
@@ -451,7 +450,7 @@ declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMov
     readonly isDIVEPointLight: true;
     readonly isMovable: true;
     readonly isSelectable: true;
-    gizmo: TransformControls$1 | null;
+    gizmo: TransformControls | null;
     private light;
     private mesh;
     constructor();
@@ -530,7 +529,7 @@ declare class DIVEPrimitive extends DIVENode {
 type DIVESceneObject = DIVEModel | DIVEGroup | DIVEPrimitive | DIVEAmbientLight | DIVEPointLight | DIVESceneLight;
 
 type DIVESceneFileType = {
-    glb: GLTF$1;
+    glb: GLTF;
 };
 
 type DIVESceneData = {
@@ -802,6 +801,41 @@ declare abstract class DIVEBaseTool {
     private pointerWasDragged;
 }
 
+declare class DIVEGizmoPlane extends Object3D {
+    private _meshX;
+    get XPlane(): Mesh;
+    private _meshY;
+    get YPlane(): Mesh;
+    private _meshZ;
+    get ZPlane(): Mesh;
+    constructor();
+    assemble(mode: DIVEGizmoMode, axis: DIVEGizmoAxis): void;
+}
+
+type DIVEGizmoMode = 'translate' | 'rotate' | 'scale';
+type DIVEGizmoAxis = 'x' | 'y' | 'z';
+declare class DIVEGizmo extends Object3D {
+    private _mode;
+    get mode(): DIVEGizmoMode;
+    set mode(value: DIVEGizmoMode);
+    set debug(value: boolean);
+    private _gizmoNode;
+    get gizmoNode(): Object3D;
+    private _translateGizmo;
+    private _rotateGizmo;
+    private _scaleGizmo;
+    private _gizmoPlane;
+    get gizmoPlane(): DIVEGizmoPlane;
+    private _object;
+    get object(): (Object3D & DIVESelectable) | null;
+    constructor(controller: DIVEOrbitControls);
+    attach(object: Object3D & DIVESelectable): this;
+    detach(): this;
+    onHover(mode: DIVEGizmoMode, axis: DIVEGizmoAxis, value: boolean): void;
+    onChange(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+    private assemble;
+}
+
 /**
  * A Tool to select and move objects in the scene.
  *
@@ -811,11 +845,12 @@ declare abstract class DIVEBaseTool {
  */
 declare class DIVETransformTool extends DIVEBaseTool {
     readonly isTransformTool: boolean;
-    protected _gizmo: TransformControls;
+    protected _gizmo: TransformControls | DIVEGizmo;
     constructor(scene: DIVEScene, controller: DIVEOrbitControls);
     Activate(): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
     SetGizmoVisibility(active: boolean): void;
+    private initGizmo;
 }
 
 /**

package/build/dive.d.ts

@@ -1,9 +1,8 @@
-import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster } from 'three';
+import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Object3D, Vector3, Color, Mesh, ColorRepresentation, Intersection, Vector2, Raycaster, Euler } from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import { Tween } from '@tweenjs/tween.js';
 import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
-import { TransformControls as TransformControls$1, GLTF } from 'three/examples/jsm/Addons.js';
-import { GLTF as GLTF$1 } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 
 type DIVERendererSettings = {
     antialias: boolean;
@@ -451,7 +450,7 @@ declare class DIVEPointLight extends Object3D implements DIVESelectable, DIVEMov
     readonly isDIVEPointLight: true;
     readonly isMovable: true;
     readonly isSelectable: true;
-    gizmo: TransformControls$1 | null;
+    gizmo: TransformControls | null;
     private light;
     private mesh;
     constructor();
@@ -530,7 +529,7 @@ declare class DIVEPrimitive extends DIVENode {
 type DIVESceneObject = DIVEModel | DIVEGroup | DIVEPrimitive | DIVEAmbientLight | DIVEPointLight | DIVESceneLight;
 
 type DIVESceneFileType = {
-    glb: GLTF$1;
+    glb: GLTF;
 };
 
 type DIVESceneData = {
@@ -802,6 +801,41 @@ declare abstract class DIVEBaseTool {
     private pointerWasDragged;
 }
 
+declare class DIVEGizmoPlane extends Object3D {
+    private _meshX;
+    get XPlane(): Mesh;
+    private _meshY;
+    get YPlane(): Mesh;
+    private _meshZ;
+    get ZPlane(): Mesh;
+    constructor();
+    assemble(mode: DIVEGizmoMode, axis: DIVEGizmoAxis): void;
+}
+
+type DIVEGizmoMode = 'translate' | 'rotate' | 'scale';
+type DIVEGizmoAxis = 'x' | 'y' | 'z';
+declare class DIVEGizmo extends Object3D {
+    private _mode;
+    get mode(): DIVEGizmoMode;
+    set mode(value: DIVEGizmoMode);
+    set debug(value: boolean);
+    private _gizmoNode;
+    get gizmoNode(): Object3D;
+    private _translateGizmo;
+    private _rotateGizmo;
+    private _scaleGizmo;
+    private _gizmoPlane;
+    get gizmoPlane(): DIVEGizmoPlane;
+    private _object;
+    get object(): (Object3D & DIVESelectable) | null;
+    constructor(controller: DIVEOrbitControls);
+    attach(object: Object3D & DIVESelectable): this;
+    detach(): this;
+    onHover(mode: DIVEGizmoMode, axis: DIVEGizmoAxis, value: boolean): void;
+    onChange(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+    private assemble;
+}
+
 /**
  * A Tool to select and move objects in the scene.
  *
@@ -811,11 +845,12 @@ declare abstract class DIVEBaseTool {
  */
 declare class DIVETransformTool extends DIVEBaseTool {
     readonly isTransformTool: boolean;
-    protected _gizmo: TransformControls;
+    protected _gizmo: TransformControls | DIVEGizmo;
     constructor(scene: DIVEScene, controller: DIVEOrbitControls);
     Activate(): void;
     SetGizmoMode(mode: 'translate' | 'rotate' | 'scale'): void;
     SetGizmoVisibility(active: boolean): void;
+    private initGizmo;
 }
 
 /**

package/build/dive.js

@@ -330,40 +330,7 @@ var init_TransformTool = __esm({
         super(scene, controller);
         this.isTransformTool = true;
         this.name = "DIVETransformTool";
-        this._gizmo = new TransformControls(
-          this._controller.object,
-          this._controller.domElement
-        );
-        this._gizmo.mode = "translate";
-        this._gizmo.addEventListener("mouseDown", () => {
-          controller.enabled = false;
-          if (!implementsInterface(
-            this._gizmo.object,
-            "isMovable"
-          ))
-            return;
-          if (!this._gizmo.object.onMoveStart) return;
-          this._gizmo.object.onMoveStart();
-        });
-        this._gizmo.addEventListener("objectChange", () => {
-          if (!implementsInterface(
-            this._gizmo.object,
-            "isMovable"
-          ))
-            return;
-          if (!this._gizmo.object.onMove) return;
-          this._gizmo.object.onMove();
-        });
-        this._gizmo.addEventListener("mouseUp", () => {
-          controller.enabled = true;
-          if (!implementsInterface(
-            this._gizmo.object,
-            "isMovable"
-          ))
-            return;
-          if (!this._gizmo.object.onMoveEnd) return;
-          this._gizmo.object.onMoveEnd();
-        });
+        this._gizmo = this.initGizmo();
         this._scene.add(this._gizmo);
       }
       Activate() {
@@ -375,19 +342,58 @@ var init_TransformTool = __esm({
         const contains = this._scene.children.includes(this._gizmo);
         if (active && !contains) {
           this._scene.add(this._gizmo);
+          if ("isTransformControls" in this._gizmo) {
+            this._gizmo.getRaycaster().layers.enableAll();
+          }
         } else if (!active && contains) {
           this._scene.remove(this._gizmo);
+          if ("isTransformControls" in this._gizmo) {
+            this._gizmo.getRaycaster().layers.disableAll();
+          }
         }
       }
+      // only used for optimizing pointer events with DIVEGizmo
       // public onPointerDown(e: PointerEvent): void {
       //     super.onPointerDown(e);
-      //     // if (this._hovered) {
-      //     //     this._dragRaycastOnObjects = this._gizmo.gizmoPlane.children;
-      //     // }
+      //     if (this._hovered) {
+      //         this._dragRaycastOnObjects = (
+      //             this._gizmo as DIVEGizmo
+      //         ).gizmoPlane?.children;
+      //     }
       // }
+      // only used for optimizing pointer events with DIVEGizmo
       // protected raycast(): Intersection[] {
-      //     return super.raycast(this._gizmo.gizmoNode.children);
+      //     return super.raycast((this._gizmo as DIVEGizmo).gizmoNode.children);
       // }
+      initGizmo() {
+        const g = new TransformControls(
+          // this._controller,
+          this._controller.object,
+          this._controller.domElement
+        );
+        g.mode = "translate";
+        g.addEventListener("mouseDown", () => {
+          this._controller.enabled = false;
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMoveStart) return;
+          g.object.onMoveStart();
+        });
+        g.addEventListener("objectChange", () => {
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMove) return;
+          g.object.onMove();
+        });
+        g.addEventListener("mouseUp", () => {
+          this._controller.enabled = true;
+          if (!implementsInterface(g.object, "isMovable"))
+            return;
+          if (!g.object.onMoveEnd) return;
+          g.object.onMoveEnd();
+        });
+        return g;
+      }
     };
   }
 });
@@ -3089,7 +3095,8 @@ var DIVEModel = class extends DIVENode {
 };
 
 // src/loadingmanager/LoadingManager.ts
-import { DRACOLoader, GLTFLoader as GLTFLoader2 } from "three/examples/jsm/Addons.js";
+import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
+import { GLTFLoader as GLTFLoader2 } from "three/examples/jsm/loaders/GLTFLoader";
 var DIVELoadingManager = class {
   // ... maybe extend with other loaders later
   constructor() {
@@ -3408,6 +3415,9 @@ var DIVEGroup = class extends DIVENode {
     this._lines[index].visible = visible;
   }
   attach(object) {
+    if (this._members.includes(object)) {
+      return this;
+    }
     const line = this.createLine();
     this.add(line);
     this._lines.push(line);
@@ -4454,12 +4464,12 @@ var getObjectDelta = (a, b) => {
 
 // src/dive.ts
 init_Info();
-import { generateUUID as generateUUID2 } from "three/src/math/MathUtils";
+import { MathUtils as MathUtils5 } from "three";
 
 // package.json
 var package_default = {
   name: "@shopware-ag/dive",
-  version: "1.17.1",
+  version: "1.18.0",
   description: "Shopware Spatial Framework",
   type: "module",
   main: "./build/dive.cjs",
@@ -4503,6 +4513,7 @@ var package_default = {
     globals: "^15.0.0",
     jest: "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "jest-junit": "^16.0.0",
     jsdom: "^24.0.0",
     prettier: "^3.3.3",
     "prettier-plugin-multiline-arrays": "^3.0.6",
@@ -4618,7 +4629,7 @@ var DIVE = class _DIVE {
       position: { x: 0, y: 2, z: 2 },
       target: { x: 0, y: 0.5, z: 0 }
     });
-    const lightid = generateUUID2();
+    const lightid = MathUtils5.generateUUID();
     dive.Communication.PerformAction("ADD_OBJECT", {
       entityType: "light",
       type: "scene",
@@ -4629,7 +4640,7 @@ var DIVE = class _DIVE {
       intensity: 1,
       color: 16777215
     });
-    const modelid = generateUUID2();
+    const modelid = MathUtils5.generateUUID();
     dive.Communication.Subscribe("MODEL_LOADED", (data) => {
       if (data.id !== modelid) return;
       const transform = dive.Communication.PerformAction(