@openglobus/og 0.23.0 → 0.24.1

package/lib/js/camera/PlanetCamera.js

@@ -7,6 +7,7 @@ import { Mat4 } from "../math/Mat4";
 import { Quat } from "../math/Quat";
 import { Ray } from "../math/Ray";
 import { Vec3 } from "../math/Vec3";
+import { RADIANS } from "../math";
 /**
  * Planet camera.
  * @class
@@ -167,7 +168,7 @@ class PlanetCamera extends Camera {
         let up = right.cross(direction).normalize();
         let _h = Math.max(Math.abs(up.dot(northWest)), Math.abs(up.dot(southEast)), Math.abs(up.dot(northEast)), Math.abs(up.dot(southWest)));
         let _w = Math.max(Math.abs(right.dot(northWest)), Math.abs(right.dot(southEast)), Math.abs(right.dot(northEast)), Math.abs(right.dot(southWest)));
-        let tanPhi = Math.tan(this._viewAngle * math.RADIANS * 0.5);
+        let tanPhi = Math.tan(this._viewAngle * RADIANS * 0.5);
         let tanTheta = this._aspect * tanPhi;
         let d = Math.max(_w / tanTheta, _h / tanPhi);
         center.normalize();
@@ -329,6 +330,7 @@ class PlanetCamera extends Camera {
         this._framesArr = [];
         this._framesCounter = -1;
         this._frameCallback = null;
+        this.planet.stopDragging();
     }
     /**
      * Returns camera is flying.
@@ -345,7 +347,7 @@ class PlanetCamera extends Camera {
      * @param {boolean} [spin] - If its true rotates around globe spin.
      */
     rotateLeft(angle, spin) {
-        this.rotateHorizontal(angle * math.RADIANS, spin !== true, Vec3.ZERO);
+        this.rotateHorizontal(angle, spin !== true, Vec3.ZERO);
         this.update();
     }
     /**
@@ -355,7 +357,7 @@ class PlanetCamera extends Camera {
      * @param {boolean} [spin] - If its true rotates around globe spin.
      */
     rotateRight(angle, spin) {
-        this.rotateHorizontal(-angle * math.RADIANS, spin !== true, Vec3.ZERO);
+        this.rotateHorizontal(-angle, spin !== true, Vec3.ZERO);
         this.update();
     }
     /**
@@ -364,7 +366,7 @@ class PlanetCamera extends Camera {
      * @param {number} angle - Rotation angle.
      */
     rotateUp(angle) {
-        this.rotateVertical(angle * math.RADIANS, Vec3.ZERO);
+        this.rotateVertical(angle, Vec3.ZERO);
         this.update();
     }
     /**
@@ -373,7 +375,7 @@ class PlanetCamera extends Camera {
      * @param {number} angle - Rotation angle.
      */
     rotateDown(angle) {
-        this.rotateVertical(-angle * math.RADIANS, Vec3.ZERO);
+        this.rotateVertical(-angle, Vec3.ZERO);
         this.update();
     }
     rotateVertical(angle, center, minSlope = 0) {
@@ -398,6 +400,7 @@ class PlanetCamera extends Camera {
                 this._u = u;
                 this._r = r;
                 this._b = b;
+                this._f.set(-b.x, -b.y, -b.z);
             }
         }
         else {
@@ -405,6 +408,7 @@ class PlanetCamera extends Camera {
             this._u = u;
             this._r = r;
             this._b = b;
+            this._f.set(-b.x, -b.y, -b.z);
         }
     }
     /**
@@ -421,6 +425,7 @@ class PlanetCamera extends Camera {
             this._r = this._framesArr[c].u;
             this._u = this._framesArr[c].v;
             this._b = this._framesArr[c].n;
+            this._f.set(-this._b.x, -this._b.y, -this._b.z);
             if (this._frameCallback) {
                 this._frameCallback();
             }
@@ -449,6 +454,9 @@ class PlanetCamera extends Camera {
         let R = this.planet.ellipsoid.equatorialSize;
         return R * Math.acos(R / (R + this._lonLat.height + d));
     }
+    /**
+     * should be yje same as getYaw
+     */
     getHeading() {
         let u = this.eye.getNormal();
         let f = Vec3.proj_b_to_plane(this.slope >= 0.97 ? this.getUp() : this.getForward(), u).normalize(), n = Vec3.proj_b_to_plane(Vec3.NORTH, u).normalize();
@@ -462,5 +470,44 @@ class PlanetCamera extends Camera {
         let e = this.eye.length();
         return this.eye.distance(poi) < Math.sqrt(e * e - this.planet.ellipsoid.equatorialSizeSqr);
     }
+    getPitch() {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        return qFrame.conjugate().inverse().mul(this.getRotation()).getPitch();
+    }
+    /**
+     * should be the same as getHeading
+     */
+    getYaw() {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        return qFrame.conjugate().inverse().mul(this.getRotation()).getYaw();
+    }
+    getRoll() {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        return qFrame.conjugate().inverse().mul(this.getRotation()).getRoll();
+    }
+    setPitch(a) {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        let qRot = new Quat();
+        qRot.setPitchYawRoll(a, this.getYaw(), this.getRoll(), qFrame);
+        this.setRotation(qRot);
+    }
+    setYaw(a) {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        let qRot = new Quat();
+        qRot.setPitchYawRoll(this.getYaw(), a, this.getRoll(), qFrame);
+        this.setRotation(qRot);
+    }
+    setRoll(a) {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        let qRot = new Quat();
+        qRot.setPitchYawRoll(this.getPitch(), this.getYaw(), a, qFrame);
+        this.setRotation(qRot);
+    }
+    setPitchYawRoll(pitch, yaw, roll) {
+        let qFrame = this.planet.getFrameRotation(this.eye);
+        let qRot = new Quat();
+        qRot.setPitchYawRoll(pitch, yaw, roll, qFrame).conjugate();
+        this.setRotation(qRot);
+    }
 }
 export { PlanetCamera };

