@shopware-ag/dive 1.16.6 → 1.16.8

package/build/dive.cjs

@@ -423,12 +423,12 @@ var init_SelectTool = __esm({
       Activate() {
       }
       Select(selectable) {
-        if (selectable.onSelect) selectable.onSelect();
         this.AttachGizmo(selectable);
+        if (selectable.onSelect) selectable.onSelect();
       }
       Deselect(selectable) {
-        if (selectable.onDeselect) selectable.onDeselect();
         this.DetachGizmo();
+        if (selectable.onDeselect) selectable.onDeselect();
       }
       AttachGizmo(selectable) {
         if ("isMovable" in selectable) {
@@ -1432,10 +1432,19 @@ var DIVENode = class extends import_three7.Object3D {
     this.isMovable = true;
     this.gizmo = null;
     this.layers.mask = PRODUCT_LAYER_MASK;
+    this._positionWorldBuffer = new import_three7.Vector3();
     this._boundingBox = new import_three7.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 import_three7.Vector3(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);
@@ -1453,7 +1462,7 @@ var DIVENode = class extends import_three7.Object3D {
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
-        position: this.position,
+        position: this.getWorldPosition(this._positionWorldBuffer),
         rotation: this.rotation,
         scale: this.scale
       }
@@ -1465,14 +1474,11 @@ var DIVENode = class extends import_three7.Object3D {
       "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;
@@ -1500,6 +1506,7 @@ var DIVEModel = class extends DIVENode {
   }
   SetModel(gltf) {
     this.clear();
+    this._boundingBox.makeEmpty();
     gltf.scene.traverse((child) => {
       child.castShadow = true;
       child.receiveShadow = true;
@@ -1555,10 +1562,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) {
@@ -1682,10 +1699,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) {
@@ -1719,12 +1746,14 @@ var DIVEPrimitive = class extends DIVENode {
     }
   }
   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 +1788,57 @@ var DIVEPrimitive = class extends DIVENode {
     return geo;
   }
   createPyramidGeometry(geometry) {
-    const geo = new import_three9.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 import_three9.BufferGeometry();
+    geometryBuffer.setAttribute(
+      "position",
+      new import_three9.BufferAttribute(vertices, 3)
     );
-    geo.rotateY(Math.PI / 4);
-    geo.translate(0, geometry.height / 2, 0);
-    return geo;
+    geometryBuffer.setIndex(new import_three9.BufferAttribute(indices, 1));
+    geometryBuffer.computeVertexNormals();
+    geometryBuffer.computeBoundingBox();
+    geometryBuffer.computeBoundingSphere();
+    return geometryBuffer;
   }
   createBoxGeometry(geometry) {
     const geo = new import_three9.BoxGeometry(
@@ -2848,7 +2918,7 @@ DIVEInfo._supportsWebXR = null;
 // package.json
 var package_default = {
   name: "@shopware-ag/dive",
-  version: "1.16.6",
+  version: "1.16.8",
   description: "Shopware Spatial Framework",
   type: "module",
   main: "./build/dive.cjs",