@shopware-ag/dive 1.12.0 → 1.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/dive",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Shopware Spatial Framework",
   "type": "module",
   "main": "./build/dive.cjs",

package/src/dive.ts

@@ -9,7 +9,7 @@ import DIVEAxisCamera from "./axiscamera/AxisCamera.ts";
 import { getObjectDelta } from "./helper/getObjectDelta/getObjectDelta.ts";
 
 import type { Actions } from './com/actions/index.ts';
-import type { COMPov, COMLight, COMModel, COMEntity } from './com/types.ts';
+import type { COMPov, COMLight, COMModel, COMEntity, COMPrimitive } from './com/types.ts';
 import { DIVEMath } from './math/index.ts';
 import { generateUUID } from "three/src/math/MathUtils";
 import { DIVEInfo } from "./info/Info.ts";
@@ -278,6 +278,7 @@ export type {
     COMPov,
     COMLight,
     COMModel,
+    COMPrimitive,
     COMEntity,
 };
 

package/src/primitive/Primitive.ts

@@ -1,4 +1,4 @@
-import { Box3, BoxGeometry, BufferGeometry, Color, CylinderGeometry, Float32BufferAttribute, Mesh, MeshStandardMaterial, Object3D, Raycaster, SphereGeometry, Uint32BufferAttribute, Vector3, Vector3Like } from 'three';
+import { Box3, BoxGeometry, BufferGeometry, Color, ConeGeometry, CylinderGeometry, Mesh, MeshStandardMaterial, Object3D, Raycaster, SphereGeometry, Vector3, Vector3Like } from 'three';
 import DIVECommunication from '../com/Communication';
 import { PRODUCT_LAYER_MASK } from '../constant/VisibilityLayerMask';
 import { findSceneRecursive } from '../helper/findSceneRecursive/findSceneRecursive';
@@ -35,14 +35,13 @@ export class DIVEPrimitive extends Object3D implements DIVESelectable, DIVEMovea
         this._mesh.layers.mask = PRODUCT_LAYER_MASK;
         this._mesh.castShadow = true;
         this._mesh.receiveShadow = true;
+        this._mesh.material = new MeshStandardMaterial();
         this.add(this._mesh);
 
         this._boundingBox = new Box3();
     }
 
     public SetGeometry(geometry: COMGeometry): void {
-        this.clear();
-
         this._mesh.geometry = this.assembleGeometry(geometry);
         this._boundingBox.setFromObject(this._mesh);
     }
@@ -68,16 +67,32 @@ export class DIVEPrimitive extends Object3D implements DIVESelectable, DIVEMovea
     public SetMaterial(material: Partial<COMMaterial>): void {
         const primitiveMaterial = this._mesh.material as MeshStandardMaterial;
 
+        if (material.vertexColors !== undefined) {
+            primitiveMaterial.vertexColors = material.vertexColors;
+        }
+
         // apply color if supplied
-        if (material.color !== undefined) primitiveMaterial.color = new Color(material.color);
+        if (material.color !== undefined) {
+            primitiveMaterial.color = new Color(material.color);
+        }
 
         // apply albedo map if supplied
-        if (material.map !== undefined) primitiveMaterial.map = material.map;
+        if (material.map !== undefined) {
+            primitiveMaterial.map = material.map;
+        }
+
+        // apply normal map
+        if (material.normalMap !== undefined) {
+            primitiveMaterial.normalMap = material.normalMap;
+        }
 
         // set roughness value
         // if supplied, apply roughness map
         // if we applied a roughness map, set roughness to 1.0
-        if (material.roughness !== undefined) primitiveMaterial.roughness = material.roughness;
+        if (material.roughness !== undefined) {
+            primitiveMaterial.roughness = material.roughness;
+        }
+
         if (material.roughnessMap !== undefined) {
             primitiveMaterial.roughnessMap = material.roughnessMap;
 
@@ -89,12 +104,15 @@ export class DIVEPrimitive extends Object3D implements DIVESelectable, DIVEMovea
         // set metalness value
         // if supplied, apply metalness map
         // if we applied a metalness map, set metalness to 1.0
-        if (material.metalness !== undefined) primitiveMaterial.metalness = material.metalness;
+        if (material.metalness !== undefined) {
+            primitiveMaterial.metalness = material.metalness;
+        }
+
         if (material.metalnessMap !== undefined) {
             primitiveMaterial.metalnessMap = material.metalnessMap;
 
             if (primitiveMaterial.metalnessMap) {
-                primitiveMaterial.metalness = 1.0;
+                primitiveMaterial.metalness = 0.0;
             }
         }
 
@@ -179,47 +197,44 @@ export class DIVEPrimitive extends Object3D implements DIVESelectable, DIVEMovea
     }
 
     private createCylinderGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 
     private createSphereGeometry(geometry: COMGeometry): BufferGeometry {
-        return new SphereGeometry(geometry.width * 2, 64);
+        const geo = new SphereGeometry(geometry.width / 2, 256, 256);
+        return geo;
     }
 
     private createPyramidGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 
     private createBoxGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 
     private createConeGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 
     private createWallGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 
     private createPlaneGeometry(geometry: COMGeometry): BufferGeometry {
-        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;
     }
 }

