@openglobus/og 0.26.6 → 0.27.1

package/lib/Globe.d.ts

@@ -11,6 +11,7 @@ import type { HTMLDivElementExt } from "./renderer/Renderer";
 import { RenderNode } from "./scene/RenderNode";
 import { Extent } from "./Extent";
 import type { IAtmosphereParams } from "./control/atmosphere/Atmosphere";
+import { QuadTreeStrategy } from "./quadTree";
 export interface IGlobeParams {
     attributionContainer?: HTMLElement;
     target?: string | HTMLElement;
@@ -28,7 +29,7 @@ export interface IGlobeParams {
     maxEqualZoomAltitude?: number;
     minEqualZoomAltitude?: number;
     minEqualZoomCameraSlope?: number;
-    quadTreeStrategyPrototype?: any;
+    quadTreeStrategyPrototype?: typeof QuadTreeStrategy;
     maxLoadingRequests?: number;
     atmosphereEnabled?: boolean;
     transitionOpacityEnabled?: boolean;

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/control/cameraDepthHandler/CameraDepthHandler.d.ts

@@ -6,13 +6,16 @@ import { Control, IControlParams } from "../Control";
 import { Vec3 } from "../../math/Vec3";
 import { LonLat } from "../../LonLat";
 import { GeoImage } from "../../layer/GeoImage";
-export interface ICameraDepthhandlerParams extends IControlParams {
+import { QuadTreeStrategy } from "../../quadTree";
+export interface ICameraDepthHandlerParams extends IControlParams {
 }
 export declare class CameraDepthHandler extends Control {
-    protected _depthHandler: CameraFrameHandler | null;
+    protected _frameHandler: CameraFrameHandler | null;
     protected _frameComposer: CameraFrameComposer;
     readonly cameraGeoImage: GeoImage;
-    constructor(params: ICameraDepthhandlerParams);
+    protected _quadTreeStrategy: QuadTreeStrategy | null;
+    protected _skipPreRender: boolean;
+    constructor(params: ICameraDepthHandlerParams);
     protected _createCamera(): Camera;
     get camera(): Camera | undefined;
     oninit(): void;

package/lib/entity/Entity.d.ts

@@ -109,6 +109,7 @@ export interface IEntityParams {
  */
 declare class Entity {
     static __counter__: number;
+    protected _name: string;
     /**
      * Uniq identifier.
      * @public
@@ -266,6 +267,8 @@ declare class Entity {
     _absoluteQRot: Quat;
     protected _useDirectQuaternion: boolean;
     constructor(options?: IEntityParams);
+    get name(): string;
+    set name(name: string);
     get isEmpty(): boolean;
     /**
      * Returns root entity object.
@@ -322,10 +325,9 @@ declare class Entity {
      * Adds current entity into the specified entity collection.
      * @public
      * @param {EntityCollection | Vector} collection - Specified entity collection or vector layer.
-     * @param {boolean} [rightNow=false] - Entity insertion option for vector layer.
      * @returns {Entity} - This object.
      */
-    addTo(collection: EntityCollection | Vector, rightNow?: boolean): Entity;
+    addTo(collection: EntityCollection | Vector): Entity;
     /**
      * Removes current entity from its collection or layer.
      * @public
@@ -619,6 +621,13 @@ declare class Entity {
      */
     get layer(): Vector | null;
     get rendererEvents(): VectorEventsType | EntityCollectionEvents | null;
+    /**
+     * Append child entity.
+     * @public
+     * @param {Entity[]} entities - Child entities.
+     * @param {boolean} [forceRelativePosition] - Force relative position property.
+     */
+    appendChildren(entities: Entity[], forceRelativePosition?: boolean): void;
     /**
      * Append child entity.
      * @public

package/lib/layer/Layer.d.ts

@@ -376,7 +376,7 @@ declare class Layer {
     protected _correctFullExtent(): void;
     get opacity(): number;
     get screenOpacity(): number;
-    _refreshFadingOpacity(): boolean;
+    _refreshFadingOpacity(minCurrZoom: number, maxCurrZoom: number): boolean;
     createMaterial(segment: Segment): Material;
     redraw(): void;
     abortMaterialLoading(material: Material): void;

package/lib/layer/Vector.d.ts

@@ -128,7 +128,6 @@ declare class Vector extends Layer {
      * Adds layer to the planet.
      * @public
      * @param {Planet} planet - Planet scene object.
-     * @returns {Vector} -
      */
     addTo(planet: Planet): void;
     remove(): this;
@@ -142,28 +141,25 @@ declare class Vector extends Layer {
      * Adds entity to the layer.
      * @public
      * @param {Entity} entity - Entity.
-     * @param {boolean} [rightNow=false] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    add(entity: Entity, rightNow?: boolean): this;
+    add(entity: Entity): this;
     /**
      * Adds entity to the layer in the index position.
      * @public
      * @param {Entity} entity - Entity.
      * @param {Number} index - Index position.
-     * @param {boolean} [rightNow] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    insert(entity: Entity, index: number, rightNow?: boolean): this;
-    protected _proceedEntity(entity: Entity, rightNow?: boolean): void;
+    insert(entity: Entity, index: number): this;
+    protected _proceedEntity(entity: Entity): void;
     /**
      * Adds entity array to the layer.
      * @public
      * @param {Array.<Entity>} entities - Entities array.
-     * @param {boolean} [rightNow=false] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    addEntities(entities: Entity[], rightNow?: boolean): this;
+    addEntities(entities: Entity[]): Vector;
     /**
      * Remove entity from layer.
      * TODO: memory leaks.
@@ -233,7 +229,7 @@ declare class Vector extends Layer {
      * @param {Material} material - Segment material.
      */
     abortMaterialLoading(material: Material): void;
-    applyMaterial(material: Material, isForced?: boolean): NumberArray4;
+    applyMaterial(material: Material): NumberArray4;
     clearMaterial(material: Material): void;
     update(): void;
 }

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