@shapediver/viewer.rendering-engine.camera-engine 2.3.5 → 2.4.1

package/src/implementation/camera/OrthographicCamera.ts

@@ -23,19 +23,20 @@ import { IOrthographicCameraControls } from '../../interfaces/controls/IOrthogra
 export class OrthographicCamera extends AbstractCamera implements IOrthographicCamera {
   // #region Properties (7)
 
-  private readonly _converter: Converter = <Converter>container.resolve(Converter);
-  private readonly _logger: Logger = <Logger>container.resolve(Logger);
-  private readonly _tree: ITree = <ITree>container.resolve(Tree);
-
-  private _domEventListenerToken?: string;
-  private _domEventEngine?: DomEventEngine;
-
-  private _bottom: number = -100;
-  private _direction: ORTHOGRAPHIC_CAMERA_DIRECTION = ORTHOGRAPHIC_CAMERA_DIRECTION.TOP;
-  private _left: number = -100;
-  private _right: number = 100;
-  private _top: number = 100;
-  private _up: vec3 = vec3.fromValues(0, 1, 0);
+  readonly #converter: Converter = <Converter>container.resolve(Converter);
+  readonly #logger: Logger = <Logger>container.resolve(Logger);
+  readonly #tree: ITree = <ITree>container.resolve(Tree);
+
+  #domEventListenerToken?: string;
+  #domEventEngine?: DomEventEngine;
+
+  #bottom: number = -100;
+  #direction: ORTHOGRAPHIC_CAMERA_DIRECTION = ORTHOGRAPHIC_CAMERA_DIRECTION.TOP;
+  #left: number = -100;
+  #right: number = 100;
+  #top: number = 100;
+  #threeJsObject: { [key: string]: THREE.OrthographicCamera } = {};
+  #up: vec3 = vec3.fromValues(0, 1, 0);
   protected _controls: IOrthographicCameraControls;
 
   // #endregion Properties (7)
@@ -52,11 +53,11 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
   // #region Public Accessors (12)
 
   public get bottom(): number {
-    return this._bottom;
+    return this.#bottom;
   }
 
   public set bottom(value: number) {
-    this._bottom = value;
+    this.#bottom = value;
   }
 
   public get controls(): IOrthographicCameraControls {
@@ -68,14 +69,14 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
   }
 
   public get direction(): ORTHOGRAPHIC_CAMERA_DIRECTION {
-    return this._direction;
+    return this.#direction;
   }
 
   public set direction(value: ORTHOGRAPHIC_CAMERA_DIRECTION) {
-    const changedDirection = this._direction !== value;
+    const changedDirection = this.#direction !== value;
 
-    this._direction = value;
-    switch (this._direction) {
+    this.#direction = value;
+    switch (this.#direction) {
       case ORTHOGRAPHIC_CAMERA_DIRECTION.TOP:
       case ORTHOGRAPHIC_CAMERA_DIRECTION.BOTTOM:
         this.up = vec3.fromValues(0, 1, 0);
@@ -107,35 +108,39 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
   }
 
   public get left(): number {
-    return this._left;
+    return this.#left;
   }
 
   public set left(value: number) {
-    this._left = value;
+    this.#left = value;
   }
 
   public get right(): number {
-    return this._right;
+    return this.#right;
   }
 
   public set right(value: number) {
-    this._right = value;
+    this.#right = value;
   }
 
   public get top(): number {
-    return this._top;
+    return this.#top;
   }
 
   public set top(value: number) {
-    this._top = value;
+    this.#top = value;
   }
 
   public get up(): vec3 {
-    return this._up;
+    return this.#up;
   }
 
   public set up(value: vec3) {
-    this._up = value;
+    this.#up = value;
+  }
+
+  public get threeJsObject(): { [key: string]: THREE.OrthographicCamera } {
+    return this.#threeJsObject;
   }
 
   // #endregion Public Accessors (12)
@@ -153,8 +158,8 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
       this.revertAtMouseUpDuration = cameraSetting.revertAtMouseUpDuration;
       this.zoomExtentsFactor = cameraSetting.zoomExtentsFactor;
 
-      let position = this._converter.toVec3(cameraSetting.position);
-      let target = this._converter.toVec3(cameraSetting.target);
+      let position = this.#converter.toVec3(cameraSetting.position);
+      let target = this.#converter.toVec3(cameraSetting.target);
       this.defaultPosition = vec3.clone(position);
       this.defaultTarget = vec3.clone(target);
 
@@ -180,19 +185,19 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
     let renderingEngine: IRenderingEngine | undefined = renderingEngines.find(r => r.id === viewportId && r.closed === false);
     if(!renderingEngine) {
       const error = new ShapeDiverViewerCameraError(`OrthographicCamera(${this.id}).assignViewer: Viewer with id ${viewportId} not found.`);
-      throw this._logger.handleError(LOGGING_TOPIC.CAMERA, `OrthographicCamera(${this.id}).assignViewer`, error);
+      throw this.#logger.handleError(LOGGING_TOPIC.CAMERA, `OrthographicCamera(${this.id}).assignViewer`, error);
     }
 
     this.assignViewerInternal(viewportId, renderingEngine.canvas);
     this._controls.assignViewer(viewportId, renderingEngine.canvas);
 
-    if (this._domEventListenerToken && this._domEventEngine)
-      this._domEventEngine.removeDomEventListener(this._domEventListenerToken);
+    if (this.#domEventListenerToken && this.#domEventEngine)
+      this.#domEventEngine.removeDomEventListener(this.#domEventListenerToken);
 
-    this._domEventEngine = renderingEngine.domEventEngine;
-    this._domEventListenerToken = this._domEventEngine.addDomEventListener((<OrthographicCameraControls>this._controls).cameraControlsEventDistribution);
+    this.#domEventEngine = renderingEngine.domEventEngine;
+    this.#domEventListenerToken = this.#domEventEngine.addDomEventListener((<OrthographicCameraControls>this._controls).cameraControlsEventDistribution);
 
-    this.boundingBox = this._tree.root.boundingBox.clone();
+    this.boundingBox = this.#tree.root.boundingBox.clone();
       
     this._stateEngine.renderingEngines[viewportId].boundingBoxCreated.then(async () => {
       if (this.position[0] === this.target[0] && this.position[1] === this.target[1] && this.position[2] === this.target[2])
@@ -221,7 +226,7 @@ export class OrthographicCamera extends AbstractCamera implements IOrthographicC
     const factor = 2 * box.boundingSphere.radius * this.zoomExtentsFactor;
     const center = vec3.clone(box.boundingSphere.center);
 
-    switch (this._direction) {
+    switch (this.#direction) {
       case ORTHOGRAPHIC_CAMERA_DIRECTION.TOP:
         return {
           position: vec3.fromValues(center[0], center[1], center[2] + factor),

package/src/implementation/camera/PerspectiveCamera.ts

@@ -23,17 +23,18 @@ import { IPerspectiveCameraControls } from '../../interfaces/controls/IPerspecti
 export class PerspectiveCamera extends AbstractCamera implements IPerspectiveCamera {
   // #region Properties (3)
 
-  private readonly _converter: Converter = <Converter>container.resolve(Converter);
-  private readonly _logger: Logger = <Logger>container.resolve(Logger);
-  private readonly _tree: ITree = <ITree>container.resolve(Tree);
+  readonly #converter: Converter = <Converter>container.resolve(Converter);
+  readonly #logger: Logger = <Logger>container.resolve(Logger);
+  readonly #tree: ITree = <ITree>container.resolve(Tree);
 
   protected _controls: IPerspectiveCameraControls;
 
-  private _domEventListenerToken?: string;
-  private _domEventEngine?: DomEventEngine;
+  #domEventListenerToken?: string;
+  #domEventEngine?: DomEventEngine;
 
-  private _aspect: number | undefined;
-  private _fov: number = 60;
+  #aspect: number | undefined;
+  #fov: number = 60;
+  #threeJsObject: { [key: string]: THREE.PerspectiveCamera } = {};
 
   // #endregion Properties (3)
 
@@ -49,11 +50,11 @@ export class PerspectiveCamera extends AbstractCamera implements IPerspectiveCam
   // #region Public Accessors (4)
 
   public get aspect(): number | undefined {
-    return this._aspect;
+    return this.#aspect;
   }
 
   public set aspect(value: number | undefined) {
-    this._aspect = value;
+    this.#aspect = value;
   }
 
   public get controls(): IPerspectiveCameraControls {
@@ -65,11 +66,15 @@ export class PerspectiveCamera extends AbstractCamera implements IPerspectiveCam
   }
 
   public get fov(): number {
-    return this._fov;
+    return this.#fov;
   }
 
   public set fov(value: number) {
-    this._fov = value;
+    this.#fov = value;
+  }
+
+  public get threeJsObject(): { [key: string]: THREE.PerspectiveCamera } {
+    return this.#threeJsObject;
   }
 
   // #endregion Public Accessors (4)
@@ -87,8 +92,8 @@ export class PerspectiveCamera extends AbstractCamera implements IPerspectiveCam
       this.revertAtMouseUpDuration = cameraSetting.revertAtMouseUpDuration;
       this.zoomExtentsFactor = cameraSetting.zoomExtentsFactor;
 
-      let position = this._converter.toVec3(cameraSetting.position);
-      let target = this._converter.toVec3(cameraSetting.target);
+      let position = this.#converter.toVec3(cameraSetting.position);
+      let target = this.#converter.toVec3(cameraSetting.target);
       this.defaultPosition = vec3.clone(position);
       this.defaultTarget = vec3.clone(target);
 
@@ -114,19 +119,19 @@ export class PerspectiveCamera extends AbstractCamera implements IPerspectiveCam
     let renderingEngine: IRenderingEngine | undefined = renderingEngines.find(r => r.id === viewportId && r.closed === false);
     if(!renderingEngine) {
       const error = new ShapeDiverViewerCameraError(`OrthographicCamera(${this.id}).assignViewer: Viewer with id ${viewportId} not found.`);
-      throw this._logger.handleError(LOGGING_TOPIC.CAMERA, `OrthographicCamera(${this.id}).assignViewer`, error);
+      throw this.#logger.handleError(LOGGING_TOPIC.CAMERA, `OrthographicCamera(${this.id}).assignViewer`, error);
     }
 
     this.assignViewerInternal(viewportId, renderingEngine.canvas);
     this._controls.assignViewer(viewportId, renderingEngine.canvas);
 
-    if (this._domEventListenerToken && this._domEventEngine)
-      this._domEventEngine.removeDomEventListener(this._domEventListenerToken);
+    if (this.#domEventListenerToken && this.#domEventEngine)
+      this.#domEventEngine.removeDomEventListener(this.#domEventListenerToken);
 
-    this._domEventEngine = renderingEngine.domEventEngine;
-    this._domEventListenerToken = this._domEventEngine.addDomEventListener((<PerspectiveCameraControls>this._controls).cameraControlsEventDistribution);
+    this.#domEventEngine = renderingEngine.domEventEngine;
+    this.#domEventListenerToken = this.#domEventEngine.addDomEventListener((<PerspectiveCameraControls>this._controls).cameraControlsEventDistribution);
 
-    this.boundingBox = this._tree.root.boundingBox.clone();
+    this.boundingBox = this.#tree.root.boundingBox.clone();
 
     this._stateEngine.renderingEngines[viewportId].boundingBoxCreated.then(async () => {
       if (this.position[0] === this.target[0] && this.position[1] === this.target[1] && this.position[2] === this.target[2])