package/lib/js/control/Atmosphere.d.ts

@@ -1,7 +1,7 @@
-import { AtmosphereParameters } from "../shaders/atmos";
+import { type AtmosphereParameters } from "../shaders/atmos";
 import { Framebuffer } from "../webgl/Framebuffer";
-import { Control, IControlParams } from "./Control";
-import { NumberArray3 } from '../math/Vec3';
+import { Control, type IControlParams } from "./Control";
+import type { NumberArray3 } from '../math/Vec3';
 export interface IAtmosphereParams extends IControlParams {
     height?: number;
     rayleighScale?: number;

package/lib/js/control/AtmosphereConfig.d.ts

@@ -1,9 +1,9 @@
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 import { Dialog } from '../ui/Dialog';
 import { Slider } from "../ui/Slider";
 import { ToggleButton } from "../ui/ToggleButton";
 import { View } from '../ui/View';
-import { AtmosphereParameters } from "../shaders/atmos";
+import type { AtmosphereParameters } from "../shaders/atmos";
 interface IAtmosphereConfigParams extends IControlParams {
 }
 /**

package/lib/js/control/CameraLock.d.ts

@@ -1,9 +1,9 @@
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 import { LonLat } from "../LonLat";
 import { Vec3 } from "../math/Vec3";
-import { EventsHandler } from "../Events";
+import { type EventsHandler } from "../Events";
 import { Entity } from "../entity/Entity";
-import { IMouseState } from "../renderer/RendererEvents";
+import type { IMouseState } from "../renderer/RendererEvents";
 import { Planet } from "../scene/Planet";
 type CameraLockEventsList = ["lockview", "unlockview"];
 interface ICameraLockParams extends IControlParams {

package/lib/js/control/CameraLock.js

@@ -139,7 +139,7 @@ export class CameraLock extends Control {
     _deactivateNav() {
         if (this.renderer && this.renderer.controls.mouseNavigation) {
             this.renderer.controls.mouseNavigation.deactivate();
-            this.renderer.controls.mouseNavigation.stopRotation();
+            this.renderer.controls.mouseNavigation.stop();
         }
         if (this.renderer && this.renderer.controls.simpleNavigation) {
             this.renderer.controls.simpleNavigation.deactivate();

package/lib/js/control/CompassButton.d.ts

@@ -1,4 +1,4 @@
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 interface ICompasButtonParams extends IControlParams {
 }
 /**

package/lib/js/control/DebugInfo.d.ts

@@ -1,4 +1,4 @@
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 import { Dialog } from "../ui/Dialog";
 import { ToggleButton } from "../ui/ToggleButton";
 import { CanvasTiles } from "../layer/CanvasTiles";

package/lib/js/control/DebugInfo.js

@@ -2,6 +2,7 @@ import { Control } from "./Control";
 import { Dialog } from "../ui/Dialog";
 import { ToggleButton } from "../ui/ToggleButton";
 import { CanvasTiles } from "../layer/CanvasTiles";
+import { DEGREES } from "../math";
 const ICON_LOCK_BUTTON_SVG = `<?xml version="1.0" encoding="utf-8"?>
 <!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <svg fill="#000000" width="800px" height="800px" viewBox="-7.5 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
@@ -195,16 +196,6 @@ export class DebugInfo extends Control {
                         return "";
                     }
                 },
-                {
-                    label: "height/alt, m",
-                    frame: () => `<div style="width:190px">${(p.camera._lonLat.height).toFixed(2) +
-                        " / " +
-                        (p.camera.getAltitude()).toFixed(2)}</div>`
-                },
-                {
-                    label: "cam.slope",
-                    frame: () => p.camera.slope.toFixed(3)
-                },
                 {
                     label: "lodSize",
                     frame: () => Math.round(p.lodSize)
@@ -220,6 +211,35 @@ export class DebugInfo extends Control {
                 {
                     label: "-------------------------"
                 },
+                {
+                    label: "Pitch, deg",
+                    frame: () => (p.camera.getPitch() * DEGREES).toFixed(2)
+                },
+                {
+                    label: "Yaw, deg",
+                    frame: () => (p.camera.getYaw() * DEGREES).toFixed(2)
+                },
+                {
+                    label: "Roll, deg",
+                    frame: () => (p.camera.getRoll() * DEGREES).toFixed(2)
+                },
+                {
+                    label: "Lon, Lat",
+                    frame: () => `<div style="width:190px">${(p.camera._lonLat.lon).toFixed(7)}, ${(p.camera._lonLat.lon).toFixed(7)}</div>`
+                },
+                {
+                    label: "height/alt, m",
+                    frame: () => `<div style="width:190px">${(p.camera._lonLat.height).toFixed(2) +
+                        " / " +
+                        (p.camera.getAltitude()).toFixed(2)}</div>`
+                },
+                {
+                    label: "cam.slope",
+                    frame: () => p.camera.slope.toFixed(3)
+                },
+                {
+                    label: "-------------------------"
+                },
                 {
                     label: "_renderCompleted / renderCompletedActivated",
                     frame: () => `${p._renderCompleted} / ${p._renderCompletedActivated}`

package/lib/js/control/EarthCoordinates.d.ts

@@ -1,6 +1,6 @@
-import { Control, IControlParams } from './Control';
+import { Control, type IControlParams } from './Control';
 import { LonLat } from '../LonLat';
-import { IMouseState } from "../renderer/RendererEvents";
+import type { IMouseState } from "../renderer/RendererEvents";
 interface IEarthCoordinatesParams extends IControlParams {
     heightMode?: string;
     centerMode?: boolean;

package/lib/js/control/GeoImageDragControl.d.ts

@@ -1,7 +1,7 @@
-import { Control, IControlParams } from './Control';
+import { Control, type IControlParams } from './Control';
 import { Layer } from "../layer/Layer";
 import { ToggleButton } from "../ui/ToggleButton";
-import { IMouseState } from "../renderer/RendererEvents";
+import type { IMouseState } from "../renderer/RendererEvents";
 interface IGeoImageDragControlParams extends IControlParams {
 }
 export declare class GeoImageDragControl extends Control {

package/lib/js/control/KeyboardNavigation.d.ts

@@ -1,4 +1,4 @@
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 interface IKeyboardNavigationParams extends IControlParams {
     step?: number;
 }

package/lib/js/control/KeyboardNavigation.js

@@ -71,7 +71,7 @@ export class KeyboardNavigation extends Control {
     onCameraLookUp() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.pitch(15 / this.renderer.handler.deltaTime);
+            cam.setPitch(15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateVertical((cam.getAltitude() / 3000000) * math.RADIANS, Vec3.ZERO);
@@ -80,7 +80,7 @@ export class KeyboardNavigation extends Control {
     onCameraLookDown() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.pitch(-15 / this.renderer.handler.deltaTime);
+            cam.setPitch(-15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateVertical((-cam.getAltitude() / 3000000) * math.RADIANS, Vec3.ZERO);
@@ -89,7 +89,7 @@ export class KeyboardNavigation extends Control {
     onCameraLookLeft() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.roll(15 / this.renderer.handler.deltaTime);
+            cam.setRoll(15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateHorizontal((cam.getAltitude() / 3000000) * math.RADIANS);
@@ -98,7 +98,7 @@ export class KeyboardNavigation extends Control {
     onCameraLookRight() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.roll(-15 / this.renderer.handler.deltaTime);
+            cam.setRoll(-15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateHorizontal((-cam.getAltitude() / 3000000) * math.RADIANS);
@@ -107,7 +107,7 @@ export class KeyboardNavigation extends Control {
     onCameraTurnLeft() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.yaw(15 / this.renderer.handler.deltaTime);
+            cam.setYaw(15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateHorizontal((cam.getAltitude() / 3000000) * math.RADIANS);
@@ -116,7 +116,7 @@ export class KeyboardNavigation extends Control {
     onCameraTurnRight() {
         let cam = this.planet.camera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
-            cam.yaw(-15 / this.renderer.handler.deltaTime);
+            cam.setYaw(-15 / this.renderer.handler.deltaTime);
         }
         else {
             cam.rotateHorizontal((-cam.getAltitude() / 3000000) * math.RADIANS, false, Vec3.ZERO);
@@ -135,9 +135,9 @@ export class KeyboardNavigation extends Control {
         }
     }
     onCameraRollLeft() {
-        this.planet.camera.roll(-15 / this.renderer.handler.deltaTime);
+        this.planet.camera.setRoll(-15 / this.renderer.handler.deltaTime);
     }
     onCameraRollRight() {
-        this.planet.camera.roll(15 / this.renderer.handler.deltaTime);
+        this.planet.camera.setRoll(15 / this.renderer.handler.deltaTime);
     }
 }

package/lib/js/control/LayerAnimation.d.ts

@@ -1,6 +1,6 @@
-import { EventsHandler } from '../Events';
+import { type EventsHandler } from '../Events';
 import { Layer } from '../layer/Layer';
-import { Control, IControlParams } from "./Control";
+import { Control, type IControlParams } from "./Control";
 type LayerAnimationEventsList = ["change", "idle", "play", "pause", "stop"];
 interface ILayerAnimationParams extends IControlParams {
     layers?: Layer;

package/lib/js/control/LayerSwitcher.d.ts

@@ -1,8 +1,10 @@
-import { Control, IControlParams } from "./Control";
+import { Control } from "./Control";
+import type { IControlParams } from "./Control";
 import { Dialog } from "../ui/Dialog";
 import { Layer } from "../layer/Layer";
 import { ToggleButton } from "../ui/ToggleButton";
-import { IViewParams, View } from "../ui/View";
+import { View } from "../ui/View";
+import type { IViewParams } from "../ui/View";
 interface ILayerSwitcherParams extends IControlParams {
 }
 declare class LayerButtonView extends View<Layer> {

package/lib/js/control/Lighting.d.ts

@@ -1,4 +1,5 @@
-import { Control, IControlParams } from "./Control";
+import { Control } from "./Control";
+import type { IControlParams } from "./Control";
 import { Dialog } from '../ui/Dialog';
 import { Layer } from "../layer/Layer";
 import { Slider } from "../ui/Slider";

package/lib/js/control/MouseNavigation.d.ts

@@ -1,64 +1,76 @@
-import { Control, IControlParams } from "./Control";
-import { Key } from "../Lock";
+import { Control } from "./Control";
+import type { IControlParams } from "./Control";
+import type { IMouseState } from "../renderer/RendererEvents";
 import { Quat } from "../math/Quat";
 import { Sphere } from "../bv/Sphere";
-import { Vec3 } from "../math/Vec3";
 import { Vec2 } from "../math/Vec2";
-import { Planet } from "../scene/Planet";
-import { PlanetCamera } from "../camera/PlanetCamera";
-import { IMouseState } from "../renderer/RendererEvents";
-export interface IStepForward {
-    eye: Vec3;
-    v: Vec3;
-    u: Vec3;
-    n: Vec3;
-}
-interface IMouseNavigationParams extends IControlParams {
-    minSlope?: number;
+import { Vec3 } from "../math/Vec3";
+interface IEarthNavigationParams extends IControlParams {
+    speed?: number;
+    fixedUp?: boolean;
 }
-/**
- * Mouse planet camera dragging control.
- */
 export declare class MouseNavigation extends Control {
-    protected grabbedPoint: Vec3;
-    protected _eye0: Vec3;
-    protected pointOnEarth: Vec3;
-    protected earthUp: Vec3;
-    inertia: number;
-    protected grabbedSpheroid: Sphere;
-    protected qRot: Quat;
-    protected scaleRot: number;
-    protected distDiff: number;
-    protected stepsCount: number;
-    protected stepsForward: IStepForward[] | null;
-    protected stepIndex: number;
-    protected _lmbDoubleClickActive: boolean;
-    minSlope: number;
+    speed: number;
+    force: Vec3;
+    force_h: number;
+    force_v: number;
+    vel: Vec3;
+    vel_h: number;
+    vel_v: number;
+    mass: number;
+    vel_roll: number;
+    force_roll: number;
+    protected _lookPos: Vec3 | undefined;
+    protected _grabbedPoint: Vec3 | null;
+    protected _targetZoomPoint: Vec3 | null;
+    protected _targetDragPoint: Vec3 | null;
+    protected _targetRotationPoint: Vec3 | null;
+    protected _grabbedSphere: Sphere;
     protected _wheelDirection: number;
-    protected _keyLock: Key;
-    protected _deactivate: boolean;
+    protected _currScreenPos: Vec2;
+    protected _tUp: Vec3;
+    protected _tRad: number;
     protected _shiftBusy: boolean;
-    constructor(options?: IMouseNavigationParams);
-    static getMovePointsFromPixelTerrain(cam: PlanetCamera, planet: Planet, stepsCount: number, delta: number, point: Vec2, forward: boolean, dir?: Vec3 | null): IStepForward[] | undefined;
+    protected fixedUp: boolean;
+    protected _curPitch: number;
+    protected _curYaw: number;
+    protected _curRoll: number;
+    protected _rot: Quat;
+    protected _eye0: Vec3;
+    protected _grabbedCameraHeight: number;
+    protected _newEye: Vec3;
+    protected _isTouchPad: boolean;
+    protected _velInertia: number;
+    protected _hold: boolean;
+    protected _prevVel: Vec3;
+    protected _screenPosIsChanged: boolean;
+    protected _rotHDir: number;
+    protected _rotVDir: number;
+    constructor(options?: IEarthNavigationParams);
+    oninit(): void;
     onactivate(): void;
     ondeactivate(): void;
-    activateDoubleClickZoom(): void;
-    deactivateDoubleClickZoom(): void;
-    protected onMouseEnter(e: IMouseState): void;
-    protected onMouseLeave(): void;
-    protected onMouseWheel(e: IMouseState): void;
-    oninit(): void;
-    protected onMouseLeftButtonDoubleClick(e: IMouseState): void;
-    protected onMouseLeftButtonClick(): void;
-    stopRotation(): void;
-    protected onMouseLeftButtonUp(e: IMouseState): void;
-    protected onMouseLeftButtonDown(e: IMouseState): void;
-    protected onMouseRightButtonClick(e: IMouseState): void;
-    protected onMouseRightButtonDown(e: IMouseState): void;
-    onShiftFree(): void;
-    protected onMouseMove(e: IMouseState): void;
     protected onDraw(): void;
-    lockPlanet(skipTerrain?: boolean): void;
-    freePlanet(): void;
+    _onShiftFree: () => void;
+    protected _onMouseMove: (e: IMouseState) => void;
+    protected _onMouseEnter: (e: IMouseState) => void;
+    protected _onMouseLeave: () => void;
+    protected _onRHold: (e: IMouseState) => void;
+    protected _handleRotation(): void;
+    protected _onRDown: (e: IMouseState) => void;
+    protected _getTargetPoint(p: Vec2): Vec3 | null;
+    protected _onMouseWheel: (e: IMouseState) => void;
+    protected _onLDown: (e: IMouseState) => void;
+    protected _onLHold: (e: IMouseState) => void;
+    protected _onLUp: (e: IMouseState) => void;
+    protected _handleDrag(): void;
+    protected _corrRoll(): void;
+    protected _handleZoom(): void;
+    protected _updateVel(): void;
+    protected _updateVel_h(): void;
+    protected _updateVel_v(): void;
+    protected _updateVel_roll(): void;
+    protected get dt(): number;
+    stop(): void;
 }
 export {};