@shopware-ag/dive 1.12.0 → 1.12.1

package/build/dive.d.cts

@@ -786,4 +786,4 @@ declare class DIVE {
     private removeResizeObserver;
 }
 
-export { type Actions, type COMEntity, type COMLight, type COMModel, type COMPov, DIVE, DIVECommunication, DIVEDefaultSettings, DIVEMath, type DIVESettings, DIVE as default };
+export { type Actions, type COMEntity, type COMLight, type COMModel, type COMPov, type COMPrimitive, DIVE, DIVECommunication, DIVEDefaultSettings, DIVEMath, type DIVESettings, DIVE as default };

package/build/dive.d.ts

@@ -786,4 +786,4 @@ declare class DIVE {
     private removeResizeObserver;
 }
 
-export { type Actions, type COMEntity, type COMLight, type COMModel, type COMPov, DIVE, DIVECommunication, DIVEDefaultSettings, DIVEMath, type DIVESettings, DIVE as default };
+export { type Actions, type COMEntity, type COMLight, type COMModel, type COMPov, type COMPrimitive, DIVE, DIVECommunication, DIVEDefaultSettings, DIVEMath, type DIVESettings, DIVE as default };

package/build/dive.js

@@ -1442,7 +1442,7 @@ var DIVEModelRoot = class extends Object3D7 {
 import { Object3D as Object3D9 } from "three";
 
 // src/primitive/Primitive.ts
-import { Box3 as Box32, BoxGeometry, BufferGeometry, Color as Color6, CylinderGeometry, Float32BufferAttribute, Mesh as Mesh3, Object3D as Object3D8, Raycaster as Raycaster3, SphereGeometry as SphereGeometry2, Uint32BufferAttribute, Vector3 as Vector33 } from "three";
+import { Box3 as Box32, BoxGeometry, BufferGeometry, Color as Color6, ConeGeometry, CylinderGeometry, Mesh as Mesh3, MeshStandardMaterial as MeshStandardMaterial2, Object3D as Object3D8, Raycaster as Raycaster3, SphereGeometry as SphereGeometry2, Vector3 as Vector33 } from "three";
 init_VisibilityLayerMask();
 var DIVEPrimitive = class extends Object3D8 {
   constructor() {
@@ -1455,11 +1455,11 @@ var DIVEPrimitive = class extends Object3D8 {
     this._mesh.layers.mask = PRODUCT_LAYER_MASK;
     this._mesh.castShadow = true;
     this._mesh.receiveShadow = true;
+    this._mesh.material = new MeshStandardMaterial2();
     this.add(this._mesh);
     this._boundingBox = new Box32();
   }
   SetGeometry(geometry) {
-    this.clear();
     this._mesh.geometry = this.assembleGeometry(geometry);
     this._boundingBox.setFromObject(this._mesh);
   }
@@ -1479,20 +1479,34 @@ var DIVEPrimitive = class extends Object3D8 {
   }
   SetMaterial(material) {
     const primitiveMaterial = this._mesh.material;
-    if (material.color !== void 0) primitiveMaterial.color = new Color6(material.color);
-    if (material.map !== void 0) primitiveMaterial.map = material.map;
-    if (material.roughness !== void 0) primitiveMaterial.roughness = material.roughness;
+    if (material.vertexColors !== void 0) {
+      primitiveMaterial.vertexColors = material.vertexColors;
+    }
+    if (material.color !== void 0) {
+      primitiveMaterial.color = new Color6(material.color);
+    }
+    if (material.map !== void 0) {
+      primitiveMaterial.map = material.map;
+    }
+    if (material.normalMap !== void 0) {
+      primitiveMaterial.normalMap = material.normalMap;
+    }
+    if (material.roughness !== void 0) {
+      primitiveMaterial.roughness = material.roughness;
+    }
     if (material.roughnessMap !== void 0) {
       primitiveMaterial.roughnessMap = material.roughnessMap;
       if (primitiveMaterial.roughnessMap) {
         primitiveMaterial.roughness = 1;
       }
     }
-    if (material.metalness !== void 0) primitiveMaterial.metalness = material.metalness;
+    if (material.metalness !== void 0) {
+      primitiveMaterial.metalness = material.metalness;
+    }
     if (material.metalnessMap !== void 0) {
       primitiveMaterial.metalnessMap = material.metalnessMap;
       if (primitiveMaterial.metalnessMap) {
-        primitiveMaterial.metalness = 1;
+        primitiveMaterial.metalness = 0;
       }
     }
     if (this._mesh) this._mesh.material = primitiveMaterial;
@@ -1564,69 +1578,39 @@ var DIVEPrimitive = class extends Object3D8 {
     }
   }
   createCylinderGeometry(geometry) {
-    return new CylinderGeometry(geometry.width * 2, geometry.width * 2, geometry.height, 64);
+    const geo = new CylinderGeometry(geometry.width / 2, geometry.width / 2, geometry.height, 64);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createSphereGeometry(geometry) {
-    return new SphereGeometry2(geometry.width * 2, 64);
+    const geo = new SphereGeometry2(geometry.width / 2, 256, 256);
+    return geo;
   }
   createPyramidGeometry(geometry) {
-    const geo = new BufferGeometry();
-    const { width, height, depth } = geometry;
-    geo.setAttribute("position", new Float32BufferAttribute([
-      width / 2,
-      0,
-      depth / 2,
-      // right back
-      width / 2,
-      0,
-      -depth / 2,
-      // right front
-      -width / 2,
-      0,
-      -depth / 2,
-      // left front
-      -width / 2,
-      0,
-      depth / 2,
-      // left back
-      0,
-      height,
-      0
-      // top
-    ], 3));
-    geo.setIndex(new Uint32BufferAttribute([
-      1,
-      0,
-      4,
-      2,
-      1,
-      4,
-      3,
-      2,
-      4,
-      3,
-      0,
-      4,
-      0,
-      1,
-      2,
-      0,
-      2,
-      3
-    ], 1));
+    const geo = new ConeGeometry(geometry.width / 2, geometry.height, 4, 1, true);
+    geo.rotateY(Math.PI / 4);
+    geo.translate(0, geometry.height / 2, 0);
     return geo;
   }
   createBoxGeometry(geometry) {
-    return new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createConeGeometry(geometry) {
-    return new CylinderGeometry(0, geometry.width * 2, geometry.height, 64);
+    const geo = new ConeGeometry(geometry.width / 2, geometry.height, 256);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createWallGeometry(geometry) {
-    return new BoxGeometry(geometry.width, geometry.height, geometry.depth, 16);
+    const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth || 0.05, 16);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createPlaneGeometry(geometry) {
-    return new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    const geo = new BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
 };