@shopware-ag/dive 1.12.1 → 1.14.0

package/package.json

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

package/src/__test__/DIVE.test.ts

@@ -37,19 +37,21 @@ jest.mock('three/src/math/MathUtils', () => {
 });
 
 jest.mock('../com/Communication.ts', () => {
-    return jest.fn(function () {
-        this.PerformAction = jest.fn().mockReturnValue({
-            position: { x: 0, y: 0, z: 0 },
-            target: { x: 0, y: 0, z: 0 },
-        });
-        this.Subscribe = jest.fn((action: string, callback: (data: { id: string }) => void) => {
-            callback({ id: 'incorrect id' });
-            callback({ id: 'test_uuid' });
-        });
-        this.DestroyInstance = jest.fn();
+    return {
+        DIVECommunication: jest.fn(function () {
+            this.PerformAction = jest.fn().mockReturnValue({
+                position: { x: 0, y: 0, z: 0 },
+                target: { x: 0, y: 0, z: 0 },
+            });
+            this.Subscribe = jest.fn((action: string, callback: (data: { id: string }) => void) => {
+                callback({ id: 'incorrect id' });
+                callback({ id: 'test_uuid' });
+            });
+            this.DestroyInstance = jest.fn();
 
-        return this;
-    });
+            return this;
+        })
+    };
 });
 
 jest.mock('../renderer/Renderer.ts', () => {
@@ -83,23 +85,25 @@ jest.mock('../renderer/Renderer.ts', () => {
 });
 
 jest.mock('../scene/Scene.ts', () => {
-    return jest.fn(function () {
-        this.add = jest.fn();
-        this.isObject3D = true;
-        this.parent = null;
-        this.dispatchEvent = jest.fn();
-        this.position = {
-            set: jest.fn(),
-        }
-        this.SetIntensity = jest.fn();
-        this.SetEnabled = jest.fn();
-        this.SetColor = jest.fn();
-        this.userData = {
-            id: undefined,
-        }
-        this.removeFromParent = jest.fn();
-        return this;
-    });
+    return {
+        DIVEScene: jest.fn(function () {
+            this.add = jest.fn();
+            this.isObject3D = true;
+            this.parent = null;
+            this.dispatchEvent = jest.fn();
+            this.position = {
+                set: jest.fn(),
+            }
+            this.SetIntensity = jest.fn();
+            this.SetEnabled = jest.fn();
+            this.SetColor = jest.fn();
+            this.userData = {
+                id: undefined,
+            }
+            this.removeFromParent = jest.fn();
+            return this;
+        })
+    };
 });
 
 jest.mock('../camera/PerspectiveCamera.ts', () => {

package/src/axiscamera/AxisCamera.ts

@@ -3,7 +3,7 @@ import SpriteText from "three-spritetext";
 import { COORDINATE_LAYER_MASK } from "../constant/VisibilityLayerMask.ts";
 import { AxesColorRed, AxesColorGreen, AxesColorBlue, AxesColorRedLetter, AxesColorGreenLetter, AxesColorBlueLetter } from "../constant/AxisHelperColors.ts";
 import { DIVERenderer } from "../renderer/Renderer.ts";
-import DIVEScene from "../scene/Scene.ts";
+import { DIVEScene } from "../scene/Scene.ts";
 import DIVEOrbitControls from "../controls/OrbitControls.ts";
 
 /**

package/src/axiscamera/__test__/AxisCamera.test.ts

@@ -1,7 +1,7 @@
 import { AxesHelper, Matrix4, OrthographicCamera, Vector4 } from 'three';
 import DIVEAxisCamera from '../AxisCamera';
 import { DIVERenderer } from '../../renderer/Renderer';
-import DIVEScene from '../../scene/Scene';
+import { DIVEScene } from '../../scene/Scene';
 import DIVEOrbitControls from '../../controls/OrbitControls';
 
 jest.mock('three', () => {

package/src/com/Communication.ts

@@ -1,17 +1,17 @@
 import { Actions } from "./actions/index.ts";
 import { generateUUID } from 'three/src/math/MathUtils';
+import { isSelectTool } from "../toolbox/select/SelectTool.ts";
 
 // type imports
 import { type Color, type MeshStandardMaterial } from "three";
-import { type COMLight, type COMModel, type COMEntity, type COMPov } from "./types.ts";
-import type DIVEScene from "../scene/Scene.ts";
+import { type COMLight, type COMModel, type COMEntity, type COMPov } from "./types";
+import { type DIVEScene } from "../scene/Scene.ts";
 import type DIVEToolbox from "../toolbox/Toolbox.ts";
 import type DIVEOrbitControls from "../controls/OrbitControls.ts";
-import type DIVEModel from "../model/Model.ts";
+import { type DIVEModel } from "../model/Model.ts";
 import { type DIVEMediaCreator } from "../mediacreator/MediaCreator.ts";
 import { type DIVERenderer } from "../renderer/Renderer.ts";
 import { type DIVESelectable } from "../interface/Selectable.ts";
-import { isSelectTool } from "../toolbox/select/SelectTool.ts";
 
 type EventListener<Action extends keyof Actions> = (payload: Actions[Action]['PAYLOAD']) => void;
 
@@ -37,7 +37,7 @@ type Unsubscribe = () => boolean;
  * @module
  */
 
-export default class DIVECommunication {
+export class DIVECommunication {
     private static __instances: DIVECommunication[] = [];
 
     public static get(id: string): DIVECommunication | undefined {
@@ -188,6 +188,10 @@ export default class DIVECommunication {
                 returnValue = this.generateMedia(payload as Actions['GENERATE_MEDIA']['PAYLOAD']);
                 break;
             }
+            case 'SET_PARENT': {
+                returnValue = this.setParent(payload as Actions['SET_PARENT']['PAYLOAD']);
+                break;
+            }
         }
 
         this.dispatch(action, payload);
@@ -225,8 +229,8 @@ export default class DIVECommunication {
             name: this.scene.name,
             mediaItem: null,
             backgroundColor: '#' + (this.scene.background as Color).getHexString(),
-            floorEnabled: this.scene.Root.Floor.visible,
-            floorColor: '#' + (this.scene.Root.Floor.material as MeshStandardMaterial).color.getHexString(),
+            floorEnabled: this.scene.Floor.visible,
+            floorColor: '#' + (this.scene.Floor.material as MeshStandardMaterial).color.getHexString(),
             userCamera: {
                 position: this.controller.object.position.clone(),
                 target: this.controller.target.clone(),
@@ -260,6 +264,8 @@ export default class DIVECommunication {
     private addObject(payload: Actions['ADD_OBJECT']['PAYLOAD']): Actions['ADD_OBJECT']['RETURN'] {
         if (this.registered.get(payload.id)) return false;
 
+        if (payload.parent === undefined) payload.parent = null;
+
         this.registered.set(payload.id, payload);
 
         this.scene.AddSceneObject(payload);
@@ -274,7 +280,7 @@ export default class DIVECommunication {
         this.registered.set(payload.id, { ...objectToUpdate, ...payload });
 
         const updatedObject = this.registered.get(payload.id)!;
-        this.scene.UpdateSceneObject(updatedObject);
+        this.scene.UpdateSceneObject({ ...payload, id: updatedObject.id, entityType: updatedObject.entityType });
 
         Object.assign(payload, updatedObject);
 
@@ -444,19 +450,19 @@ export default class DIVECommunication {
         if (payload.name !== undefined) this.scene.name = payload.name;
         if (payload.backgroundColor !== undefined) this.scene.SetBackground(payload.backgroundColor);
 
-        if (payload.gridEnabled !== undefined) this.scene.Root.Grid.SetVisibility(payload.gridEnabled);
+        if (payload.gridEnabled !== undefined) this.scene.Grid.SetVisibility(payload.gridEnabled);
 
-        if (payload.floorEnabled !== undefined) this.scene.Root.Floor.SetVisibility(payload.floorEnabled);
-        if (payload.floorColor !== undefined) this.scene.Root.Floor.SetColor(payload.floorColor);
+        if (payload.floorEnabled !== undefined) this.scene.Floor.SetVisibility(payload.floorEnabled);
+        if (payload.floorColor !== undefined) this.scene.Floor.SetColor(payload.floorColor);
 
 
         // fill payload with current values
         // TODO optmize this
         payload.name = this.scene.name;
         payload.backgroundColor = '#' + (this.scene.background as Color).getHexString();
-        payload.gridEnabled = this.scene.Root.Grid.visible;
-        payload.floorEnabled = this.scene.Root.Floor.visible;
-        payload.floorColor = '#' + (this.scene.Root.Floor.material as MeshStandardMaterial).color.getHexString();
+        payload.gridEnabled = this.scene.Grid.visible;
+        payload.floorEnabled = this.scene.Floor.visible;
+        payload.floorColor = '#' + (this.scene.Floor.material as MeshStandardMaterial).color.getHexString();
 
         return true;
     }
@@ -476,5 +482,44 @@ export default class DIVECommunication {
 
         return true;
     }
+
+    private setParent(payload: Actions['SET_PARENT']['PAYLOAD']): Actions['SET_PARENT']['RETURN'] {
+        const object = this.registered.get(payload.object.id);
+        if (!object) return false;
+
+        const sceneObject = this.scene.GetSceneObject(object);
+        if (!sceneObject) return false;
+
+        if (payload.parent === null) {
+            // detach from current parent
+            this.scene.Root.attach(sceneObject);
+            return true;
+        }
+
+        if (payload.object.id === payload.parent.id) {
+            // cannot attach object to itself
+            return false;
+        }
+
+        const parent = this.registered.get(payload.parent.id);
+        if (!parent) {
+            // detach from current parent
+            this.scene.Root.attach(sceneObject);
+            return true;
+        }
+
+        // attach to new parent
+        const parentObject = this.scene.GetSceneObject(parent);
+        if (!parentObject) {
+            // detach from current parent
+            this.scene.Root.attach(sceneObject);
+            return true;
+        }
+
+        // attach to new parent
+        parentObject.attach(sceneObject);
+        return true;
+    }
 }
 
+export type { Actions } from './actions/index.ts';

package/src/com/__test__/Communication.test.ts

@@ -1,5 +1,4 @@
-import DIVECommunication from '../Communication';
-import '..';
+import { DIVECommunication } from '../Communication';
 import '../types';
 import '../actions';
 import '../actions/camera/movecamera';
@@ -22,12 +21,12 @@ import '../actions/scene/updatescene';
 import '../actions/toolbox/select/setgizmomode';
 import '../actions/toolbox/transform/setgizmovisible';
 import '../actions/camera/getcameratransform';
-import type DIVEScene from '../../scene/Scene';
+import type { DIVEScene } from '../../scene/Scene';
 import type DIVEToolbox from '../../toolbox/Toolbox';
 import type DIVEOrbitControls from '../../controls/OrbitControls';
 import { type DIVERenderer } from '../../renderer/Renderer';
-import { type COMLight, type COMModel, type COMPov } from '../types';
-import { type Object3D } from 'three';
+import { type COMEntity, type COMEntityType, type COMLight, type COMModel, type COMPov } from '../types';
+import { type DIVESceneObject } from '../../types';
 
 jest.mock('three/src/math/MathUtils', () => {
     return {
@@ -68,25 +67,29 @@ const mockScene = {
     UpdateSceneObject: jest.fn(),
     DeleteSceneObject: jest.fn(),
     PlaceOnFloor: jest.fn(),
-    GetSceneObject: jest.fn(),
+    GetSceneObject: jest.fn().mockReturnValue({
+        attach: jest.fn(),
+        DropIt: jest.fn(),
+    }),
     background: {
         getHexString: jest.fn().mockReturnValue('ffffff'),
     },
     Root: {
-        Floor: {
-            isFloor: true,
-            visible: true,
-            material: {
-                color: {
-                    getHexString: jest.fn().mockReturnValue('ffffff'),
-                },
+        attach: jest.fn(),
+    },
+    Floor: {
+        isFloor: true,
+        visible: true,
+        material: {
+            color: {
+                getHexString: jest.fn().mockReturnValue('ffffff'),
             },
-            SetVisibility: jest.fn(),
-            SetColor: jest.fn(),
-        },
-        Grid: {
-            SetVisibility: jest.fn(),
         },
+        SetVisibility: jest.fn(),
+        SetColor: jest.fn(),
+    },
+    Grid: {
+        SetVisibility: jest.fn(),
     },
     ComputeSceneBB: jest.fn(),
 } as unknown as DIVEScene;
@@ -350,9 +353,7 @@ describe('dive/communication/DIVECommunication', () => {
 
         testCom.PerformAction('ADD_OBJECT', payload);
 
-        const placeSpy = jest.spyOn(mockScene, 'GetSceneObject').mockReturnValue({
-            DropIt: jest.fn(),
-        } as unknown as Object3D);
+        const placeSpy = jest.spyOn(mockScene, 'GetSceneObject');
 
         const successPlace = testCom.PerformAction('DROP_IT', payload);
         expect(successPlace).toBe(true);
@@ -369,9 +370,7 @@ describe('dive/communication/DIVECommunication', () => {
 
             uri: "https://threejs.org/examples/models/gltf/LittlestTokyo.glb",
         };
-        const placeSpy = jest.spyOn(mockScene, 'GetSceneObject').mockReturnValue({
-            DropIt: jest.fn(),
-        } as unknown as Object3D);
+        const placeSpy = jest.spyOn(mockScene, 'GetSceneObject');
 
         const successPlace = testCom.PerformAction('DROP_IT', payload);
         expect(successPlace).toBe(false);
@@ -400,7 +399,7 @@ describe('dive/communication/DIVECommunication', () => {
 
     it('should perform action PLACE_ON_FLOOR without existing model', () => {
         const payload = {
-            entityType: "model",
+            entityType: "model" as COMEntityType,
             id: "model",
             position: { x: 0, y: 0, z: 0 },
             rotation: { x: 0, y: 0, z: 0 },
@@ -525,6 +524,7 @@ describe('dive/communication/DIVECommunication', () => {
                 id: "pov",
                 position: { x: 0, y: 0, z: 0 },
                 target: { x: 0, y: 0, z: 0 },
+                parent: null,
             }],
             floorColor: "#ffffff",
             floorEnabled: true,
@@ -534,6 +534,7 @@ describe('dive/communication/DIVECommunication', () => {
                 type: "ambient",
                 intensity: 0.5,
                 color: 'white',
+                parent: null,
             }],
             mediaItem: null,
             name: undefined,
@@ -543,7 +544,7 @@ describe('dive/communication/DIVECommunication', () => {
                 position: { x: 0, y: 0, z: 0 },
                 rotation: { x: 0, y: 0, z: 0 },
                 scale: { x: 0.01, y: 0.01, z: 0.01 },
-
+                parent: null,
                 uri: "https://threejs.org/examples/models/gltf/LittlestTokyo.glb",
             }],
             spotmarks: [],
@@ -575,7 +576,7 @@ describe('dive/communication/DIVECommunication', () => {
         expect(Array.from(successWithoutIds.values())).toStrictEqual([]);
 
         const successWithIds = testCom.PerformAction('GET_OBJECTS', { ids: ['test1'] });
-        expect(Array.from(successWithIds.values())).toStrictEqual([{ entityType: "pov", id: "test1", position: { x: 0, y: 0, z: 0 }, target: { x: 0, y: 0, z: 0 } }]);
+        expect(Array.from(successWithIds.values())).toStrictEqual([{ entityType: "pov", id: "test1", position: { x: 0, y: 0, z: 0 }, target: { x: 0, y: 0, z: 0 }, parent: null }]);
     });
 
     it('should perform action SELECT_OBJECT', () => {
@@ -594,11 +595,11 @@ describe('dive/communication/DIVECommunication', () => {
         const success1 = testCom.PerformAction('SELECT_OBJECT', { id: 'test0' });
         expect(success1).toBe(false);
 
-        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({} as unknown as Object3D);
+        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({} as unknown as DIVESceneObject);
         const success2 = testCom.PerformAction('SELECT_OBJECT', { id: 'test0' });
         expect(success2).toBe(false);
 
-        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({ isSelectable: true } as unknown as Object3D);
+        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({ isSelectable: true } as unknown as DIVESceneObject);
         const success3 = testCom.PerformAction('SELECT_OBJECT', { id: 'test0' });
         expect(success3).toBe(true);
     });
@@ -619,11 +620,11 @@ describe('dive/communication/DIVECommunication', () => {
         const success1 = testCom.PerformAction('DESELECT_OBJECT', { id: 'test0' });
         expect(success1).toBe(false);
 
-        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({} as unknown as Object3D);
+        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({} as unknown as DIVESceneObject);
         const success2 = testCom.PerformAction('DESELECT_OBJECT', { id: 'test0' });
         expect(success2).toBe(false);
 
-        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({ isSelectable: true } as unknown as Object3D);
+        jest.spyOn(mockScene, 'GetSceneObject').mockReturnValueOnce({ isSelectable: true } as unknown as DIVESceneObject);
         const success3 = testCom.PerformAction('DESELECT_OBJECT', { id: 'test0' });
         expect(success3).toBe(true);
     });
@@ -750,4 +751,83 @@ describe('dive/communication/DIVECommunication', () => {
         });
         expect(success1).toBe(true);
     });
+
+    it('should perform action SET_PARENT', () => {
+        const object = {
+            id: "object",
+        } as COMEntity;
+        testCom.PerformAction('ADD_OBJECT', object);
+
+        const objectNotRegistered = {
+            id: "objectNotRegistered",
+        } as COMEntity;
+
+        const parent0 = {
+            id: "parent0",
+        } as COMEntity;
+        testCom.PerformAction('ADD_OBJECT', parent0);
+
+        const parent1 = {
+            id: "parent1",
+        } as COMEntity;
+        testCom.PerformAction('ADD_OBJECT', parent1);
+
+        const parentNotRegistered = {
+            id: "parentNotRegistered",
+        } as COMEntity;
+
+        const attachNotRegisteredObject = testCom.PerformAction('SET_PARENT', {
+            object: objectNotRegistered,
+            parent: null,
+        });
+        expect(attachNotRegisteredObject).toBe(false);
+
+        jest.spyOn(mockScene, 'GetSceneObject').mockImplementationOnce(() => {
+            return undefined;
+        })
+        const attachNonSceneObject = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: null,
+        });
+        expect(attachNonSceneObject).toBe(false);
+
+        const attachToNull = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: null,
+        });
+        expect(attachToNull).toBe(true);
+
+        const attachToItself = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: object,
+        });
+        expect(attachToItself).toBe(false);
+
+        const attachToNotRegsiteredParent = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: parentNotRegistered,
+        });
+        expect(attachToNotRegsiteredParent).toBe(true);
+
+        jest.spyOn(mockScene, 'GetSceneObject').mockImplementationOnce(() => {
+            return {
+                DropIt: jest.fn(),
+                attach: jest.fn(),
+            } as unknown as DIVESceneObject;
+        }).mockImplementationOnce(() => {
+            return undefined;
+        });
+
+        const attachtoNonSceneParent = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: parent1,
+        });
+        expect(attachtoNonSceneParent).toBe(true);
+
+        const attachToValidParent = testCom.PerformAction('SET_PARENT', {
+            object: object,
+            parent: parent1,
+        });
+        expect(attachToValidParent).toBe(true);
+    });
 });

package/src/com/actions/index.ts

@@ -22,6 +22,7 @@ import DROP_IT from "./object/model/dropit.ts";
 import SET_GIZMO_VISIBILITY from "./toolbox/transform/setgizmovisible.js";
 import COMPUTE_ENCOMPASSING_VIEW from "./camera/computeencompassingview.ts";
 import USE_TOOL from "./toolbox/usetool.ts";
+import SET_PARENT from "./object/setparent.ts";
 
 export type Actions = {
     GET_ALL_SCENE_DATA: GET_ALL_SCENE_DATA,
@@ -48,4 +49,5 @@ export type Actions = {
     MODEL_LOADED: MODEL_LOADED,
     UPDATE_SCENE: UPDATE_SCENE,
     GENERATE_MEDIA: GENERATE_MEDIA,
+    SET_PARENT: SET_PARENT,
 };

package/src/com/actions/object/addobject.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface ADD_OBJECT {
     'PAYLOAD': COMEntity,

package/src/com/actions/object/deleteobject.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface DELETE_OBJECT {
     'PAYLOAD': Partial<COMEntity> & { id: string },

package/src/com/actions/object/deselectobject.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface DESELECT_OBJECT {
     'PAYLOAD': Partial<COMEntity> & { id: string },

package/src/com/actions/object/getallobjects.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface GET_ALL_OBJECTS {
     'PAYLOAD': Map<string, COMEntity>,

package/src/com/actions/object/getobjects.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface GET_OBJECTS {
     'PAYLOAD': { ids: string[] },

package/src/com/actions/object/selectobject.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface SELECT_OBJECT {
     'PAYLOAD': Partial<COMEntity> & { id: string },

package/src/com/actions/object/setparent.ts

@@ -0,0 +1,9 @@
+import { type COMEntity } from "../../types";
+
+export default interface SET_PARENT {
+    'PAYLOAD': {
+        object: Partial<COMEntity> & { id: string },
+        parent: Partial<COMEntity> & { id: string } | null,
+    },
+    'RETURN': boolean,
+};

package/src/com/actions/object/updateobject.ts

@@ -1,4 +1,4 @@
-import { COMEntity } from "../../types.ts";
+import { COMEntity } from "../../types";
 
 export default interface UPDATE_OBJECT {
     'PAYLOAD': Partial<COMEntity> & { id: string },

package/src/com/actions/scene/getallscenedata.ts

@@ -1,5 +1,5 @@
 import { Vector3Like } from "three";
-import { COMLight, COMModel, COMPov } from "../../types.ts";
+import { COMLight, COMModel, COMPov } from "../../types";
 
 type SceneData = {
     name: string,

package/src/com/types/COMBaseEntity.ts

@@ -0,0 +1,9 @@
+import { COMEntityType } from "./COMEntityType";
+
+export type COMBaseEntity = {
+    id: string;
+    name: string;
+    entityType: COMEntityType;
+    visible: boolean;
+    parent?: Partial<COMBaseEntity> & { id: string } | null;
+}

package/src/com/types/COMEntity.ts

@@ -0,0 +1,7 @@
+import { type COMPov } from "./COMPov";
+import { type COMLight } from "./COMLight";
+import { type COMModel } from "./COMModel";
+import { type COMPrimitive } from "./COMPrimitive";
+import { type COMGroup } from "./COMGroup";
+
+export type COMEntity = COMPov | COMLight | COMModel | COMPrimitive | COMGroup;

package/src/com/types/COMEntityType.ts

@@ -0,0 +1 @@
+export type COMEntityType = 'pov' | 'light' | 'model' | 'primitive' | 'group';

package/src/com/types/COMGeometry.ts

@@ -0,0 +1,6 @@
+export type COMGeometry = {
+    name: string
+    width: number;
+    height: number;
+    depth: number;
+}

package/src/com/types/COMGroup.ts

@@ -0,0 +1,9 @@
+import { type Vector3Like } from "three";
+import { type COMBaseEntity } from "./COMBaseEntity";
+
+export type COMGroup = COMBaseEntity & {
+    position: Vector3Like;
+    rotation: Vector3Like;
+    scale: Vector3Like;
+    bbVisible?: boolean;
+}

package/src/com/types/COMLight.ts

@@ -0,0 +1,10 @@
+import { type Vector3Like } from "three";
+import { type COMBaseEntity } from "./COMBaseEntity";
+
+export type COMLight = COMBaseEntity & {
+    type: 'ambient' | 'point' | 'scene';
+    intensity: number;
+    color: string | number;
+    enabled: boolean;
+    position?: Vector3Like;
+};

package/src/com/types/COMMaterial.ts

@@ -0,0 +1,12 @@
+import { type Texture } from "three";
+
+export type COMMaterial = {
+    vertexColors: boolean;
+    color: string | number;
+    map: Texture | null;
+    normalMap: Texture | null;
+    roughness: number;
+    roughnessMap: Texture | null;
+    metalness: number;
+    metalnessMap: Texture | null;
+}

package/src/com/types/COMModel.ts

@@ -0,0 +1,12 @@
+import { type Vector3Like } from "three";
+import { type COMMaterial } from "./COMMaterial";
+import { type COMBaseEntity } from "./COMBaseEntity";
+
+export type COMModel = COMBaseEntity & {
+    uri: string;
+    position: Vector3Like;
+    rotation: Vector3Like;
+    scale: Vector3Like;
+    loaded: boolean;
+    material?: Partial<COMMaterial>;
+};

package/src/com/types/COMPov.ts

@@ -0,0 +1,8 @@
+import { type Vector3Like } from "three";
+import { type COMBaseEntity } from "./COMBaseEntity";
+
+export type COMPov = COMBaseEntity & {
+    position: Vector3Like;
+    target: Vector3Like;
+    locked?: boolean;
+};