@openglobus/og 0.26.2 → 0.26.4

package/lib/camera/Camera.d.ts

@@ -10,7 +10,7 @@ import type { NumberArray2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
 import { Sphere } from "../bv/Sphere";
 import { Quat } from "../math/Quat";
-type CameraEvents = ["viewchange", "moveend"];
+export type CameraEvents = ["viewchange", "moveend"];
 export interface ICameraParams {
     eye?: Vec3;
     viewAngle?: number;

package/lib/camera/PlanetCamera.d.ts

@@ -1,20 +1,34 @@
-import { Camera, type ICameraParams } from "./Camera";
+import { Camera, CameraEvents, type ICameraParams } from "./Camera";
 import { Key } from "../Lock";
 import { LonLat } from "../LonLat";
 import { Planet } from "../scene/Planet";
 import { Vec3 } from "../math/Vec3";
 import { Extent } from "../Extent";
 import { Segment } from "../segment/Segment";
+import { EventsHandler } from "../Events";
+import { EasingFunction } from "../utils/easing";
 export interface IPlanetCameraParams extends ICameraParams {
     minAltitude?: number;
     maxAltitude?: number;
 }
+export type PlanetCameraEventsList = [
+    "flystart",
+    "flyend",
+    "flystop"
+];
+export declare const DEFAULT_FLIGHT_DURATION = 800;
+export declare const DEFAULT_EASING: EasingFunction;
 type CameraFrame = {
     eye: Vec3;
     n: Vec3;
     u: Vec3;
     v: Vec3;
 };
+type CameraFlight = {
+    fly: (progress: number) => CameraFrame;
+    duration: number;
+    startedAt: number;
+};
 /**
  * Planet camera.
  * @class
@@ -30,6 +44,11 @@ type CameraFrame = {
  * @param {Vec3} [options.eye] - Camera eye position. Default (0,0,0)
  * @param {Vec3} [options.look] - Camera look position. Default (0,0,0)
  * @param {Vec3} [options.up] - Camera eye position. Default (0,1,0)
+ * @fires og.Camera#viewchange
+ * @fires og.Camera#moveend
+ * @fires og.PlanetCamera#flystart
+ * @fires og.PlanetCamera#flyend
+ * @fires og.PlanetCamera#flystop
  */
 declare class PlanetCamera extends Camera {
     /**
@@ -38,6 +57,7 @@ declare class PlanetCamera extends Camera {
      * @type {Planet}
      */
     planet: Planet;
+    events: EventsHandler<PlanetCameraEventsList> & EventsHandler<CameraEvents>;
     /**
      * Minimal altitude that camera can reach over the terrain.
      * @public
@@ -82,9 +102,7 @@ declare class PlanetCamera extends Camera {
     _insideSegment: Segment | null;
     slope: number;
     protected _keyLock: Key;
-    protected _framesArr: CameraFrame[];
-    protected _framesCounter: number;
-    protected _numFrames: number;
+    protected _flight: CameraFlight | null;
     protected _completeCallback: Function | null;
     protected _frameCallback: Function | null;
     protected _flying: boolean;
@@ -152,13 +170,15 @@ declare class PlanetCamera extends Camera {
      * @param {number} [height] - Destination height.
      * @param {Vec3} [up] - Camera UP in the end of flying. Default - (0,1,0)
      * @param {Number} [ampl] - Altitude amplitude factor.
+     * @param {Number} [duration] - Animation duration
+     * @param {EasingFunction} [ease] - Animation easing
      * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {Function} [startCallback] - Callback that calls before the flying begins.
      * @param {Function} [frameCallback] - Each frame callback
      */
-    flyExtent(extent: Extent, height?: number | null, up?: Vec3 | null, ampl?: number | null, completeCallback?: Function | null, startCallback?: Function | null, frameCallback?: Function | null): void;
+    flyExtent(extent: Extent, height?: number | null, up?: Vec3 | null, ampl?: number | null, duration?: number, ease?: EasingFunction, completeCallback?: Function | null, startCallback?: Function | null, frameCallback?: Function | null): void;
     viewDistance(cartesian: Vec3, distance?: number): void;
-    flyDistance(cartesian: Vec3, distance?: number, ampl?: number, completeCallback?: Function, startCallback?: Function, frameCallback?: Function): void;
+    flyDistance(cartesian: Vec3, distance?: number, ampl?: number, duration?: number, ease?: EasingFunction, completeCallback?: Function, startCallback?: Function, frameCallback?: Function): void;
     /**
      * Flies to the cartesian coordinates.
      * @public
@@ -166,11 +186,13 @@ declare class PlanetCamera extends Camera {
      * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
      * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
      * @param {Number} [ampl=1.0] - Altitude amplitude factor.
+     * @param {Number} [duration] - Animation duration
+     * @param {EasingFunction} [ease] - Animation easing
      * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {Function} [startCallback] - Callback that calls before the flying begins.
      * @param {Function} [frameCallback] - Each frame callback
      */
-    flyCartesian(cartesian: Vec3, look?: Vec3 | LonLat | null, up?: Vec3 | null, ampl?: number, completeCallback?: Function | null, startCallback?: Function | null, frameCallback?: Function | null): void;
+    flyCartesian(cartesian: Vec3, look?: Vec3 | LonLat | null, up?: Vec3 | null, ampl?: number, duration?: number, ease?: EasingFunction, completeCallback?: Function | null, startCallback?: Function | null, frameCallback?: Function | null): void;
     /**
      * Flies to the geo coordinates.
      * @public
@@ -178,11 +200,13 @@ declare class PlanetCamera extends Camera {
      * @param {Vec3 | LonLat} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
      * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
      * @param {number} [ampl] - Altitude amplitude factor.
+     * @param {Number} [duration] - Animation duration
+     * @param {EasingFunction} [ease] - Animation easing
      * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {Function} [startCallback] - Callback that calls befor the flying begins.
      * @param {Function} [frameCallback] - each frame callback
      */
-    flyLonLat(lonlat: LonLat, look?: Vec3 | LonLat, up?: Vec3, ampl?: number, completeCallback?: Function, startCallback?: Function, frameCallbak?: Function): void;
+    flyLonLat(lonlat: LonLat, look?: Vec3 | LonLat, up?: Vec3, ampl?: number, duration?: number, ease?: EasingFunction, completeCallback?: Function, startCallback?: Function, frameCallback?: Function): void;
     /**
      * Breaks the flight.
      * @public

package/lib/control/MouseNavigation.d.ts

@@ -5,12 +5,36 @@ import { Quat } from "../math/Quat";
 import { Sphere } from "../bv/Sphere";
 import { Vec2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
-interface IEarthNavigationParams extends IControlParams {
-    speed?: number;
+import { type EventsHandler } from "../Events";
+interface IMouseNavigationParams extends IControlParams {
     fixedUp?: boolean;
+    inertia?: number;
+    dragInertia?: number;
+    minSlope?: number;
+    mass?: number;
+    zoomSpeed?: number;
 }
+export type MouseNavigationEventsList = [
+    "drag",
+    "zoom",
+    "rotate"
+];
+/**
+ * Mouse navigation.
+ * @class
+ * @extends {Control}
+ * @param {IMouseNavigationParams} [options] - Mouse navigation options:
+ * @param {boolean} [options.fixedUp] - fix up at north pole
+ * @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
+ */
 export declare class MouseNavigation extends Control {
-    speed: number;
     force: Vec3;
     force_h: number;
     force_v: number;
@@ -18,8 +42,13 @@ export declare class MouseNavigation extends Control {
     vel_h: number;
     vel_v: number;
     mass: number;
+    minSlope: number;
+    inertia: number;
+    dragInertia: number;
+    zoomSpeed: number;
     vel_roll: number;
     force_roll: number;
+    events: EventsHandler<MouseNavigationEventsList>;
     protected _lookPos: Vec3 | undefined;
     protected _grabbedPoint: Vec3 | null;
     protected _targetZoomPoint: Vec3 | null;
@@ -46,13 +75,15 @@ export declare class MouseNavigation extends Control {
     protected _screenPosIsChanged: boolean;
     protected _rotHDir: number;
     protected _rotVDir: number;
-    protected _dragInertia: number;
-    constructor(options?: IEarthNavigationParams);
+    constructor(options?: IMouseNavigationParams);
     oninit(): void;
+    onadd(): void;
+    onremove(): void;
     onactivate(): void;
     ondeactivate(): void;
     protected onDraw(): void;
     _onShiftFree: () => void;
+    private _onCameraFly;
     protected _onMouseMove: (e: IMouseState) => void;
     protected _onMouseEnter: (e: IMouseState) => void;
     protected _onMouseLeave: () => void;
@@ -72,6 +103,7 @@ export declare class MouseNavigation extends Control {
     protected _updateVel_v(): void;
     protected _updateVel_roll(): void;
     protected get dt(): number;
+    protected get velocityInertia(): number;
     stop(): void;
 }
 export {};

package/lib/control/TouchNavigation.d.ts

@@ -6,8 +6,15 @@ import { Sphere } from "../bv/Sphere";
 import { Vec2 } from "../math/Vec2";
 import { Vec3 } from "../math/Vec3";
 import type { ITouchState } from "../renderer/RendererEvents";
+import { EventsHandler } from "../Events";
 interface ITouchNavigationParams extends IControlParams {
+    inertia?: number;
 }
+export type TouchNavigationEventsList = [
+    "inertiamove",
+    "drag",
+    "doubletapzoom"
+];
 declare class TouchExt {
     x: number;
     y: number;
@@ -25,10 +32,18 @@ declare class TouchExt {
 }
 /**
  * Touch pad planet camera dragging control.
+ * @class
+ * @extends {Control}
+ * @param {ITouchNavigationParams} [options] - Mouse navigation options:
+ * @param {number} [options.inertia] - inertia factor. Default is 0.007
+ * @fires og.TouchNavigation#inertiamove
+ * @fires og.TouchNavigation#drag
+ * @fires og.TouchNavigation#doubletapzoom
  */
 export declare class TouchNavigation extends Control {
     grabbedPoint: Vec3;
     inertia: number;
+    events: EventsHandler<TouchNavigationEventsList>;
     protected grabbedSpheroid: Sphere;
     protected qRot: Quat;
     protected scaleRot: number;
@@ -41,6 +56,9 @@ export declare class TouchNavigation extends Control {
     protected _touching: boolean;
     constructor(options?: ITouchNavigationParams);
     oninit(): void;
+    onadd(): void;
+    onremove(): void;
+    private _onCameraFly;
     protected onTouchStart(e: ITouchState): void;
     protected _startTouchOne(e: ITouchState): void;
     stopRotation(): void;

package/lib/control/drawing/DrawingControl.d.ts

@@ -1,8 +1,14 @@
 import { Control, type IControlParams } from "../Control";
 import { PolygonDrawingScene } from "./PolygonDrawingScene";
+export interface IDrawingControlParams extends IControlParams {
+    cornerStyle?: any;
+    centerStyle?: any;
+    outlineStyle?: any;
+    fillStyle?: any;
+}
 declare class DrawingControl extends Control {
     protected _drawingScene: PolygonDrawingScene;
-    constructor(options?: IControlParams);
+    constructor(options?: IDrawingControlParams);
     activatePolygonDrawing(): void;
     activateLineStringDrawing(): void;
     oninit(): void;

package/lib/control/drawing/PolygonDrawingScene.d.ts

@@ -1,8 +1,9 @@
 import { type EventsHandler } from '../../Events';
-import type { CoordinatesType } from "../../entity/Geometry";
+import type { CoordinatesType, IGeometryStyle } from "../../entity/Geometry";
+import type { IGeoObjectParams } from "../../entity/GeoObject";
+import type { IPolylineParams } from "../../entity/Polyline";
 import { Entity } from '../../entity/Entity';
 import type { IMouseState } from "../../renderer/RendererEvents";
-import { Object3d } from '../../Object3d';
 import { Planet } from '../../scene/Planet';
 import { RenderNode } from '../../scene/RenderNode';
 import { Vec2 } from '../../math/Vec2';
@@ -11,35 +12,21 @@ import { Vector } from '../../layer/Vector';
 type PolygonDrawingSceneEventsList = ["change", "startpoint"];
 export interface IPolygonDrawingSceneParams {
     coordinates?: CoordinatesType[];
+    cornerStyle?: IGeoObjectParams;
+    centerStyle?: IGeoObjectParams;
+    outlineStyle?: IPolylineParams;
+    fillStyle?: IGeometryStyle;
     name: string;
 }
 export declare const NUM_SEGMENTS = 200;
 export declare const OUTLINE_ALT = 0.3;
-export declare const COORDINATES_COLOR = "rgb(350, 350, 0)";
-export declare const CENTER_COLOR = "rgb(0, 350, 50)";
-export declare const OUTLINE_COLOR = "rgb(0, 350, 50)";
-export declare const OUTLINE_THICKNESS = 3.5;
-export declare const CORNER_OPTIONS: {
-    scale: number;
-    instanced: boolean;
-    tag: string;
-    color: string;
-    object3d: Object3d;
-};
-export declare const CENTER_OPTIONS: {
-    scale: number;
-    instanced: boolean;
-    tag: string;
-    color: string;
-    object3d: Object3d;
-};
-export declare const OUTLINE_OPTIONS: {
-    thickness: number;
-    color: string;
-};
 declare class PolygonDrawingScene extends RenderNode {
     events: EventsHandler<PolygonDrawingSceneEventsList>;
     _planet: Planet | null;
+    _cornerStyle: IGeoObjectParams;
+    _centerStyle: IGeoObjectParams;
+    _outlineStyle: IPolylineParams;
+    _fillStyle: IGeometryStyle;
     protected _initCoordinates: CoordinatesType[];
     protected _pickedCorner: Entity | null;
     protected _pickedCenter: Entity | null;

package/lib/entity/Entity.d.ts

@@ -264,6 +264,7 @@ declare class Entity {
     protected _qFrame: Quat;
     protected _qRot: Quat;
     _absoluteQRot: Quat;
+    protected _useDirectQuaternion: boolean;
     constructor(options?: IEntityParams);
     get isEmpty(): boolean;
     /**
@@ -401,6 +402,13 @@ declare class Entity {
      * @param {Quat} rot - The new rotation quaternion.
      */
     setRotation(rot: Quat): void;
+    /**
+     * Sets rotation directly from glTF quaternion with common coordinate system conversion.
+     * This method avoids current pitch/yaw/roll airplane like conversion.
+     * @public
+     * @param {Quat} rot - Quaternion from glTF
+     */
+    setDirectQuaternionRotation(rot: Quat): void;
     /**
      * Sets the pitch rotation of the entity.
      * @param {number} val - The new pitch angle in radians.

package/lib/index.d.ts

@@ -33,4 +33,6 @@ export * from './layer/index';
 import { EmptyTerrain, GlobusTerrain, RgbTerrain, BilTerrain, GlobusRgbTerrain } from './terrain/index';
 import { MoveAxisEntity } from "./control/geoObjectEditor/MoveAxisEntity";
 import { Gltf } from './utils/gltf/gltfParser';
-export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, moon, mars, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, EquiQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d, Gltf, MoveAxisEntity, };
+import { Easing } from './utils/easing';
+import type { EasingFunction } from './utils/easing';
+export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, moon, mars, terrain, layer, webgl, Easing, EasingFunction, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, EquiQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d, Gltf, MoveAxisEntity, };