ohzi-core 13.0.5 → 13.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "13.0.5",
+  "version": "13.0.7",
   "description": "OHZI Interactive Core Library",
   "type": "module",
   "source": "src/index.ts",

package/src/Graphics.ts

@@ -59,7 +59,7 @@ class Graphics
     }
 
     OScreen.dpr = dpr;
-    this._renderer.setPixelRatio(1);
+    this._renderer.setPixelRatio(dpr);
 
     this.blitter = new Blitter(this._renderer);
 

package/src/action_sequencer/ActionSequencer.ts

@@ -137,7 +137,7 @@ class ActionSequencer
     this.channels[interpolator.attribute_name].push(keyframe);
   }
 
-  get_current_target_value(name: string)
+  get_current_target_value(name: string): number
   {
     const keyframe = this.__get_current_keyframe(name, this.elapsed_time);
 
@@ -149,14 +149,14 @@ class ActionSequencer
     return keyframe.interpolator.evaluate(1);
   }
 
-  get_current_starting_value(name: string)
+  get_current_starting_value(name: string): number
   {
     const keyframe = this.__get_current_keyframe(name, this.elapsed_time);
 
     return keyframe.interpolator.evaluate(0);
   }
 
-  get_current_progress(name: string)
+  get_current_progress(name: string): number
   {
     const keyframe = this.__get_current_keyframe(name, this.elapsed_time);
     const t = this.__linear_map_01(this.elapsed_time, keyframe.from, keyframe.to);

package/src/camera_controller/CameraController.ts

@@ -22,7 +22,7 @@ import { AbstractCameraState } from './states/common/AbstractCameraState';
 export class CameraController
 {
   __last_reference_position: Vector3;
-  camera: Camera;
+  camera: PerspectiveCamera;
   camera_initial_pos: Vector3;
   camera_initial_rot: Quaternion;
   current_azimuth: number;
@@ -292,11 +292,11 @@ export class CameraController
       const object_aspect = obj_x / obj_y;
       if (OScreen.aspect_ratio / object_aspect > 1)
       {
-        (this.camera as PerspectiveCamera).zoom = OScreen.height / obj_y;
+        (this.camera).zoom = OScreen.height / obj_y;
       }
       else
       {
-        (this.camera as PerspectiveCamera).zoom = OScreen.width / obj_x;
+        (this.camera).zoom = OScreen.width / obj_x;
       }
 
       bb.getCenter(this.reference_position);
@@ -375,8 +375,8 @@ export class CameraController
 
   get_zoom_to_sphere(sphere: Sphere, debug: boolean)
   {
-    const v_fov = ((this.camera as PerspectiveCamera).fov / 2) * Math.PI / 180;
-    const h_fov = (2 * Math.atan(Math.tan(v_fov) * (this.camera as PerspectiveCamera).aspect)) / 2;
+    const v_fov = ((this.camera).fov / 2) * Math.PI / 180;
+    const h_fov = (2 * Math.atan(Math.tan(v_fov) * (this.camera).aspect)) / 2;
 
     // if(debug )
     // {
@@ -425,7 +425,7 @@ export class CameraController
 
   fit_points(quaternion: Quaternion, points: Vector3[], zoom_scale = 1)
   {
-    if ((this.camera as PerspectiveCamera).isPerspectiveCamera)
+    if ((this.camera).isPerspectiveCamera)
     {
       const camera_forward_dir = new Vector3(0, 0, -1).applyQuaternion(quaternion);
       const camera_backward_dir = camera_forward_dir.clone().multiplyScalar(-1);
@@ -434,7 +434,7 @@ export class CameraController
 
       const aspect_ratio = OScreen.aspect_ratio;
 
-      const camera_pos = fitter.fit_points(points, quaternion, ((this.camera as PerspectiveCamera).fov * zoom_scale), aspect_ratio);
+      const camera_pos = fitter.fit_points(points, quaternion, ((this.camera).fov * zoom_scale), aspect_ratio);
       const box = new Box3().setFromPoints(points);
       const center = new Vector3();
       box.getCenter(center);
@@ -457,7 +457,7 @@ export class CameraController
     else
     {
       const fitter = new OrthographicFrustumPointFitter();
-      const result = fitter.fit_points(points, this.reference_rotation, ((this.camera as PerspectiveCamera).fov * zoom_scale), OScreen.aspect_ratio);
+      const result = fitter.fit_points(points, this.reference_rotation, ((this.camera).fov * zoom_scale), OScreen.aspect_ratio);
 
       this.reference_position.copy(result.center);
       this.reference_zoom = result.distance_to_center;
@@ -473,7 +473,7 @@ export class CameraController
 
   focus_camera_on_points(points: Vector3[], zoom_scale = 1)
   {
-    if ((this.camera as PerspectiveCamera).isPerspectiveCamera)
+    if ((this.camera).isPerspectiveCamera)
     {
       const camera_forward_dir = new Vector3(0, 0, -1).applyQuaternion(this.reference_rotation);
       const camera_backward_dir = camera_forward_dir.clone().multiplyScalar(-1);
@@ -482,7 +482,7 @@ export class CameraController
 
       const aspect_ratio = OScreen.aspect_ratio;
 
-      const camera_pos = fitter.fit_points(points, this.reference_rotation, ((this.camera as PerspectiveCamera).fov * zoom_scale), aspect_ratio);
+      const camera_pos = fitter.fit_points(points, this.reference_rotation, ((this.camera).fov * zoom_scale), aspect_ratio);
       const box = new Box3().setFromPoints(points);
       const center = new Vector3();
       box.getCenter(center);
@@ -502,7 +502,7 @@ export class CameraController
     else
     {
       const fitter = new OrthographicFrustumPointFitter();
-      const result = fitter.fit_points(points, this.reference_rotation, ((this.camera as PerspectiveCamera).fov * zoom_scale), OScreen.aspect_ratio);
+      const result = fitter.fit_points(points, this.reference_rotation, ((this.camera).fov * zoom_scale), OScreen.aspect_ratio);
 
       this.reference_position.copy(result.center);
       this.reference_zoom = result.distance_to_center;
@@ -527,8 +527,8 @@ export class CameraController
   __get_zoom_to_show_rect(width: number, height: number, scale = 1)
   {
     // let v_fov = (this.camera.fov/2) * Math.PI/180;
-    const v_fov = OMath.degToRad((this.camera as PerspectiveCamera).fov / 2);
-    const h_fov = (2 * Math.atan(Math.tan(v_fov) * (this.camera as PerspectiveCamera).aspect)) / 2;
+    const v_fov = OMath.degToRad((this.camera).fov / 2);
+    const h_fov = (2 * Math.atan(Math.tan(v_fov) * (this.camera).aspect)) / 2;
 
     const distV = height / Math.tan(v_fov * scale);
     const distH = width / Math.tan(h_fov * scale);

package/src/camera_controller/states/common/CommonCameraState.ts

@@ -1,7 +1,6 @@
 import { Vector2 } from 'three';
 
 import type { Input } from '../../../lib/Input';
-import type { PerspectiveCamera } from '../../../PerspectiveCamera';
 import { Time } from '../../../Time';
 import { CameraUtilities } from '../../../utilities/CameraUtilities';
 import type { CameraController } from '../../CameraController';
@@ -71,7 +70,7 @@ export class CommonCameraState extends AbstractCameraState
         tilt: camera_controller.current_tilt,
         azimuth: camera_controller.current_azimuth,
         zoom: camera_controller.reference_zoom,
-        fov: (camera_controller.camera as PerspectiveCamera).fov
+        fov: (camera_controller.camera).fov
       });
     }
   }