@shopware-ag/dive 1.7.0 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/README.md +1 -1
  2. package/build/dive.cjs +344 -45
  3. package/build/dive.cjs.map +1 -1
  4. package/build/dive.d.cts +33 -11
  5. package/build/dive.d.ts +33 -11
  6. package/build/dive.js +335 -36
  7. package/build/dive.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/__test__/DIVE.test.ts +2 -1
  10. package/src/camera/PerspectiveCamera.ts +7 -2
  11. package/src/camera/__test__/PerspectiveCamera.test.ts +11 -2
  12. package/src/com/index.ts +0 -1
  13. package/src/com/types.ts +26 -3
  14. package/src/controls/OrbitControls.ts +9 -4
  15. package/src/controls/__test__/OrbitControls.test.ts +15 -5
  16. package/src/dive.ts +10 -8
  17. package/src/mediacreator/__test__/MediaCreator.test.ts +1 -1
  18. package/src/primitive/Primitive.ts +210 -0
  19. package/src/primitive/__test__/Primitive.test.ts +434 -0
  20. package/src/renderer/Renderer.ts +10 -7
  21. package/src/renderer/__test__/Renderer.test.ts +11 -0
  22. package/src/scene/__test__/Scene.test.ts +2 -2
  23. package/src/scene/root/Root.ts +44 -3
  24. package/src/scene/root/__test__/Root.test.ts +71 -27
  25. package/src/scene/root/lightroot/__test__/LightRoot.test.ts +2 -3
  26. package/src/scene/root/primitiveroot/PrimitiveRoot.ts +88 -0
  27. package/src/scene/root/primitiveroot/__test__/PrimitiveRoot.test.ts +181 -0
package/build/dive.d.cts CHANGED
@@ -1,5 +1,5 @@
1
- import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
2
- import { OrbitControls } from 'three/examples/jsm/Addons.js';
1
+ import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
2
+ import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
3
3
  import { Tween } from '@tweenjs/tween.js';
4
4
  import { TransformControls } from 'three/examples/jsm/Addons';
5
5
 
@@ -10,6 +10,7 @@ type DIVERendererSettings = {
10
10
  shadowMapEnabled: boolean;
11
11
  shadowMapType: ShadowMapType;
12
12
  toneMapping: ToneMapping;
13
+ canvas?: HTMLCanvasElement;
13
14
  };
