@openglobus/og 0.22.2 → 0.24.0

package/lib/js/math/Vec3.d.ts

@@ -241,6 +241,13 @@ export declare class Vec3 {
      * @returns {Vec3} Returns a sum vector.
      */
     add(p: Vec3): Vec3;
+    /**
+     * Gets two vectors summarization.
+     * @public
+     * @param {Vec3} p - Vector to add.
+     * @returns {Vec3} Returns a sum vector.
+     */
+    addRes(p: Vec3, res: Vec3): Vec3;
     /**
      * Subtract vector from the current.
      * @public
@@ -283,6 +290,13 @@ export declare class Vec3 {
      * @returns {Vec3} -
      */
     mul(vec: Vec3): Vec3;
+    /**
+     * Multiply current vector object to another and returns new vector instance.
+     * @public
+     * @param {Vec3} vec - Multiply vector.
+     * @returns {Vec3} -
+     */
+    mulRes(vec: Vec3, res: Vec3): Vec3;
     /**
      * Divide current vector's components to another. Results stores in the current vector object.
      * @public
@@ -452,6 +466,7 @@ export declare class Vec3 {
      * @returns {Vec3} -
      */
     slerp(v2: Vec3, t: number): Vec3;
+    mulVecA(a: Vec3): Vec3;
     /**
      * Gets the shortest arc quaternion to rotate this vector to the destination vector.
      * @param {Vec3} dest -

package/lib/js/math/Vec3.js

@@ -155,7 +155,12 @@ export class Vec3 {
      * @returns {number} -
      */
     static angle(a, b) {
-        return Math.acos(a.dot(b) / Math.sqrt(a.length2() * b.length2()));
+        // the same
+        // let d = a.dot(b) / Math.sqrt(a.length2() * b.length2());
+        // return Math.acos(Math.max(-1, Math.min(1, d)));
+        let dotProduct = a.dot(b);
+        let crossProduct = a.cross(b).length();
+        return Math.atan2(crossProduct, dotProduct);
     }
     /**
      * Returns two vectors linear interpolation.
@@ -389,6 +394,15 @@ export class Vec3 {
     add(p) {
         return new Vec3(this.x + p.x, this.y + p.y, this.z + p.z);
     }
+    /**
+     * Gets two vectors summarization.
+     * @public
+     * @param {Vec3} p - Vector to add.
+     * @returns {Vec3} Returns a sum vector.
+     */
+    addRes(p, res) {
+        return res.set(this.x + p.x, this.y + p.y, this.z + p.z);
+    }
     /**
      * Subtract vector from the current.
      * @public
@@ -452,6 +466,15 @@ export class Vec3 {
     mul(vec) {
         return new Vec3(this.x * vec.x, this.y * vec.y, this.z * vec.z);
     }
+    /**
+     * Multiply current vector object to another and returns new vector instance.
+     * @public
+     * @param {Vec3} vec - Multiply vector.
+     * @returns {Vec3} -
+     */
+    mulRes(vec, res) {
+        return res.set(this.x * vec.x, this.y * vec.y, this.z * vec.z);
+    }
     /**
      * Divide current vector's components to another. Results stores in the current vector object.
      * @public
@@ -741,6 +764,12 @@ export class Vec3 {
         }
         return Vec3.add(this.scaleTo(scale0), v2.scale(scale1));
     }
+    mulVecA(a) {
+        this.x *= a.x;
+        this.y *= a.y;
+        this.z *= a.z;
+        return this;
+    }
     /**
      * Gets the shortest arc quaternion to rotate this vector to the destination vector.
      * @param {Vec3} dest -

package/lib/js/math.d.ts

@@ -70,7 +70,7 @@ export declare function log(n: number, base: number): number;
 /**
  * Clamp the number.
  * @function
- * @param {number} number - Input number.
+ * @param {number} value - Input number.
  * @param {number} min - Minimal edge.
  * @param {number} max - Maximal edge.
  * @returns {number} -
@@ -78,7 +78,7 @@ export declare function log(n: number, base: number): number;
  * clamp(12, 1, 5)
  * //returns 5
  */
-export declare function clamp(number: number, min: number, max: number): number;
+export declare function clamp(value: number, min: number, max: number): number;
 /**
  * Converts degrees value to radians.
  * @function

package/lib/js/math.js

@@ -71,7 +71,7 @@ export function log(n, base) {
 /**
  * Clamp the number.
  * @function
- * @param {number} number - Input number.
+ * @param {number} value - Input number.
  * @param {number} min - Minimal edge.
  * @param {number} max - Maximal edge.
  * @returns {number} -
@@ -79,8 +79,8 @@ export function log(n, base) {
  * clamp(12, 1, 5)
  * //returns 5
  */
-export function clamp(number, min, max) {
-    return Math.max(min, Math.min(number, max));
+export function clamp(value, min, max) {
+    return Math.max(min, Math.min(value, max));
 }
 /**
  * Converts degrees value to radians.

package/lib/js/quadTree/EntityCollectionNode.d.ts

@@ -16,7 +16,7 @@ declare class EntityCollectionNode {
     layer: Vector;
     strategy: EntityCollectionsTreeStrategy;
     parentNode: EntityCollectionNode | null;
-    childrenNodes: EntityCollectionNode[];
+    childNodes: EntityCollectionNode[];
     partId: number;
     nodeId: number;
     state: number | null;
@@ -34,7 +34,7 @@ declare class EntityCollectionNode {
     __setLonLat__(entity: Entity): LonLat;
     buildTree(entities: Entity[], rightNow?: boolean): void;
     isInside(entity: Entity): boolean;
-    createChildrenNodes(): void;
+    createChildNodes(): void;
     collectRenderCollectionsPASS1(visibleNodes: NodesDict, outArr: EntityCollection[]): void;
     collectRenderCollectionsPASS2(visibleNodes: NodesDict, outArr: EntityCollection[], renderingNodeId: number): void;
     applyCollection(): void;

package/lib/js/quadTree/EntityCollectionNode.js

@@ -13,7 +13,7 @@ class EntityCollectionNode {
         this.strategy = strategy;
         this.layer = strategy._layer;
         this.parentNode = parent;
-        this.childrenNodes = [];
+        this.childNodes = [];
         this.partId = partId;
         //this.nodeId = partId + id;
         this.nodeId = partId + (parent ? parent.nodeId * 4 + 1 : 0);
@@ -78,9 +78,9 @@ class EntityCollectionNode {
     buildTree(entities, rightNow = false) {
         this.count += entities.length;
         if (entities.length > this.layer._nodeCapacity) {
-            const cn = this.childrenNodes;
+            const cn = this.childNodes;
             if (!cn.length) {
-                this.createChildrenNodes();
+                this.createChildNodes();
             }
             let en_nw = [], en_ne = [], en_sw = [], en_se = [];
             let i = entities.length;
@@ -120,7 +120,7 @@ class EntityCollectionNode {
             return false;
         }
     }
-    createChildrenNodes() {
+    createChildNodes() {
         const s = this.strategy;
         const ext = this.extent;
         const size_x = ext.getWidth() * 0.5;
@@ -128,7 +128,7 @@ class EntityCollectionNode {
         const ne = ext.northEast;
         const sw = ext.southWest;
         const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        const nd = this.childrenNodes;
+        const nd = this.childNodes;
         const p = this.layer._planet;
         const z = this.zoom + 1;
         nd[NW] = new EntityCollectionNode(s, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);
@@ -139,7 +139,7 @@ class EntityCollectionNode {
     collectRenderCollectionsPASS1(visibleNodes, outArr) {
         const n = visibleNodes[this.nodeId];
         if (n) {
-            const cn = this.childrenNodes;
+            const cn = this.childNodes;
             if (this.entityCollection) {
                 this.renderCollection(outArr, visibleNodes);
             }
@@ -162,7 +162,7 @@ class EntityCollectionNode {
         const altVis = (cam.eye.distance(this.bsphere.center) - this.bsphere.radius <
             VISIBLE_DISTANCE * Math.sqrt(cam._lonLat.height)) || cam._lonLat.height > 10000;
         if (this.count > 0 && altVis && cam.containsSphere(this.bsphere)) {
-            const cn = this.childrenNodes;
+            const cn = this.childNodes;
             if (this.entityCollection) {
                 this.renderCollection(outArr, visibleNodes, renderingNodeId);
             }
@@ -181,7 +181,7 @@ class EntityCollectionNode {
         this._inTheQueue = false;
     }
     traverseTree(callback) {
-        const cn = this.childrenNodes;
+        const cn = this.childNodes;
         if (this.entityCollection) {
             callback(this);
         }

package/lib/js/quadTree/Node.d.ts

@@ -33,7 +33,7 @@ declare class Node {
     inFrustum: number;
     _fadingNodes: Node[];
     constructor(SegmentPrototype: typeof Segment, planet: Planet, partId: number, parent: Node | null, tileZoom: number, extent: Extent);
-    createChildrenNodes(): void;
+    createChildNodes(): void;
     createBounds(): void;
     getState(): number | null;
     /**

package/lib/js/quadTree/Node.js

@@ -53,7 +53,7 @@ class Node {
         this._fadingNodes = [];
         this.createBounds();
     }
-    createChildrenNodes() {
+    createChildNodes() {
         this.ready = true;
         const p = this.planet;
         const ps = this.segment;
@@ -137,7 +137,7 @@ class Node {
     // }
     traverseNodes(cam, maxZoom, terrainReadySegment, stopLoading, zoomPassNode) {
         if (!this.ready) {
-            this.createChildrenNodes();
+            this.createChildNodes();
         }
         let n = this.nodes;
         n[0].renderTree(cam, maxZoom, terrainReadySegment, stopLoading, zoomPassNode);

package/lib/js/quadTree/QuadTreeStrategy.js

@@ -40,7 +40,7 @@ export class QuadTreeStrategy {
     preRender() {
         for (let i = 0; i < this._quadTreeList.length; i++) {
             let quadTree = this._quadTreeList[i];
-            quadTree.createChildrenNodes();
+            quadTree.createChildNodes();
             quadTree.segment.createPlainSegment();
             for (let j = 0; j < quadTree.nodes.length; j++) {
                 quadTree.nodes[j].segment.createPlainSegment();

package/lib/js/quadTree/earth/EarthEntityCollectionNodeLonLat.d.ts

@@ -9,7 +9,7 @@ export declare class EarthEntityCollectionNodeLonLat extends EntityCollectionNod
     isNorth: boolean;
     strategy: EarthEntityCollectionsTreeStrategy;
     constructor(strategy: EarthEntityCollectionsTreeStrategy, partId: number, parent: EarthEntityCollectionNodeLonLat | null, extent: Extent, planet: Planet, zoom: number);
-    createChildrenNodes(): void;
+    createChildNodes(): void;
     protected _setExtentBounds(): void;
     __setLonLat__(entity: Entity): LonLat;
     isVisible(): boolean;

package/lib/js/quadTree/earth/EarthEntityCollectionNodeLonLat.js

@@ -8,7 +8,7 @@ export class EarthEntityCollectionNodeLonLat extends EntityCollectionNode {
         this.strategy = strategy;
         this.isNorth = false;
     }
-    createChildrenNodes() {
+    createChildNodes() {
         const s = this.strategy;
         const ext = this.extent;
         const size_x = ext.getWidth() * 0.5;
@@ -16,7 +16,7 @@ export class EarthEntityCollectionNodeLonLat extends EntityCollectionNode {
         const ne = ext.northEast;
         const sw = ext.southWest;
         const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        const nd = this.childrenNodes;
+        const nd = this.childNodes;
         const p = this.layer._planet;
         const z = this.zoom + 1;
         nd[NW] = new EarthEntityCollectionNodeLonLat(s, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);

package/lib/js/quadTree/equi/EquiEntityCollectionNodeLonLat.d.ts

@@ -8,7 +8,7 @@ import { EquiEntityCollectionsTreeStrategy } from "./EquiEntityCollectionsTreeSt
 export declare class EquiEntityCollectionNodeLonLat extends EntityCollectionNode {
     strategy: EquiEntityCollectionsTreeStrategy;
     constructor(strategy: EquiEntityCollectionsTreeStrategy, partId: number, parent: EquiEntityCollectionNodeLonLat | null, extent: Extent, planet: Planet, zoom: number);
-    createChildrenNodes(): void;
+    createChildNodes(): void;
     protected _setExtentBounds(): void;
     __setLonLat__(entity: Entity): LonLat;
     isVisible(): boolean;

package/lib/js/quadTree/equi/EquiEntityCollectionNodeLonLat.js

@@ -7,7 +7,7 @@ export class EquiEntityCollectionNodeLonLat extends EntityCollectionNode {
         super(strategy, partId, parent, extent, planet, zoom);
         this.strategy = strategy;
     }
-    createChildrenNodes() {
+    createChildNodes() {
         const s = this.strategy;
         const ext = this.extent;
         const size_x = ext.getWidth() * 0.5;
@@ -15,7 +15,7 @@ export class EquiEntityCollectionNodeLonLat extends EntityCollectionNode {
         const ne = ext.northEast;
         const sw = ext.southWest;
         const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        const nd = this.childrenNodes;
+        const nd = this.childNodes;
         const p = this.layer._planet;
         const z = this.zoom + 1;
         nd[NW] = new EquiEntityCollectionNodeLonLat(s, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);

package/lib/js/renderer/Renderer.d.ts

@@ -1,6 +1,6 @@
 import { Camera } from "../camera/Camera";
 import { Control } from "../control/Control";
-import { RendererEventsHandler } from "./RendererEvents";
+import { IBaseInputState, RendererEventsHandler } from "./RendererEvents";
 import { EntityCollection } from "../entity/EntityCollection";
 import { Framebuffer, Multisample } from "../webgl/index";
 import { FontAtlas } from "../utils/FontAtlas";
@@ -18,6 +18,7 @@ interface IRendererParams {
     fontsSrc?: string;
     gamma?: number;
     exposure?: number;
+    dpi?: number;
 }
 interface IPickingObject {
     _pickingColor?: Vec3;
@@ -28,6 +29,39 @@ interface IFrameCallbackHandler {
     callback: Function;
     sender: any;
 }
+/**
+ * Represents high level WebGL context interface that starts WebGL handler working in real time.
+ * @class
+ * @param {Handler} handler - WebGL handler context.
+ * @param {Object} [params] - Renderer parameters:
+ * @fires EventsHandler<RendererEventsType>#draw
+ * @fires EventsHandler<RendererEventsType>#resize
+ * @fires EventsHandler<RendererEventsType>#mousemove
+ * @fires EventsHandler<RendererEventsType>#mousestop
+ * @fires EventsHandler<RendererEventsType>#lclick
+ * @fires EventsHandler<RendererEventsType>#rclick
+ * @fires EventsHandler<RendererEventsType>#mclick
+ * @fires EventsHandler<RendererEventsType>#ldblclick
+ * @fires EventsHandler<RendererEventsType>#rdblclick
+ * @fires EventsHandler<RendererEventsType>#mdblclick
+ * @fires EventsHandler<RendererEventsType>#lup
+ * @fires EventsHandler<RendererEventsType>#rup
+ * @fires EventsHandler<RendererEventsType>#mup
+ * @fires EventsHandler<RendererEventsType>#ldown
+ * @fires EventsHandler<RendererEventsType>#rdown
+ * @fires EventsHandler<RendererEventsType>#mdown
+ * @fires EventsHandler<RendererEventsType>#lhold
+ * @fires EventsHandler<RendererEventsType>#rhold
+ * @fires EventsHandler<RendererEventsType>#mhold
+ * @fires EventsHandler<RendererEventsType>#mousewheel
+ * @fires EventsHandler<RendererEventsType>#touchstart
+ * @fires EventsHandler<RendererEventsType>#touchend
+ * @fires EventsHandler<RendererEventsType>#touchcancel
+ * @fires EventsHandler<RendererEventsType>#touchmove
+ * @fires EventsHandler<RendererEventsType>#doubletouch
+ * @fires EventsHandler<RendererEventsType>#touchleave
+ * @fires EventsHandler<RendererEventsType>#touchenter
+ */
 export interface HTMLDivElementExt extends HTMLDivElement {
     attributions?: HTMLElement;
 }
@@ -65,7 +99,7 @@ declare class Renderer {
      * @public
      * @type {Camera}
      */
-    activeCamera: Camera | null;
+    activeCamera: Camera;
     /**
      * Renderer events. Represents interface for setting events like mousemove, draw, keypress etc.
      * @public
@@ -101,17 +135,6 @@ declare class Renderer {
      * @type {Framebuffer}
      */
     pickingFramebuffer: Framebuffer | null;
-    protected _tempPickingPix_: Uint8Array;
-    /**
-     * @public
-     * @type {Framebuffer}
-     */
-    distanceFramebuffer: Framebuffer | null;
-    /**
-     * @type {Function[]}
-     */
-    protected _distanceCallbacks: IFrameCallbackHandler[];
-    protected _tempDistancePix_: Uint8Array;
     /**
      * Depth objects rendering queue.
      * @type {Function[]}
@@ -144,24 +167,19 @@ declare class Renderer {
      * @type {FontAtlas}
      */
     fontAtlas: FontAtlas;
-    protected _entityCollections: EntityCollection[];
+    protected _entityCollections: EntityCollection[][];
     protected _currentOutput: string;
     protected _fnScreenFrame: Function | null;
     labelWorker: LabelWorker;
-    __useDistanceFramebuffer__: boolean;
     screenDepthFramebuffer: Framebuffer | null;
     screenFramePositionBuffer: WebGLBufferExt | null;
     screenTexture: Record<string, WebGLTexture>;
     outputTexture: WebGLTexture | null;
-    protected _skipDistanceFrame: boolean;
-    protected _distancePixelBuffer: WebGLBuffer | null;
-    protected _skipPickingFrame: boolean;
-    protected _pickingPixelBuffer: WebGLBuffer | null;
-    protected _readDistanceBuffer: () => void;
     protected _readPickingBuffer: () => void;
-    constructor(handler: Handler, params?: IRendererParams);
+    constructor(handler: Handler | string | HTMLCanvasElement, params?: IRendererParams);
     enableBlendOneSrcAlpha(): void;
     enableBlendDefault(): void;
+    setRelativeCenter(c?: Vec3): void;
     /**
      * Sets renderer events activity.
      * @param {Boolean} activity - Events activity.
@@ -169,8 +187,6 @@ declare class Renderer {
     setEventsActivity(activity: boolean): void;
     addDepthCallback(sender: any, callback: Function): number;
     removeDepthCallback(id: number): void;
-    addDistanceCallback(sender: any, callback: Function): number;
-    removeDistanceCallback(id: number): void;
     /**
      * Adds picking rendering callback function.
      * @param {object} sender - Callback context.
@@ -243,7 +259,6 @@ declare class Renderer {
      * @public
      */
     initialize(): void;
-    _initReadPixelsBuffers(): void;
     _initializeControls(): void;
     resize(): void;
     setCurrentScreen(screenName: string): void;
@@ -275,18 +290,14 @@ declare class Renderer {
     /**
      * TODO: replace with cache friendly linked list by BillboardHandler, LabelHandler etc.
      */
-    enqueueEntityCollectionsToDraw(ecArr: EntityCollection[]): void;
-    /**
-     * Draws opaque items entity collections.
-     * @protected
-     */
-    protected _drawOpaqueEntityCollections(): void;
+    enqueueEntityCollectionsToDraw(ecArr: EntityCollection[], depthOrder?: number): void;
     /**
-     * Draws transparent items entity collections.
      * @protected
      */
-    protected _drawTransparentEntityCollections(): void;
-    protected _clearEntityCollectionQueue(): void;
+    protected _drawEntityCollections(depthOrder: number): void;
+    protected _drawPickingEntityCollections(depthOrder: number): void;
+    protected _drawDepthEntityCollections(depthOrder: number): void;
+    protected _clearEntityCollectionQueue(depthOrder: number): void;
     /**
      * Draw nodes.
      * @public
@@ -299,19 +310,27 @@ declare class Renderer {
      * Draw picking objects framebuffer.
      * @private
      */
-    protected _drawPickingBuffer(): void;
+    protected _drawPickingBuffer(depthOrder: number): void;
+    protected _drawDepthBuffer(depthOrder: number): void;
+    protected _readDepthBuffer(): void;
+    protected _readPickingBuffer_webgl1(): void;
+    protected _readPickingBuffer_webgl2(): void;
+    readPickingColor(x: number, y: number, outColor: NumberArray3 | Uint8Array): void;
+    readDepth(x: number, y: number, outDepth: NumberArray3 | Float32Array): void;
     /**
-     * Draw picking objects framebuffer.
-     * @protected
+     * Returns the distance from the active (screen) camera to the 3d-surface using the defined screen coordinates
+     * @public
+     * @param {Vec2 | IBaseInputState} px - Screen coordinates.
+     * @returns {number | undefined} -
      */
-    protected _drawDistanceBuffer(): void;
-    protected _drawDepthBuffer(): void;
-    protected _readPickingBuffer_webgl1: () => void;
-    protected _readPickingBuffer_webgl2: () => void;
-    protected _readDistanceBuffer_webgl1: () => void;
-    protected _readDistanceBuffer_webgl2: () => void;
-    readPickingColor(x: number, y: number, outColor: NumberArray3 | Uint8Array): void;
-    readDistanceColor(x: number, y: number, outColor: NumberArray3 | Uint8Array): void;
+    getDistanceFromPixel(px: Vec2 | IBaseInputState, camera?: Camera | null): number | undefined;
+    /**
+     * Returns 3d coordinates from screen coordinates
+     * @public
+     * @param {Vec2 | IBaseInputState} px - Screen coordinates.
+     * @returns {Vec3 | undefined} -
+     */
+    getCartesianFromPixel(px: Vec2 | IBaseInputState): Vec3 | undefined;
     /**
      * Function starts renderer
      * @public