@openglobus/og 0.27.24 → 0.28.1

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";

package/lib/entity/EntityCollection.d.ts

@@ -304,6 +304,11 @@ declare class EntityCollection {
      * @public
      */
     updateLabelsFontAtlas(): void;
+    /**
+     * Updates stroke texture atlas.
+     * @public
+     */
+    updateStrokeTextureAtlas(): void;
     /**
      * Removes collection from render node.
      * @public

package/lib/entity/Polyline.d.ts

@@ -10,6 +10,7 @@ import { RenderNode } from "../scene/RenderNode";
 import type { WebGLBufferExt } from "../webgl/Handler";
 import type { TypedArray } from "../utils/shared";
 import { Ellipsoid } from "../ellipsoid/Ellipsoid";
+import type { HTMLImageElementExt } from "../utils/ImagesCacheManager";
 export type Geodetic = LonLat | NumberArray2 | NumberArray3;
 export type Cartesian = Vec3 | NumberArray3;
 export type SegmentPath3vExt = Cartesian[];
@@ -29,6 +30,10 @@ export interface IPolylineParams {
     pathLonLat?: SegmentPathLonLatExt[];
     visibleSpherePosition?: Cartesian;
     visibleSphereRadius?: number;
+    src?: string;
+    image?: HTMLImageElement;
+    texOffset?: number;
+    strokeSize?: number;
 }
 /**
  * Polyline object.
@@ -109,11 +114,14 @@ declare class Polyline {
     protected _orders: TypedArray | number[];
     protected _indexes: TypedArray | number[];
     protected _colors: TypedArray | number[];
+    protected _texCoordArr: TypedArray | number[];
+    protected _atlasTexCoords: number[];
     protected _verticesHighBuffer: WebGLBufferExt | null;
     protected _verticesLowBuffer: WebGLBufferExt | null;
     protected _ordersBuffer: WebGLBufferExt | null;
     protected _indexesBuffer: WebGLBufferExt | null;
     protected _colorsBuffer: WebGLBufferExt | null;
+    protected _texCoordBuffer: WebGLBufferExt | null;
     protected _pickingColor: NumberArray3;
     protected _renderNode: RenderNode | null;
     /**
@@ -133,7 +141,43 @@ declare class Polyline {
     protected _changedBuffers: boolean[];
     protected _visibleSphere: Float32Array;
     __doubleToTwoFloats: (pos: Vec3, highPos: Vec3, lowPos: Vec3) => void;
+    /**
+     * Stroke image src.
+     * @protected
+     * @type {string}
+     */
+    protected _src: string | null;
+    /**
+     * Stroke image object.
+     * @protected
+     * @type {Object}
+     */
+    protected _image: HTMLImageElement & {
+        __nodeIndex?: number;
+    } | null;
+    protected _texOffset: number;
+    protected _strokeSize: number;
     constructor(options?: IPolylineParams);
+    get texOffset(): number;
+    set texOffset(value: number);
+    get strokeSize(): number;
+    set strokeSize(value: number);
+    /**
+     * Sets image template url source.
+     * @public
+     * @param {string} src - Image url.
+     */
+    setSrc(src: string | null): void;
+    getSrc(): string | null;
+    /**
+     * Sets image template object.
+     * @public
+     * @param {Object} image - JavaScript image object.
+     */
+    setImage(image: HTMLImageElement): void;
+    getImage(): HTMLImageElementExt | null;
+    _setTexCoordArr(tcoordArr: number[]): void;
+    setTextureDisabled(): void;
     /**
      * Appends to the line array new cartesian coordinates line data.
      */
@@ -142,12 +186,25 @@ declare class Polyline {
      * Appends to the line new cartesian coordinates point data.
      */
     protected __appendPoint3v(path3v: SegmentPath3vExt[], point3v: Vec3, pathColors: SegmentPathColor[], color: NumberArray4, isClosed: boolean, outVerticesHigh: number[], outVerticesLow: number[], outColors: number[], outOrders: number[], outIndexes: number[], ellipsoid: Ellipsoid | null, outTransformedPathLonLat: SegmentPathLonLatExt[], outTransformedPathMerc: LonLat[][], outExtent: Extent): void;
+    /**
+
+     [1, -1, 2, -2] - orders for triangle strip line segment
+     t2        t3
+     (2)-------(-2)
+     |          |
+     |          |
+     |          |
+     |          |
+     (1)-------(-1)
+     t0        t1
+     */
+    static setPathTexCoords(path3v: SegmentPath3vExt[], tCoordArr: number[], outTexCoords: number[]): void;
     static setPathColors(pathLonLat: SegmentPathLonLatExt[], pathColors: SegmentPathColor[], defaultColor: NumberArray4, outColors: number[]): void;
     /**
      * Appends to the line array new geodetic coordinates line data.
      * @static
      */
-    protected __appendLineDataLonLat(pathLonLat: SegmentPathLonLatExt[], pathColors: SegmentPathColor[], defaultColor: NumberArray4, isClosed: boolean, outVerticesHigh: number[], outVerticesLow: number[], outOrders: number[], outIndexes: number[], ellipsoid: Ellipsoid, outTransformedPathCartesian: SegmentPath3vExt[], outPathLonLat: SegmentPathLonLatExt[], outTransformedPathMerc: LonLat[][], outExtent: Extent, outColors: number[]): void;
+    protected __appendLineDataLonLat(pathLonLat: SegmentPathLonLatExt[], pathColors: SegmentPathColor[], defaultColor: NumberArray4, isClosed: boolean, outVerticesHigh: number[], outVerticesLow: number[], outOrders: number[], outIndexes: number[], outTexCoords: number[], ellipsoid: Ellipsoid, outTransformedPathCartesian: SegmentPath3vExt[], outPathLonLat: SegmentPathLonLatExt[], outTransformedPathMerc: LonLat[][], outExtent: Extent, outColors: number[]): void;
     /**
      * Sets polyline path with cartesian coordinates.
      * @protected
@@ -232,13 +289,12 @@ declare class Polyline {
     /**
      * Gets polyline opacity.
      * @public
-     * @param {number} opacity - Opacity.
      */
     getOpacity(): number;
     /**
      * Sets Polyline thickness in screen pixels.
      * @public
-     * @param {number} thickness - Thickness.
+     * @param {number} altitude - ALtitude value.
      */
     setAltitude(altitude: number): void;
     /**
@@ -305,7 +361,7 @@ declare class Polyline {
     setPathColors(pathColors: SegmentPathColor[]): void;
     /**
      * Sets polyline color
-     * @param {string} htmlColor- HTML color
+     * @param {string} htmlColor - HTML color.
      */
     setColorHTML(htmlColor: string): void;
     setPathLonLatFast(pathLonLat: SegmentPathLonLatExt[], pathColors?: SegmentPathColor[]): void;
@@ -354,6 +410,7 @@ declare class Polyline {
      */
     protected _createIndexBuffer(): void;
     protected _createColorsBuffer(): void;
+    _createTexCoordBuffer(): void;
     setVisibleSphere(p: Vec3, r: number): void;
     updateRTCPosition(): void;
 }

package/lib/entity/PolylineHandler.d.ts

@@ -25,5 +25,8 @@ declare class PolylineHandler {
     getRTCPosition(pos: Vec3, rtcPositionHigh: Vec3, rtcPositionLow: Vec3): void;
     setRelativeCenter(c: Vec3): void;
     protected _updateRTCEyePosition(): void;
+    reloadTextures(): void;
+    get polylines(): Polyline[];
+    refreshTexCoordsArr(): void;
 }
 export { PolylineHandler };

package/lib/entity/Ray.d.ts

@@ -4,6 +4,7 @@ import type { NumberArray3 } from "../math/Vec3";
 import type { NumberArray4 } from "../math/Vec4";
 import { Entity } from "./Entity";
 import { RayHandler } from "./RayHandler";
+import type { HTMLImageElementExt } from "../utils/ImagesCacheManager";
 export interface IRayParams {
     thickness?: number;
     startPosition?: Vec3 | NumberArray3;
@@ -11,6 +12,10 @@ export interface IRayParams {
     startColor?: string | NumberArray4;
     endColor?: string | NumberArray4;
     visibility?: boolean;
+    src?: string;
+    image?: HTMLImageElement;
+    texOffset?: number;
+    strokeSize?: number;
 }
 /**
  * Ray class.
@@ -63,6 +68,22 @@ declare class Ray {
      * @type {number}
      */
     _handlerIndex: number;
+    /**
+     * Stroke image src.
+     * @protected
+     * @type {string}
+     */
+    protected _src: string | null;
+    /**
+     * Stroke image object.
+     * @protected
+     * @type {Object}
+     */
+    protected _image: HTMLImageElement & {
+        __nodeIndex?: number;
+    } | null;
+    protected _texOffset: number;
+    protected _strokeSize: number;
     constructor(options?: IRayParams);
     /**
      * Sets ray start position.
@@ -73,6 +94,20 @@ declare class Ray {
      */
     setStartPosition(x: number, y: number, z: number): void;
     getLength(): number;
+    /**
+     * Sets image template url source.
+     * @public
+     * @param {string} src - Image url.
+     */
+    setSrc(src: string | null): void;
+    getSrc(): string | null;
+    /**
+     * Sets image template object.
+     * @public
+     * @param {Object} image - JavaScript image object.
+     */
+    setImage(image: HTMLImageElement): void;
+    getImage(): HTMLImageElementExt | null;
     /**
      * Sets ray start position.
      * @public
@@ -96,6 +131,10 @@ declare class Ray {
     setThickness(thickness: number): void;
     setColors4v(startColor?: Vec4, endColor?: Vec4): void;
     setColorsHTML(startColor?: string, endColor?: string): void;
+    get texOffset(): number;
+    set texOffset(value: number);
+    get strokeSize(): number;
+    set strokeSize(value: number);
     /**
      * Returns ray start position.
      * @public

package/lib/entity/RayHandler.d.ts

@@ -14,7 +14,7 @@ declare class RayHandler {
      * @type {boolean}
      */
     pickingEnabled: boolean;
-    protected _entityCollection: EntityCollection;
+    _entityCollection: EntityCollection;
     protected _renderer: Renderer | null;
     protected _rays: Ray[];
     protected _vertexBuffer: WebGLBufferExt | null;
@@ -25,6 +25,9 @@ declare class RayHandler {
     protected _thicknessBuffer: WebGLBufferExt | null;
     protected _rgbaBuffer: WebGLBufferExt | null;
     protected _pickingColorBuffer: WebGLBufferExt | null;
+    protected _texCoordBuffer: WebGLBufferExt | null;
+    protected _texOffsetBuffer: WebGLBufferExt | null;
+    protected _strokeSizeBuffer: WebGLBufferExt | null;
     protected _vertexArr: TypedArray | number[];
     protected _startPositionHighArr: TypedArray | number[];
     protected _startPositionLowArr: TypedArray | number[];
@@ -33,10 +36,15 @@ declare class RayHandler {
     protected _thicknessArr: TypedArray | number[];
     protected _rgbaArr: TypedArray | number[];
     protected _pickingColorArr: TypedArray | number[];
+    protected _texCoordArr: TypedArray;
+    protected _texOffsetArr: TypedArray;
+    protected _strokeSizeArr: TypedArray;
     protected _buffersUpdateCallbacks: Function[];
     protected _changedBuffers: boolean[];
     constructor(entityCollection: EntityCollection);
     static concArr(dest: number[], curr: number[]): void;
+    reloadTextures(): void;
+    get rays(): Ray[];
     initProgram(): void;
     setRenderer(renderer: Renderer): void;
     refresh(): void;
@@ -65,6 +73,14 @@ declare class RayHandler {
     createRgbaBuffer(): void;
     createThicknessBuffer(): void;
     createVertexBuffer(): void;
+    createTexCoordBuffer(): void;
+    createTexOffsetBuffer(): void;
+    createStrokeSizeBuffer(): void;
     createPickingColorBuffer(): void;
+    setTexCoordArr(index: number, tcoordArr: number[] | TypedArray): void;
+    setTextureDisabled(index: number): void;
+    setTexOffsetArr(index: number, value: number): void;
+    setStrokeSizeArr(index: number, value: number): void;
+    refreshTexCoordsArr(): void;
 }
 export { RayHandler };