@openglobus/og 0.27.0 → 0.27.1

package/lib/camera/Camera.d.ts

@@ -21,6 +21,8 @@ export interface ICameraParams {
     frustums?: NumberArray2[];
     width?: number;
     height?: number;
+    isOrthographic?: boolean;
+    focusDistance?: number;
 }
 export interface IFlyCartesianParams extends IFlyBaseParams {
     look?: Vec3 | LonLat;
@@ -71,6 +73,8 @@ declare class Camera {
      * @type {Events}
      */
     events: EventsHandler<CameraEvents>;
+    protected _isOrthographic: boolean;
+    protected _focusDistance: number;
     /**
      * Camera position.
      * @public
@@ -154,6 +158,10 @@ declare class Camera {
     protected _frameCallback: Function | null;
     protected _flying: boolean;
     constructor(options?: ICameraParams);
+    get isOrthographic(): boolean;
+    set isOrthographic(isOrthographic: boolean);
+    get focusDistance(): number;
+    set focusDistance(dist: number);
     get id(): number;
     /**
      * Flies to the cartesian coordinates.
@@ -221,10 +229,10 @@ declare class Camera {
     /**
      * Sets up camera projection
      * @public
-     * @param {number} angle - Camera view angle
+     * @param {number} viewAngle - Camera view angle
      * @param {number} aspect - Screen aspect ratio
      */
-    protected _setProj(angle: number, aspect: number): void;
+    protected _setProj(viewAngle: number, aspect: number): void;
     protected _updateViewportParameters(): void;
     /**
      * Sets camera view angle in degrees
@@ -310,7 +318,7 @@ declare class Camera {
      * @param {number} y - Screen Y coordinate
      * @returns {Vec3} - Direction vector
      */
-    unproject(x: number, y: number): Vec3;
+    unproject(x: number, y: number, dist?: number, outPos?: Vec3): Vec3;
     /**
      * Gets projected 3d point to the 2d screen coordinates
      * @public
@@ -355,9 +363,10 @@ declare class Camera {
     rotateVertical(angle: number, center?: Vec3): void;
     /**
      * Gets 3d size factor. Uses in LOD distance calculation.
+     * It is very important function used in Node.ts
      * @public
-     * @param {Vec3} p - Far point.
-     * @param {Vec3} r - Far point.
+     * @param {Vec3} p - Point in 3d.
+     * @param {Vec3} r - size.
      * @returns {number} - Size factor.
      */
     projectedSize(p: Vec3, r: number): number;

package/lib/camera/Frustum.d.ts

@@ -88,12 +88,13 @@ declare class Frustum {
     /**
      * Sets up camera projection matrix.
      * @public
-     * @param {number} angle - Camera's vertical fov view angle.
+     * @param {number} viewAngle - Camera's vertical fov view angle.
      * @param {number} aspect - Screen aspect ratio.
      * @param {number} near - Near camera distance.
      * @param {number} far - Far camera distance.
      */
-    setProjectionMatrix(angle: number, aspect: number, near: number, far: number): void;
+    setProjectionMatrix(viewAngle: number, aspect: number, near: number, far: number, isOrthographic?: boolean, focusDistance?: number): void;
+    protected _setFrustumParams(top: number, right: number, near: number, far: number): void;
     setProjectionViewRTEMatrix(viewRTEMatrix: Mat4): void;
     /**
      * Camera's projection matrix values.

package/lib/control/SimpleNavigation.d.ts

@@ -1,7 +1,9 @@
 import { Control } from "./Control";
 import type { IControlParams } from "./Control";
 import type { IMouseState } from "../renderer/RendererEvents";
+import { Vec2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
+import { Camera } from "../camera/Camera";
 interface ISimpleNavigationParams extends IControlParams {
     speed?: number;
 }
@@ -16,14 +18,19 @@ export declare class SimpleNavigation extends Control {
     protected _lookPos: Vec3 | undefined;
     protected _up: Vec3 | null;
     protected _grabbedPoint: Vec3 | undefined;
+    protected _grabbedScreenPoint: Vec2;
     protected _eye0: Vec3;
+    protected _wheelPos: Vec3;
+    protected _savedFocusDistance: number;
+    protected _savedEye: Vec3;
     constructor(options?: ISimpleNavigationParams);
     oninit(): void;
     onactivate(): void;
     ondeactivate(): void;
-    protected _onMouseLeftButtonClick: (e: IMouseState) => void;
-    protected _onMouseLeftButtonUp: (e: IMouseState) => void;
+    protected _onProjChanged: (cam: Camera) => void;
     protected _onMouseLeftButtonDown: (e: IMouseState) => void;
+    protected _onMouseLeftButtonUp: (e: IMouseState) => void;
+    protected _onMouseLeftButtonHold: (e: IMouseState) => void;
     protected _onRHold: (e: IMouseState) => void;
     protected _onRDown: (e: IMouseState) => void;
     protected _onMouseWheel: (e: IMouseState) => void;
@@ -37,7 +44,9 @@ export declare class SimpleNavigation extends Control {
     protected onCameraTurnRight: () => void;
     protected onCameraRollLeft: () => void;
     protected onCameraRollRight: () => void;
-    protected get dt(): number;
+    protected _handleMouseWheel(): void;
     protected onDraw(): void;
+    protected get dt(): number;
+    protected _updateVel(): void;
 }
 export {};

package/lib/math/Mat4.d.ts

@@ -189,7 +189,7 @@ export declare class Mat4 {
      * @param {number} far -
      * @return {Mat4} -
      */
-    setOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number): Mat4;
+    setOrthographic(left: number, right: number, bottom: number, top: number, near: number, far: number): Mat4;
     /**
      * Sets current rotation matrix by euler's angles.
      * @public

package/lib/math/Vec3.d.ts

@@ -156,6 +156,8 @@ export declare class Vec3 {
      * @returns {Vec3} -
      */
     static orthoNormalize(normal: Vec3, tangent: Vec3): Vec3;
+    static isOrthogonal(a: Vec3, b: Vec3, epsilon?: number): boolean;
+    isOrthogonal(b: Vec3, epsilon?: number): boolean;
     /**
      * Returns vector components division product one to another.
      * @static