@shopware-ag/dive 1.9.0 → 1.11.0

package/build/dive.d.cts

@@ -226,6 +226,7 @@ type COMModel = COMBaseEntity & {
     rotation: Vector3Like;
     scale: Vector3Like;
     loaded: boolean;
+    material?: Partial<COMMaterial>;
 };
 type COMGeometry = {
     name: string;
@@ -235,6 +236,7 @@ type COMGeometry = {
 };
 type COMMaterial = {
     color: string | number;
+    map: Texture | null;
     roughness: number;
     roughnessMap: Texture | null;
     metalness: number;
@@ -245,7 +247,7 @@ type COMPrimitive = COMBaseEntity & {
     rotation: Vector3Like;
     scale: Vector3Like;
     geometry: COMGeometry;
-    material: COMMaterial;
+    material?: Partial<COMMaterial>;
 };
 type COMEntity = COMPov | COMLight | COMModel | COMPrimitive;
 

package/build/dive.d.ts

@@ -226,6 +226,7 @@ type COMModel = COMBaseEntity & {
     rotation: Vector3Like;
     scale: Vector3Like;
     loaded: boolean;
+    material?: Partial<COMMaterial>;
 };
 type COMGeometry = {
     name: string;
@@ -235,6 +236,7 @@ type COMGeometry = {
 };
 type COMMaterial = {
     color: string | number;
+    map: Texture | null;
     roughness: number;
     roughnessMap: Texture | null;
     metalness: number;
@@ -245,7 +247,7 @@ type COMPrimitive = COMBaseEntity & {
     rotation: Vector3Like;
     scale: Vector3Like;
     geometry: COMGeometry;
-    material: COMMaterial;
+    material?: Partial<COMMaterial>;
 };
 type COMEntity = COMPov | COMLight | COMModel | COMPrimitive;
 

package/build/dive.js

@@ -649,7 +649,7 @@ var DIVERenderer = class extends WebGLRenderer {
 };
 
 // src/scene/Scene.ts
-import { Color as Color7, Scene as Scene2 } from "three";
+import { Color as Color8, Scene as Scene2 } from "three";
 
 // src/scene/root/Root.ts
 import { Box3 as Box33, Object3D as Object3D11 } from "three";
@@ -1195,7 +1195,7 @@ import { Object3D as Object3D7 } from "three";
 
 // src/model/Model.ts
 init_VisibilityLayerMask();
-import { Box3, Object3D as Object3D6, Raycaster as Raycaster2, Vector3 as Vector32 } from "three";
+import { Box3, Color as Color5, MeshStandardMaterial, Object3D as Object3D6, Raycaster as Raycaster2, Vector3 as Vector32 } from "three";
 
 // src/helper/findSceneRecursive/findSceneRecursive.ts
 var findSceneRecursive = (object) => {
@@ -1212,6 +1212,8 @@ var DIVEModel = class extends Object3D6 {
     this.isSelectable = true;
     this.isMoveable = true;
     this.gizmo = null;
+    this._mesh = null;
+    this._material = null;
     this.layers.mask = PRODUCT_LAYER_MASK;
     this.boundingBox = new Box3();
   }
@@ -1222,6 +1224,14 @@ var DIVEModel = class extends Object3D6 {
       child.receiveShadow = true;
       child.layers.mask = this.layers.mask;
       this.boundingBox.expandByObject(child);
+      if (!this._mesh && "isMesh" in child) {
+        this._mesh = child;
+        if (this._material) {
+          this._mesh.material = this._material;
+        } else {
+          this._material = child.material;
+        }
+      }
     });
     this.add(gltf.scene);
   }
@@ -1239,6 +1249,28 @@ var DIVEModel = class extends Object3D6 {
       child.visible = visible;
     });
   }
+  SetMaterial(material) {
+    if (!this._material) {
+      this._material = new MeshStandardMaterial();
+    }
+    if (material.color !== void 0) this._material.color = new Color5(material.color);
+    if (material.map !== void 0) this._material.map = material.map;
+    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.metalnessMap !== void 0) {
+      this._material.metalnessMap = material.metalnessMap;
+      if (this._material.metalnessMap) {
+        this._material.metalness = 1;
+      }
+    }
+    if (this._mesh) this._mesh.material = this._material;
+  }
   SetToWorldOrigin() {
     var _a;
     this.position.set(0, 0, 0);
@@ -1354,6 +1386,7 @@ var DIVEModelRoot = class extends Object3D7 {
     if (object.rotation !== void 0) sceneObject.SetRotation(object.rotation);
     if (object.scale !== void 0) sceneObject.SetScale(object.scale);
     if (object.visible !== void 0) sceneObject.SetVisibility(object.visible);
+    if (object.material !== void 0) sceneObject.SetMaterial(object.material);
   }
   DeleteModel(object) {
     if (object.id === void 0) {
@@ -1392,7 +1425,7 @@ var DIVEModelRoot = class extends Object3D7 {
 import { Object3D as Object3D9 } from "three";
 
 // src/primitive/Primitive.ts
-import { Box3 as Box32, BoxGeometry, BufferGeometry, Color as Color5, CylinderGeometry, Float32BufferAttribute, Mesh as Mesh2, Object3D as Object3D8, Raycaster as Raycaster3, SphereGeometry as SphereGeometry2, Uint32BufferAttribute, Vector3 as Vector33 } from "three";
+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";
 init_VisibilityLayerMask();
 var DIVEPrimitive = class extends Object3D8 {
   constructor() {
@@ -1401,7 +1434,7 @@ var DIVEPrimitive = class extends Object3D8 {
     this.isMoveable = true;
     this.gizmo = null;
     this.layers.mask = PRODUCT_LAYER_MASK;
-    this._mesh = new Mesh2();
+    this._mesh = new Mesh3();
     this._mesh.layers.mask = PRODUCT_LAYER_MASK;
     this._mesh.castShadow = true;
     this._mesh.receiveShadow = true;
@@ -1429,19 +1462,23 @@ var DIVEPrimitive = class extends Object3D8 {
   }
   SetMaterial(material) {
     const primitiveMaterial = this._mesh.material;
-    primitiveMaterial.color = new Color5(material.color);
-    if (material.roughnessMap) {
+    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.roughnessMap !== void 0) {
       primitiveMaterial.roughnessMap = material.roughnessMap;
-      primitiveMaterial.roughness = 1;
-    } else {
-      primitiveMaterial.roughness = material.roughness;
+      if (primitiveMaterial.roughnessMap) {
+        primitiveMaterial.roughness = 1;
+      }
     }
-    if (material.metalnessMap) {
+    if (material.metalness !== void 0) primitiveMaterial.metalness = material.metalness;
+    if (material.metalnessMap !== void 0) {
       primitiveMaterial.metalnessMap = material.metalnessMap;
-      primitiveMaterial.metalness = 0;
-    } else {
-      primitiveMaterial.metalness = material.metalness;
+      if (primitiveMaterial.metalnessMap) {
+        primitiveMaterial.metalness = 1;
+      }
     }
+    if (this._mesh) this._mesh.material = primitiveMaterial;
   }
   SetToWorldOrigin() {
     var _a;
@@ -1643,10 +1680,10 @@ var DIVEPrimitiveRoot = class extends Object3D9 {
 
 // src/primitive/floor/Floor.ts
 init_VisibilityLayerMask();
-import { Color as Color6, Mesh as Mesh3, MeshStandardMaterial as MeshStandardMaterial2, PlaneGeometry } from "three";
-var DIVEFloor = class extends Mesh3 {
+import { Color as Color7, Mesh as Mesh4, MeshStandardMaterial as MeshStandardMaterial3, PlaneGeometry } from "three";
+var DIVEFloor = class extends Mesh4 {
   constructor() {
-    super(new PlaneGeometry(1e4, 1e4), new MeshStandardMaterial2({ color: new Color6(150 / 255, 150 / 255, 150 / 255) }));
+    super(new PlaneGeometry(1e4, 1e4), new MeshStandardMaterial3({ color: new Color7(150 / 255, 150 / 255, 150 / 255) }));
     this.isFloor = true;
     this.name = "Floor";
     this.layers.mask = PRODUCT_LAYER_MASK;
@@ -1657,7 +1694,7 @@ var DIVEFloor = class extends Mesh3 {
     this.visible = visible;
   }
   SetColor(color) {
-    this.material.color = new Color6(color);
+    this.material.color = new Color7(color);
   }
 };
 
@@ -1816,12 +1853,12 @@ var DIVEScene = class extends Scene2 {
   }
   constructor() {
     super();
-    this.background = new Color7(16777215);
+    this.background = new Color8(16777215);
     this.root = new DIVERoot();
     this.add(this.root);
   }
   SetBackground(color) {
-    this.background = new Color7(color);
+    this.background = new Color8(color);
   }
   ComputeSceneBB() {
     return this.Root.ComputeSceneBB();
@@ -2059,7 +2096,7 @@ var DIVEAnimationSystem = class {
 
 // src/axiscamera/AxisCamera.ts
 init_VisibilityLayerMask();
-import { AxesHelper, Color as Color8, Matrix4, OrthographicCamera, Vector4 } from "three";
+import { AxesHelper, Color as Color9, Matrix4, OrthographicCamera, Vector4 } from "three";
 import SpriteText from "three-spritetext";
 
 // src/constant/AxisHelperColors.ts
@@ -2080,9 +2117,9 @@ var DIVEAxisCamera = class extends OrthographicCamera {
     this.axesHelper.material.depthTest = false;
     this.axesHelper.position.set(0, 0, -1);
     this.axesHelper.setColors(
-      new Color8(AxesColorRed),
-      new Color8(AxesColorGreen),
-      new Color8(AxesColorBlue)
+      new Color9(AxesColorRed),
+      new Color9(AxesColorGreen),
+      new Color9(AxesColorBlue)
     );
     const x = new SpriteText("X", 0.2, AxesColorRedLetter);
     const y = new SpriteText("Y", 0.2, AxesColorGreenLetter);