14
15
  /**
15
16
  * A changed version of the WebGLRenderer.
@@ -24,7 +25,7 @@ declare class DIVERenderer extends WebGLRenderer {
24
25
  private force;
25
26
  private preRenderCallbacks;
26
27
  private postRenderCallbacks;
27
- constructor(rendererSettings?: DIVERendererSettings);
28
+ constructor(rendererSettings?: Partial<DIVERendererSettings>);
28
29
  Dispose(): void;
29
30
  StartRenderer(scene: Scene, cam: Camera): void;
30
31
  PauseRenderer(): void;
@@ -83,7 +84,7 @@ declare class DIVEPerspectiveCamera extends PerspectiveCamera {
83
84
  static readonly EDITOR_VIEW_LAYER_MASK: number;
84
85
  static readonly LIVE_VIEW_LAYER_MASK = 16;
85
86
  onSetCameraLayer: (mask: number) => void;
86
- constructor(settings?: DIVEPerspectiveCameraSettings);
87
+ constructor(settings?: Partial<DIVEPerspectiveCameraSettings>);
87
88
  OnResize(width: number, height: number): void;
88
89
  SetCameraLayer(layer: 'LIVE' | 'EDITOR'): void;
89
90
  }
@@ -123,7 +124,7 @@ declare class DIVEOrbitControls extends OrbitControls {
123
124
  object: DIVEPerspectiveCamera;
124
125
  domElement: HTMLCanvasElement;
125
126
  private _removePreRenderCallback;
126
- constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: DIVEOrbitControlsSettings);
127
+ constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: Partial<DIVEOrbitControlsSettings>);
127
128
  Dispose(): void;
128
129
  ComputeEncompassingView(bb: Box3): {
129
130
  position: Vector3Like;
@@ -204,7 +205,7 @@ interface PLACE_ON_FLOOR {
204
205
  type COMBaseEntity = {
205
206
  id: string;
206
207
  name: string;
207
- entityType: 'pov' | 'light' | 'model';
208
+ entityType: 'pov' | 'light' | 'model' | 'primitive';
208
209
  visible: boolean;
209
210
  };
210
211
  type COMPov = COMBaseEntity & {
@@ -226,7 +227,27 @@ type COMModel = COMBaseEntity & {
226
227
  scale: Vector3Like;
227
228
  loaded: boolean;
228
229
  };
229
- type COMEntity = COMPov | COMLight | COMModel;
230
+ type COMGeometry = {
231
+ name: string;
232
+ width: number;
233
+ height: number;
234
+ depth: number;
235
+ };
236
+ type COMMaterial = {
237
+ color: string | number;
238
+ roughness: number;
239
+ roughnessMap: Texture | null;
240
+ metalness: number;
241
+ metalnessMap: Texture | null;
242
+ };
243
+ type COMPrimitive = COMBaseEntity & {
244
+ position: Vector3Like;
245
+ rotation: Vector3Like;
246
+ scale: Vector3Like;
247
+ geometry: COMGeometry;
248
+ material: COMMaterial;
249
+ };
250
+ type COMEntity = COMPov | COMLight | COMModel | COMPrimitive;
230
251
 
231
252
  interface GET_ALL_OBJECTS {
232
253
  'PAYLOAD': Map<string, COMEntity>;
@@ -385,6 +406,7 @@ declare class DIVEGrid extends Object3D {
385
406
  declare class DIVERoot extends Object3D {
386
407
  private lightRoot;
387
408
  private modelRoot;
409
+ private primitiveRoot;
388
410
  private floor;
389
411
  private grid;
390
412
  get Floor(): DIVEFloor;
@@ -395,7 +417,7 @@ declare class DIVERoot extends Object3D {
395
417
  AddSceneObject(object: COMEntity): void;
396
418
  UpdateSceneObject(object: Partial<COMEntity>): void;
397
419
  DeleteSceneObject(object: Partial<COMEntity>): void;
398
- PlaceOnFloor(object: Partial<COMModel>): void;
420
+ PlaceOnFloor(object: Partial<COMEntity>): void;
399
421
  }
400
422
 
401
423
  /**
@@ -708,9 +730,9 @@ declare class DIVEInfo {
708
730
  type DIVESettings = {
709
731
  autoResize: boolean;
710
732
  displayAxes: boolean;
711
- renderer: DIVERendererSettings;
712
- perspectiveCamera: DIVEPerspectiveCameraSettings;
713
- orbitControls: DIVEOrbitControlsSettings;
733
+ renderer: Partial<DIVERendererSettings>;
734
+ perspectiveCamera: Partial<DIVEPerspectiveCameraSettings>;
735
+ orbitControls: Partial<DIVEOrbitControlsSettings>;
714
736
  };
715
737
  declare const DIVEDefaultSettings: DIVESettings;
716
738
  /**
package/build/dive.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
2
- import { OrbitControls } from 'three/examples/jsm/Addons.js';
1
+ import { ShadowMapType, ToneMapping, WebGLRenderer, Scene, Camera, PerspectiveCamera, Box3, Vector3Like, Texture, Mesh, ColorRepresentation, Object3D, Intersection, Vector2, Raycaster, Vector3 } from 'three';
2
+ import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
3
3
  import { Tween } from '@tweenjs/tween.js';
4
4
  import { TransformControls } from 'three/examples/jsm/Addons';
5
5
 
@@ -10,6 +10,7 @@ type DIVERendererSettings = {
10
10
  shadowMapEnabled: boolean;
11
11
  shadowMapType: ShadowMapType;
12
12
  toneMapping: ToneMapping;
13
+ canvas?: HTMLCanvasElement;
13
14
  };
14
15
  /**
15
16
  * A changed version of the WebGLRenderer.
@@ -24,7 +25,7 @@ declare class DIVERenderer extends WebGLRenderer {
24
25
  private force;
25
26
  private preRenderCallbacks;
26
27
  private postRenderCallbacks;
27
- constructor(rendererSettings?: DIVERendererSettings);
28
+ constructor(rendererSettings?: Partial<DIVERendererSettings>);
28
29
  Dispose(): void;
29
30
  StartRenderer(scene: Scene, cam: Camera): void;
30
31
  PauseRenderer(): void;
@@ -83,7 +84,7 @@ declare class DIVEPerspectiveCamera extends PerspectiveCamera {
83
84
  static readonly EDITOR_VIEW_LAYER_MASK: number;
84
85
  static readonly LIVE_VIEW_LAYER_MASK = 16;
85
86
  onSetCameraLayer: (mask: number) => void;
86
- constructor(settings?: DIVEPerspectiveCameraSettings);
87
+ constructor(settings?: Partial<DIVEPerspectiveCameraSettings>);
87
88
  OnResize(width: number, height: number): void;
88
89
  SetCameraLayer(layer: 'LIVE' | 'EDITOR'): void;
89
90
  }
@@ -123,7 +124,7 @@ declare class DIVEOrbitControls extends OrbitControls {
123
124
  object: DIVEPerspectiveCamera;
124
125
  domElement: HTMLCanvasElement;
125
126
  private _removePreRenderCallback;
126
- constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: DIVEOrbitControlsSettings);
127
+ constructor(camera: DIVEPerspectiveCamera, renderer: DIVERenderer, animationSystem: DIVEAnimationSystem, settings?: Partial<DIVEOrbitControlsSettings>);
127
128
  Dispose(): void;
128
129
  ComputeEncompassingView(bb: Box3): {
129
130
  position: Vector3Like;
@@ -204,7 +205,7 @@ interface PLACE_ON_FLOOR {
204
205
  type COMBaseEntity = {
205
206
  id: string;
206
207
  name: string;
207
- entityType: 'pov' | 'light' | 'model';
208
+ entityType: 'pov' | 'light' | 'model' | 'primitive';
208
209
  visible: boolean;
209
210
  };
210
211
  type COMPov = COMBaseEntity & {
@@ -226,7 +227,27 @@ type COMModel = COMBaseEntity & {
226
227
  scale: Vector3Like;
227
228
  loaded: boolean;
228
229
  };
229
- type COMEntity = COMPov | COMLight | COMModel;
230
+ type COMGeometry = {
231
+ name: string;
232
+ width: number;
233
+ height: number;
234
+ depth: number;
235
+ };
236
+ type COMMaterial = {
237
+ color: string | number;
238
+ roughness: number;
239
+ roughnessMap: Texture | null;
240
+ metalness: number;
241
+ metalnessMap: Texture | null;
242
+ };
243
+ type COMPrimitive = COMBaseEntity & {
244
+ position: Vector3Like;
245
+ rotation: Vector3Like;
246
+ scale: Vector3Like;
247
+ geometry: COMGeometry;
248
+ material: COMMaterial;
249
+ };
250
+ type COMEntity = COMPov | COMLight | COMModel | COMPrimitive;
230
251
 
231
252
  interface GET_ALL_OBJECTS {
232
253
  'PAYLOAD': Map<string, COMEntity>;
@@ -385,6 +406,7 @@ declare class DIVEGrid extends Object3D {
385
406
  declare class DIVERoot extends Object3D {
386
407
  private lightRoot;
387
408
  private modelRoot;
409
+ private primitiveRoot;
388
410
  private floor;
389
411
  private grid;
390
412
  get Floor(): DIVEFloor;
@@ -395,7 +417,7 @@ declare class DIVERoot extends Object3D {
395
417
  AddSceneObject(object: COMEntity): void;
396
418
  UpdateSceneObject(object: Partial<COMEntity>): void;
397
419
  DeleteSceneObject(object: Partial<COMEntity>): void;
398
- PlaceOnFloor(object: Partial<COMModel>): void;
420
+ PlaceOnFloor(object: Partial<COMEntity>): void;
399
421
  }
400
422
 
401
423
  /**
@@ -708,9 +730,9 @@ declare class DIVEInfo {
708
730
  type DIVESettings = {
709
731
  autoResize: boolean;
710
732
  displayAxes: boolean;
711
- renderer: DIVERendererSettings;
712
- perspectiveCamera: DIVEPerspectiveCameraSettings;
713
- orbitControls: DIVEOrbitControlsSettings;
733
+ renderer: Partial<DIVERendererSettings>;
734
+ perspectiveCamera: Partial<DIVEPerspectiveCameraSettings>;
735
+ orbitControls: Partial<DIVEOrbitControlsSettings>;
714
736
  };
715
737
  declare const DIVEDefaultSettings: DIVESettings;
716
738
  /**