@shopware-ag/dive 1.0.18 → 1.1.1

package/src/light/__test__/SceneLight.test.ts

@@ -1,6 +1,6 @@
 import DIVESceneLight from '../SceneLight';
 import DIVECommunication from '../../com/Communication';
-import { Color } from 'three';
+import { Color, HemisphereLight as THREEHemisphereLight, DirectionalLight as THREEDirectionalLight, Object3D } from 'three';
 
 jest.mock('../../com/Communication.ts', () => {
     return {
@@ -57,10 +57,14 @@ jest.mock('three', () => {
             return this;
         }),
         Object3D: jest.fn(function () {
-            this.add = mockAdd;
+            this.children = [];
+            this.add = (obj: Object3D) => {
+                this.children.push(obj);
+            };
             return this;
         }),
         HemisphereLight: jest.fn(function () {
+            this.visible = true;
             this.layers = {
                 mask: 0,
             };
@@ -71,6 +75,7 @@ jest.mock('three', () => {
             return this;
         }),
         DirectionalLight: jest.fn(function () {
+            this.visible = true;
             this.layers = {
                 mask: 0,
             };
@@ -100,7 +105,7 @@ describe('dive/light/DIVESceneLight', () => {
     it('should instantiate', () => {
         const testLight = new DIVESceneLight();
         expect(testLight).toBeDefined();
-        expect(mockAdd).toHaveBeenCalledTimes(2);
+        expect(testLight.children).toHaveLength(2);
     });
 
     it('should set intensity', () => {
@@ -117,6 +122,7 @@ describe('dive/light/DIVESceneLight', () => {
     it('should set enabled', () => {
         const testLight = new DIVESceneLight();
         testLight.SetEnabled(false);
-        expect(testLight.visible).toBe(false);
+        expect(testLight.children[0].visible).toBe(false);
+        expect(testLight.children[1].visible).toBe(false);
     });
 });

package/src/scene/root/lightroot/LightRoot.ts

@@ -61,6 +61,7 @@ export default class DIVELightRoot extends Object3D {
         if (light.intensity !== undefined && light.intensity !== null) (sceneObject as (DIVEAmbientLight | DIVEPointLight)).SetIntensity(light.intensity);
         if (light.enabled !== undefined && light.enabled !== null) (sceneObject as (DIVEAmbientLight | DIVEPointLight)).SetEnabled(light.enabled);
         if (light.color !== undefined && light.color !== null) (sceneObject as (DIVEAmbientLight | DIVEPointLight)).SetColor(new Color(light.color));
+        if (light.visible !== undefined && light.visible !== null) (sceneObject as (DIVEAmbientLight | DIVEPointLight)).visible = light.visible;
     }
 
     public DeleteLight(light: Partial<COMLight>): void {

package/src/scene/root/lightroot/__test__/LightRoot.test.ts

@@ -74,7 +74,7 @@ describe('dive/scene/root/lightroot/DIVELightRoot', () => {
 
     it('should update basic scene light', () => {
         const lightRoot = new DIVELightRoot();
-        lightRoot.UpdateLight({ id: 'test_id', type: 'scene', name: 'test', position: undefined, enabled: true });
+        lightRoot.UpdateLight({ id: 'test_id', type: 'scene', name: 'test', position: undefined, enabled: true, visible: false });
         expect(lightRoot.children).toHaveLength(1);
         expect(lightRoot.children[0].userData.id).toBe('test_id');
     });

package/src/scene/root/modelroot/ModelRoot.ts

@@ -50,6 +50,7 @@ export default class DIVEModelRoot extends Object3D {
         if (object.position !== undefined) (sceneObject as Model).SetPosition(object.position);
         if (object.rotation !== undefined) (sceneObject as Model).SetRotation(object.rotation);
         if (object.scale !== undefined) (sceneObject as Model).SetScale(object.scale);
+        if (object.visible !== undefined) (sceneObject as Model).visible = object.visible;
     }
 
     public DeleteModel(object: Partial<COMModel>): void {

package/src/scene/root/modelroot/__test__/ModelRoot.test.ts

@@ -77,6 +77,7 @@ describe('dive/scene/root/modelroot/DIVEModelRoot', () => {
         await expect(() => modelRoot.UpdateModel({
             id: 'test_id',
             uri: 'not a real uri',
+            visible: false,
         })).not.toThrow();
         expect(mock_LoadGLTF).toHaveBeenCalledTimes(1);
         expect(mock_SetModel).toHaveBeenCalledTimes(1);