@shopware-ag/dive 1.11.0 → 1.12.1

package/build/dive.cjs

@@ -1275,23 +1275,40 @@ var DIVEModel = class extends import_three8.Object3D {
     if (!this._material) {
       this._material = new import_three8.MeshStandardMaterial();
     }
-    if (material.color !== void 0) this._material.color = new import_three8.Color(material.color);
-    if (material.map !== void 0) this._material.map = material.map;
-    if (material.roughness !== void 0) this._material.roughness = material.roughness;
+    if (material.vertexColors !== void 0) {
+      this._material.vertexColors = material.vertexColors;
+    }
+    if (material.color !== void 0) {
+      this._material.color = new import_three8.Color(material.color);
+    }
+    if (material.map !== void 0) {
+      this._material.map = material.map;
+    }
+    if (material.normalMap !== void 0) {
+      this._material.normalMap = material.normalMap;
+    }
+    if (material.roughness !== void 0) {
+      this._material.roughness = material.roughness;
+    }
     if (material.roughnessMap !== void 0) {
       this._material.roughnessMap = material.roughnessMap;
       if (this._material.roughnessMap) {
         this._material.roughness = 1;
       }
     }
-    if (material.metalness !== void 0) this._material.metalness = material.metalness;
+    if (material.metalness !== void 0) {
+      this._material.metalness = material.metalness;
+    }
     if (material.metalnessMap !== void 0) {
       this._material.metalnessMap = material.metalnessMap;
       if (this._material.metalnessMap) {
         this._material.metalness = 1;
       }
     }
-    if (this._mesh) this._mesh.material = this._material;
+    if (this._mesh) {
+      this._mesh.material = this._material;
+      this._mesh.material.needsUpdate = true;
+    }
   }
   SetToWorldOrigin() {
     var _a;
@@ -1460,11 +1477,11 @@ var DIVEPrimitive = class extends import_three10.Object3D {
     this._mesh.layers.mask = PRODUCT_LAYER_MASK;
     this._mesh.castShadow = true;
     this._mesh.receiveShadow = true;
+    this._mesh.material = new import_three10.MeshStandardMaterial();
     this.add(this._mesh);
     this._boundingBox = new import_three10.Box3();
   }
   SetGeometry(geometry) {
-    this.clear();
     this._mesh.geometry = this.assembleGeometry(geometry);
     this._boundingBox.setFromObject(this._mesh);
   }
@@ -1484,20 +1501,34 @@ var DIVEPrimitive = class extends import_three10.Object3D {
   }
   SetMaterial(material) {
     const primitiveMaterial = this._mesh.material;
-    if (material.color !== void 0) primitiveMaterial.color = new import_three10.Color(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 import_three10.Color(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;
@@ -1569,69 +1600,39 @@ var DIVEPrimitive = class extends import_three10.Object3D {
     }
   }
   createCylinderGeometry(geometry) {
-    return new import_three10.CylinderGeometry(geometry.width * 2, geometry.width * 2, geometry.height, 64);
+    const geo = new import_three10.CylinderGeometry(geometry.width / 2, geometry.width / 2, geometry.height, 64);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createSphereGeometry(geometry) {
-    return new import_three10.SphereGeometry(geometry.width * 2, 64);
+    const geo = new import_three10.SphereGeometry(geometry.width / 2, 256, 256);
+    return geo;
   }
   createPyramidGeometry(geometry) {
-    const geo = new import_three10.BufferGeometry();
-    const { width, height, depth } = geometry;
-    geo.setAttribute("position", new import_three10.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 import_three10.Uint32BufferAttribute([
-      1,
-      0,
-      4,
-      2,
-      1,
-      4,
-      3,
-      2,
-      4,
-      3,
-      0,
-      4,
-      0,
-      1,
-      2,
-      0,
-      2,
-      3
-    ], 1));
+    const geo = new import_three10.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 import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    const geo = new import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createConeGeometry(geometry) {
-    return new import_three10.CylinderGeometry(0, geometry.width * 2, geometry.height, 64);
+    const geo = new import_three10.ConeGeometry(geometry.width / 2, geometry.height, 256);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createWallGeometry(geometry) {
-    return new import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth, 16);
+    const geo = new import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth || 0.05, 16);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
   createPlaneGeometry(geometry) {
-    return new import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    const geo = new import_three10.BoxGeometry(geometry.width, geometry.height, geometry.depth);
+    geo.translate(0, geometry.height / 2, 0);
+    return geo;
   }
 };