@shopware-ag/dive 1.16.7 → 1.16.9

package/build/dive.js

@@ -1401,7 +1401,7 @@ var DIVESceneLight = class extends Object3D4 {
 
 // src/model/Model.ts
 init_VisibilityLayerMask();
-import { MeshStandardMaterial, Raycaster as Raycaster2, Vector3 as Vector32 } from "three";
+import { MeshStandardMaterial, Raycaster as Raycaster2, Vector3 as Vector33 } from "three";
 
 // src/helper/findSceneRecursive/findSceneRecursive.ts
 var findSceneRecursive = (object) => {
@@ -1413,7 +1413,7 @@ var findSceneRecursive = (object) => {
 
 // src/node/Node.ts
 init_VisibilityLayerMask();
-import { Box3, Object3D as Object3D5 } from "three";
+import { Box3, Object3D as Object3D5, Vector3 as Vector32 } from "three";
 var DIVENode = class extends Object3D5 {
   constructor() {
     super();
@@ -1422,10 +1422,19 @@ var DIVENode = class extends Object3D5 {
     this.isMovable = true;
     this.gizmo = null;
     this.layers.mask = PRODUCT_LAYER_MASK;
+    this._positionWorldBuffer = new Vector32();
     this._boundingBox = new Box3();
   }
   SetPosition(position) {
-    this.position.set(position.x, position.y, position.z);
+    if (!this.parent) {
+      this.position.set(position.x, position.y, position.z);
+      return;
+    }
+    const newPosition = new Vector32(position.x, position.y, position.z);
+    this.position.copy(this.parent.worldToLocal(newPosition));
+    if ("isDIVEGroup" in this.parent) {
+      this.parent.UpdateLineTo(this);
+    }
   }
   SetRotation(rotation) {
     this.rotation.set(rotation.x, rotation.y, rotation.z);
@@ -1443,26 +1452,26 @@ var DIVENode = class extends Object3D5 {
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
-        position: this.position,
+        position: this.getWorldPosition(this._positionWorldBuffer),
         rotation: this.rotation,
         scale: this.scale
       }
     );
   }
+  /**
+   * Can be called when the object is moved from a foreign object (gizmo, parent, etc.) to update the object's position.
+   */
   onMove() {
     var _a;
     (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
-        position: this.position,
+        position: this.getWorldPosition(this._positionWorldBuffer),
         rotation: this.rotation,
         scale: this.scale
       }
     );
-    if (this.parent && "isDIVEGroup" in this.parent) {
-      this.parent.UpdateLineTo(this);
-    }
   }
   onSelect() {
     var _a;
@@ -1490,6 +1499,7 @@ var DIVEModel = class extends DIVENode {
   }
   SetModel(gltf) {
     this.clear();
+    this._boundingBox.makeEmpty();
     gltf.scene.traverse((child) => {
       child.castShadow = true;
       child.receiveShadow = true;
@@ -1545,10 +1555,20 @@ var DIVEModel = class extends DIVENode {
     }
   }
   PlaceOnFloor() {
-    const oldPos = this.position.clone();
-    this.position.y = -this._boundingBox.min.y * this.scale.y;
-    if (this.position.y === oldPos.y) return;
-    this.onMove();
+    var _a;
+    const worldPos = this.getWorldPosition(this._positionWorldBuffer);
+    const oldWorldPos = worldPos.clone();
+    worldPos.y = -this._boundingBox.min.y * this.scale.y;
+    if (worldPos.y === oldWorldPos.y) return;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+      "UPDATE_OBJECT",
+      {
+        id: this.userData.id,
+        position: worldPos,
+        rotation: this.rotation,
+        scale: this.scale
+      }
+    );
   }
   DropIt() {
     if (!this.parent) {
@@ -1560,10 +1580,10 @@ var DIVEModel = class extends DIVENode {
     }
     const bottomY = this._boundingBox.min.y * this.scale.y;
     const bbBottomCenter = this.localToWorld(
-      this._boundingBox.getCenter(new Vector32()).multiply(this.scale)
+      this._boundingBox.getCenter(new Vector33()).multiply(this.scale)
     );
     bbBottomCenter.y = bottomY + this.position.y;
-    const raycaster = new Raycaster2(bbBottomCenter, new Vector32(0, -1, 0));
+    const raycaster = new Raycaster2(bbBottomCenter, new Vector33(0, -1, 0));
     raycaster.layers.mask = PRODUCT_LAYER_MASK;
     const intersections = raycaster.intersectObjects(
       findSceneRecursive(this).Root.children,
@@ -1575,7 +1595,7 @@ var DIVEModel = class extends DIVENode {
       const meshBB = mesh.geometry.boundingBox;
       const worldPos = mesh.localToWorld(meshBB.max.clone());
       const oldPos = this.position.clone();
-      const newPos = this.position.clone().setY(worldPos.y).sub(new Vector32(0, bottomY, 0));
+      const newPos = this.position.clone().setY(worldPos.y).sub(new Vector33(0, bottomY, 0));
       this.position.copy(newPos);
       if (this.position.y === oldPos.y) return;
       this.onMove();
@@ -1621,6 +1641,8 @@ var DIVELoadingManager = class {
 init_VisibilityLayerMask();
 import {
   BoxGeometry,
+  BufferAttribute,
+  BufferGeometry,
   Color as Color4,
   ConeGeometry,
   CylinderGeometry,
@@ -1628,7 +1650,7 @@ import {
   MeshStandardMaterial as MeshStandardMaterial2,
   Raycaster as Raycaster3,
   SphereGeometry as SphereGeometry2,
-  Vector3 as Vector33
+  Vector3 as Vector34
 } from "three";
 var DIVEPrimitive = class extends DIVENode {
   constructor() {
@@ -1682,10 +1704,20 @@ var DIVEPrimitive = class extends DIVENode {
     if (this._mesh) this._mesh.material = primitiveMaterial;
   }
   PlaceOnFloor() {
-    const oldPos = this.position.clone();
-    this.position.y = -this._boundingBox.min.y * this.scale.y;
-    if (this.position.y === oldPos.y) return;
-    this.onMove();
+    var _a;
+    const worldPos = this.getWorldPosition(this._positionWorldBuffer);
+    const oldWorldPos = worldPos.clone();
+    worldPos.y = -this._boundingBox.min.y * this.scale.y;
+    if (worldPos.y === oldWorldPos.y) return;
+    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+      "UPDATE_OBJECT",
+      {
+        id: this.userData.id,
+        position: worldPos,
+        rotation: this.rotation,
+        scale: this.scale
+      }
+    );
   }
   DropIt() {
     if (!this.parent) {
@@ -1697,10 +1729,10 @@ var DIVEPrimitive = class extends DIVENode {
     }
     const bottomY = this._boundingBox.min.y * this.scale.y;
     const bbBottomCenter = this.localToWorld(
-      this._boundingBox.getCenter(new Vector33()).multiply(this.scale)
+      this._boundingBox.getCenter(new Vector34()).multiply(this.scale)
     );
     bbBottomCenter.y = bottomY + this.position.y;
-    const raycaster = new Raycaster3(bbBottomCenter, new Vector33(0, -1, 0));
+    const raycaster = new Raycaster3(bbBottomCenter, new Vector34(0, -1, 0));
     raycaster.layers.mask = PRODUCT_LAYER_MASK;
     const intersections = raycaster.intersectObjects(
       findSceneRecursive(this).Root.children,
@@ -1712,19 +1744,21 @@ var DIVEPrimitive = class extends DIVENode {
       const meshBB = mesh.geometry.boundingBox;
       const worldPos = mesh.localToWorld(meshBB.max.clone());
       const oldPos = this.position.clone();
-      const newPos = this.position.clone().setY(worldPos.y).sub(new Vector33(0, bottomY, 0));
+      const newPos = this.position.clone().setY(worldPos.y).sub(new Vector34(0, bottomY, 0));
       this.position.copy(newPos);
       if (this.position.y === oldPos.y) return;
       this.onMove();
     }
   }
   assembleGeometry(geometry) {
+    this._mesh.material.flatShading = false;
     switch (geometry.name.toLowerCase()) {
       case "cylinder":
         return this.createCylinderGeometry(geometry);
       case "sphere":
         return this.createSphereGeometry(geometry);
       case "pyramid":
+        this._mesh.material.flatShading = true;
         return this.createPyramidGeometry(geometry);
       case "cube":
       case "box":
@@ -1759,16 +1793,57 @@ var DIVEPrimitive = class extends DIVENode {
     return geo;
   }
   createPyramidGeometry(geometry) {
-    const geo = new ConeGeometry(
+    const vertices = new Float32Array([
+      -geometry.width / 2,
+      0,
+      -geometry.depth / 2,
+      // 0
+      geometry.width / 2,
+      0,
+      -geometry.depth / 2,
+      // 1
       geometry.width / 2,
+      0,
+      geometry.depth / 2,
+      // 2
+      -geometry.width / 2,
+      0,
+      geometry.depth / 2,
+      // 3
+      0,
       geometry.height,
+      0
+    ]);
+    const indices = new Uint16Array([
+      0,
+      1,
+      2,
+      0,
+      2,
+      3,
+      0,
       4,
       1,
-      true
+      1,
+      4,
+      2,
+      2,
+      4,
+      3,
+      3,
+      4,
+      0
+    ]);
+    const geometryBuffer = new BufferGeometry();
+    geometryBuffer.setAttribute(
+      "position",
+      new BufferAttribute(vertices, 3)
     );
-    geo.rotateY(Math.PI / 4);
-    geo.translate(0, geometry.height / 2, 0);
-    return geo;
+    geometryBuffer.setIndex(new BufferAttribute(indices, 1));
+    geometryBuffer.computeVertexNormals();
+    geometryBuffer.computeBoundingBox();
+    geometryBuffer.computeBoundingSphere();
+    return geometryBuffer;
   }
   createBoxGeometry(geometry) {
     const geo = new BoxGeometry(
@@ -1806,7 +1881,12 @@ var DIVEPrimitive = class extends DIVENode {
 };
 
 // src/group/Group.ts
-import { BufferGeometry as BufferGeometry2, Line, LineDashedMaterial, Vector3 as Vector34 } from "three";
+import {
+  BufferGeometry as BufferGeometry2,
+  Line,
+  LineDashedMaterial,
+  Vector3 as Vector35
+} from "three";
 var DIVEGroup = class extends DIVENode {
   // lines to children
   constructor() {
@@ -1816,6 +1896,14 @@ var DIVEGroup = class extends DIVENode {
     this._members = [];
     this._lines = [];
   }
+  SetPosition(position) {
+    super.SetPosition(position);
+    this._members.forEach((member) => {
+      if ("isDIVENode" in member) {
+        member.onMove();
+      }
+    });
+  }
   SetLinesVisibility(visible, object) {
     if (!object) {
       this._lines.forEach((line) => {
@@ -1871,7 +1959,7 @@ var DIVEGroup = class extends DIVENode {
    */
   updateLineTo(line, object) {
     line.geometry.setFromPoints([
-      new Vector34(0, 0, 0),
+      new Vector35(0, 0, 0),
       object.position.clone()
     ]);
     line.computeLineDistances();
@@ -2368,7 +2456,7 @@ init_PerspectiveCamera();
 
 // src/controls/OrbitControls.ts
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls";
-import { MathUtils as MathUtils2, Vector3 as Vector35 } from "three";
+import { MathUtils as MathUtils2, Vector3 as Vector36 } from "three";
 import { Easing } from "@tweenjs/tween.js";
 var DIVEOrbitControlsDefaultSettings = {
   enableDamping: true,
@@ -2410,8 +2498,8 @@ var _DIVEOrbitControls = class _DIVEOrbitControls extends OrbitControls {
     this.dispose();
   }
   ComputeEncompassingView(bb) {
-    const center = bb.getCenter(new Vector35());
-    const size = bb.getSize(new Vector35());
+    const center = bb.getCenter(new Vector36());
+    const size = bb.getSize(new Vector36());
     const distance = Math.max(size.x, size.y, size.z) * 1.25;
     const direction = this.object.position.clone().normalize();
     return {
@@ -2859,7 +2947,7 @@ DIVEInfo._supportsWebXR = null;
 // package.json
 var package_default = {
   name: "@shopware-ag/dive",
-  version: "1.16.7",
+  version: "1.16.9",
   description: "Shopware Spatial Framework",
   type: "module",
   main: "./build/dive.cjs",
@@ -2977,6 +3065,18 @@ function truncateExp(number, decimals = 0) {
   return shift(Math.trunc(n), -decimals);
 }
 
+// src/math/radToDeg/radToDeg.ts
+import { MathUtils as MathUtils3 } from "three";
+function radToDeg(radians) {
+  return (MathUtils3.radToDeg(radians) + 360) % 360;
+}
+
+// src/math/degToRad/degToRad.ts
+import { MathUtils as MathUtils4 } from "three";
+function degToRad(degrees) {
+  return MathUtils4.degToRad(degrees);
+}
+
 // src/math/index.ts
 var DIVEMath = {
   ceilExp,
@@ -2984,7 +3084,9 @@ var DIVEMath = {
   roundExp: roundExponential,
   toFixedExp,
   truncateExp,
-  signedAngleTo
+  signedAngleTo,
+  radToDeg,
+  degToRad
 };
 
 // src/dive.ts