package/src/primitive/__test__/Primitive.test.ts

@@ -139,25 +139,31 @@ jest.mock('three', () => {
         BufferGeometry: jest.fn(function () {
             this.setAttribute = jest.fn();
             this.setIndex = jest.fn();
+            this.translate = jest.fn();
             return this;
         }),
         CylinderGeometry: jest.fn(function () {
-            return {};
+            this.translate = jest.fn();
+            return this;
         }),
         SphereGeometry: jest.fn(function () {
-            return {};
+            this.translate = jest.fn();
+            return this;
         }),
         BoxGeometry: jest.fn(function () {
-            return {};
+            this.translate = jest.fn();
+            return this;
         }),
         ConeGeometry: jest.fn(function () {
-            return {};
+            this.rotateY = jest.fn();
+            this.translate = jest.fn();
+            return this;
         }),
         Float32BufferAttribute: jest.fn(function () {
-            return {};
+            return this;
         }),
         Uint32BufferAttribute: jest.fn(function () {
-            return {};
+            return this;
         }),
         MeshStandardMaterial: jest.fn(function () {
             this.color = {};
@@ -390,6 +396,13 @@ describe('dive/primitive/DIVEPrimitive', () => {
         } as COMGeometry;
         expect(() => primitive.SetGeometry(wall)).not.toThrow();
 
+        const wallWithoutDepth = {
+            name: 'wall',
+            width: 1,
+            height: 1.5,
+        } as COMGeometry;
+        expect(() => primitive.SetGeometry(wallWithoutDepth)).not.toThrow();
+
         // plane
         const plane = {
             name: 'plane',
@@ -407,27 +420,30 @@ describe('dive/primitive/DIVEPrimitive', () => {
         expect(() => primitive.SetMaterial({} as COMMaterial)).not.toThrow();
         expect(material).toBeDefined();
 
+
         expect(() => primitive.SetMaterial({
             color: 0xffffff,
             roughness: 0,
             metalness: 1,
         } as COMMaterial)).not.toThrow();
-        expect(material.roughness).toBe(0);
-        expect(material.roughnessMap).toBeUndefined();
-        expect(material.metalness).toBe(1);
-        expect(material.metalnessMap).toBeUndefined();
+        expect((material as MeshStandardMaterial).roughness).toBe(0);
+        expect((material as MeshStandardMaterial).roughnessMap).toBeUndefined();
+        expect((material as MeshStandardMaterial).metalness).toBe(1);
+        expect((material as MeshStandardMaterial).metalnessMap).toBeUndefined();
 
         expect(() => primitive.SetMaterial({
             color: 0xff00ff,
+            vertexColors: true,
             map: 'This_Is_A_Texture' as unknown as Texture,
+            normalMap: 'This_Is_A_Texture' as unknown as Texture,
             roughness: 0,
             roughnessMap: 'This_Is_A_Texture' as unknown as Texture,
             metalness: 1,
             metalnessMap: 'This_Is_A_Texture' as unknown as Texture,
         } as COMMaterial)).not.toThrow();
-        expect(material.roughness).toBe(1);
-        expect(material.roughnessMap).toBeDefined();
-        expect(material.metalness).toBe(1);
-        expect(material.metalnessMap).toBeDefined();
+        expect((material as MeshStandardMaterial).roughness).toBe(1);
+        expect((material as MeshStandardMaterial).roughnessMap).toBeDefined();
+        expect((material as MeshStandardMaterial).metalness).toBe(0);
+        expect((material as MeshStandardMaterial).metalnessMap).toBeDefined();
     });
 });