@openglobus/og 0.28.0 → 0.28.2

package/lib/Globe.d.ts

@@ -2,6 +2,7 @@ import { Control } from "./control/Control";
 import { Ellipsoid } from "./ellipsoid/Ellipsoid";
 import { EmptyTerrain } from "./terrain/EmptyTerrain";
 import { Layer } from "./layer/Layer";
+import { Navigation } from "./control/Navigation";
 import type { NumberArray2 } from "./math/Vec2";
 import type { NumberArray4 } from "./math/Vec4";
 import { Planet } from "./scene/Planet";
@@ -40,6 +41,18 @@ export interface IGlobeParams {
         active?: boolean;
         stopped?: boolean;
     };
+    navigation?: {
+        active?: boolean;
+        inertia?: number;
+        dragInertia?: number;
+        minSlope?: number;
+        mass?: number;
+        zoomSpeed?: number;
+        mode?: "lockNorth" | "adaptive" | "free";
+        poleThreshold?: number;
+        disableRotation?: boolean;
+        disableTilt?: boolean;
+    };
     layers?: Layer[];
     viewExtent?: Extent | NumberArray4;
     autoActivate?: boolean;
@@ -67,7 +80,7 @@ export interface IGlobeParams {
  *     target: 'globus',
  *     name: 'Earth',
  *     controls: [
- *          new control.MouseNavigation(),
+ *          new control.Navigation(),
  *          new control.KeyboardNavigation(),
  *          new control.EarthCoordinates(),
  *          new control.LayerSwitcher({),
@@ -129,6 +142,7 @@ declare class Globe {
     protected _planetName: string;
     planet: Planet;
     sun: Sun;
+    navigation: Navigation;
     constructor(options: IGlobeParams);
     start(): void;
     /**

package/lib/control/{MouseNavigation.d.ts → Navigation.d.ts}

@@ -6,35 +6,41 @@ import { Sphere } from "../bv/Sphere";
 import { Vec2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
 import { type EventsHandler } from "../Events";
-interface IMouseNavigationParams extends IControlParams {
-    fixedUp?: boolean;
+export type NavigationMode = "lockNorth" | "adaptive" | "free";
+export interface INavigationParams extends IControlParams {
     inertia?: number;
     dragInertia?: number;
     minSlope?: number;
     mass?: number;
     zoomSpeed?: number;
+    mode?: NavigationMode;
+    poleThreshold?: number;
+    disableRotation?: boolean;
+    disableTilt?: boolean;
 }
-export type MouseNavigationEventsList = [
+export type NavigationEventsList = [
     "drag",
     "zoom",
     "rotate"
 ];
 /**
- * Mouse navigation.
+ * Navigation.
  * @class
  * @extends {Control}
- * @param {IMouseNavigationParams} [options] - Mouse navigation options:
- * @param {boolean} [options.fixedUp] - fix up at north pole
+ * @param {INavigationParams} [options] - Navigation options:
+ * @param {NavigationMode} [options.mode] - Navigation mode: "lockNorth" (keeps north fixed), "adaptive" (default, auto-detects arc mode), "free" (arc rotation mode)
  * @param {number} [options.inertia] - inertia factor
  * @param {number} [options.dragInertia] - drag inertia
  * @param {number} [options.mass] - camera mass, affects velocity. Default is 1
  * @param {number} [options.minSlope] - minimal slope for vertical camera movement. Default is 0.35
- * @param {number} [options.zoomSpeed] - zoom speed factor. Default is 1
- * @fires og.MouseNavigation#drag
- * @fires og.MouseNavigation#zoom
- * @fires og.MouseNavigation#rotate
+ * @param {number} [options.poleThreshold] - Vertical rotation is reduced when camera is close to poles
+ * @param {boolean} [options.disableRotation] - Disables horizontal rotation controls (right mouse button and touchpad). Default is false
+ * @param {boolean} [options.disableTilt] - Disables vertical tilt controls (right mouse button and touchpad). Default is false
+ * @fires og.Navigation#drag
+ * @fires og.Navigation#zoom
+ * @fires og.Navigation#rotate
  */
-export declare class MouseNavigation extends Control {
+export declare class Navigation extends Control {
     force: Vec3;
     force_h: number;
     force_v: number;
@@ -46,9 +52,14 @@ export declare class MouseNavigation extends Control {
     inertia: number;
     dragInertia: number;
     zoomSpeed: number;
+    poleThreshold: number;
+    mode: number;
+    disableRotation: boolean;
+    disableTilt: boolean;
     vel_roll: number;
     force_roll: number;
-    events: EventsHandler<MouseNavigationEventsList>;
+    protected _freeMode: boolean;
+    events: EventsHandler<NavigationEventsList>;
     protected _lookPos: Vec3 | undefined;
     protected _grabbedPoint: Vec3 | null;
     protected _grabbedDist: number;
@@ -61,7 +72,6 @@ export declare class MouseNavigation extends Control {
     protected _tUp: Vec3;
     protected _tRad: number;
     protected _shiftBusy: boolean;
-    protected fixedUp: boolean;
     protected _curPitch: number;
     protected _curYaw: number;
     protected _curRoll: number;
@@ -72,11 +82,9 @@ export declare class MouseNavigation extends Control {
     protected _isTouchPad: boolean;
     protected _velInertia: number;
     protected _hold: boolean;
-    protected _prevVel: Vec3;
-    protected _screenPosIsChanged: boolean;
     protected _rotHDir: number;
     protected _rotVDir: number;
-    constructor(options?: IMouseNavigationParams);
+    constructor(options?: INavigationParams);
     oninit(): void;
     onadd(): void;
     onremove(): void;
@@ -96,6 +104,9 @@ export declare class MouseNavigation extends Control {
     protected _onLDown: (e: IMouseState) => void;
     protected _onLHold: (e: IMouseState) => void;
     protected _onLUp: (e: IMouseState) => void;
+    get freeMode(): boolean;
+    setMode(mode: NavigationMode): void;
+    protected _modeToNumber(mode: NavigationMode): number;
     protected _handleDrag(): void;
     protected _corrRoll(): void;
     protected _handleZoom(): void;
@@ -107,4 +118,3 @@ export declare class MouseNavigation extends Control {
     protected get velocityInertia(): number;
     stop(): void;
 }
-export {};

package/lib/control/index.d.ts

@@ -9,7 +9,7 @@ export * from "./LayerAnimation";
 export * from "./LayerSwitcher";
 export * from "./Lighting";
 export * from "./OldMouseNavigation";
-export * from "./MouseNavigation";
+export * from "./Navigation";
 export * from "./RulerSwitcher";
 export * from "./ScaleControl";
 export * from "./ShowFps";