@openglobus/og 0.15.3 → 0.15.4

package/src/og/utils/VectorTileCreator.js

@@ -5,23 +5,23 @@
 'use strict';
 
 import { doubleToTwoFloats2 } from '../math/coder.js';
-import * as quadTree from '../quadTree/quadTree.js';
+import { RENDERING } from '../quadTree/quadTree.js';
 import { Framebuffer } from '../webgl/Framebuffer.js';
 import { Program } from '../webgl/Program.js';
 
 let tempArr = new Float32Array(2);
 
+const MAX_FRAME_TIME = 25.0;
+
 export class VectorTileCreator {
 
-    constructor(planet, maxFrames = 5, width = 256, height = 256) {
+    constructor(planet, width = 512, height = 512) {
 
         this._width = width;
         this._height = height;
         this._handler = planet.renderer.handler;
         this._planet = planet;
         this._framebuffer = null;
-        this.MAX_FRAMES = maxFrames;
-        this._currentFrame = 0;
         this._queue = [];
         this._initialize();
     }
@@ -193,44 +193,38 @@ export class VectorTileCreator {
 
     frame() {
         if (this._planet.layerLock.isFree() && this._queue.length) {
-            var h = this._handler,
+            let h = this._handler,
                 gl = h.gl;
 
             gl.disable(gl.CULL_FACE);
             gl.disable(gl.DEPTH_TEST);
 
-            // gl.enable(gl.BLEND);
-            // gl.blendEquationSeparate(gl.FUNC_ADD, gl.FUNC_ADD);
-            // gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
-
-            var hLine = h.programs.vectorTileLineRasterization,
+            let hLine = h.programs.vectorTileLineRasterization,
                 hPoly = h.programs.vectorTilePolygonRasterization;
 
-            var _w = this._width,
+            let _w = this._width,
                 _h = this._height,
                 width = _w,
                 height = _h,
                 _w2 = width << 1,
                 _h2 = height << 1;
 
-            var pickingMask = null,
-                texture = null;
-
             // var prevLayerId = -1;
 
-            var extentParamsHigh = new Float32Array(4);
-            var extentParamsLow = new Float32Array(4);
+            let extentParamsHigh = new Float32Array(4);
+            let extentParamsLow = new Float32Array(4);
 
-            var f = this._framebuffer.activate();
+            let f = this._framebuffer.activate();
 
-            var deltaTime = 0,
+            let deltaTime = 0,
                 startTime = window.performance.now();
 
-            while (this._planet.layerLock.isFree() && this._queue.length && deltaTime < 0.25) {
-                var material = this._queue.shift();
-                if (material.isLoading && material.segment.node.getState() === quadTree.RENDERING) {
+            while (this._queue.length && deltaTime < MAX_FRAME_TIME) {
+                let material = this._queue.shift();
+                if (material.isLoading && material.segment.node.getState() === RENDERING) {
+                    let pickingEnabled = material.layer._pickingEnabled;
 
-                    if (material.segment.tileZoom <= 3) {
+                    if (material.segment.tileZoom < 4) {
                         width = _w2;
                         height = _h2;
                     } else {
@@ -238,7 +232,10 @@ export class VectorTileCreator {
                         height = _h;
                     }
 
-                    texture = material._updateTexture || h.createEmptyTexture_l(width, height);
+                    let texture = material._updateTexture || h.createEmptyTexture_l(width, height);
+                    let pickingMask = pickingEnabled ? material._updatePickingMask || h.createEmptyTexture_n(width, height) : null;
+
+                    material.applyTexture(texture, pickingMask);
 
                     f.setSize(width, height);
 
@@ -247,7 +244,7 @@ export class VectorTileCreator {
                     gl.clearColor(0.0, 0.0, 0.0, 0.0);
                     gl.clear(gl.COLOR_BUFFER_BIT);
 
-                    var extent = material.segment.getExtentMerc();
+                    let extent = material.segment.getExtentMerc();
 
                     doubleToTwoFloats2(extent.southWest.lon, tempArr);
                     extentParamsHigh[0] = tempArr[0];
@@ -261,11 +258,11 @@ export class VectorTileCreator {
                     extentParamsHigh[3] = 2.0 / extent.getHeight();
 
                     hPoly.activate();
-                    var sh = hPoly._program;
-                    var sha = sh.attributes,
+                    let sh = hPoly._program;
+                    let sha = sh.attributes,
                         shu = sh.uniforms;
 
-                    var geomHandler = material.layer._geometryHandler;
+                    let geomHandler = material.layer._geometryHandler;
 
                     //=========================================
                     //Polygon rendering
@@ -287,26 +284,16 @@ export class VectorTileCreator {
                     gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
 
                     //Polygon picking PASS
-                    if (material.layer._pickingEnabled) {
-                        if (!material.pickingReady) {
-                            if (material._updatePickingMask) {
-                                pickingMask = material._updatePickingMask;
-                            } else {
-                                pickingMask = h.createEmptyTexture_n(width, height);
-                            }
-
-                            f.bindOutputTexture(pickingMask);
+                    if (pickingEnabled) {
+                        f.bindOutputTexture(pickingMask);
 
-                            gl.clearColor(0.0, 0.0, 0.0, 0.0);
-                            gl.clear(gl.COLOR_BUFFER_BIT);
+                        gl.clearColor(0.0, 0.0, 0.0, 0.0);
+                        gl.clear(gl.COLOR_BUFFER_BIT);
 
-                            gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyPickingColorsBuffer);
-                            gl.vertexAttribPointer(sha.colors, geomHandler._polyPickingColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
+                        gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._polyPickingColorsBuffer);
+                        gl.vertexAttribPointer(sha.colors, geomHandler._polyPickingColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
 
-                            gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
-                        } else {
-                            pickingMask = material.pickingMask;
-                        }
+                        gl.drawElements(gl.TRIANGLES, geomHandler._polyIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     }
 
                     //=========================================
@@ -379,22 +366,18 @@ export class VectorTileCreator {
                     gl.uniform1f(shu.alpha, 1.0);
                     gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
 
-                    if (material.layer._pickingEnabled && !material.pickingReady) {
+                    if (pickingEnabled) {
                         f.bindOutputTexture(pickingMask);
                         gl.uniform1f(shu.thicknessOutline, 8);
                         gl.bindBuffer(gl.ARRAY_BUFFER, geomHandler._linePickingColorsBuffer);
                         gl.vertexAttribPointer(sha.color, geomHandler._linePickingColorsBuffer.itemSize, gl.FLOAT, false, 0, 0);
                         gl.drawElements(gl.TRIANGLE_STRIP, geomHandler._lineIndexesBuffer.numItems, gl.UNSIGNED_INT, 0);
                     }
-
-                    material.applyTexture(texture, pickingMask);
-
                 } else {
                     material.isLoading = false;
                 }
 
                 deltaTime = window.performance.now() - startTime;
-                // prevLayerId = material.layer._id;
             }
 
             gl.enable(gl.DEPTH_TEST);

package/src/og/webgl/Framebuffer.js

@@ -214,6 +214,11 @@ export class Framebuffer {
         }
     }
 
+    checkStatus() {
+        let gl = this.handler.gl;
+        return gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+    }
+
     /**
      * Returns framebuffer completed.
      * @public

package/types/control/DebugInfo.d.ts

@@ -8,8 +8,12 @@ export function debugInfo(options: any): DebugInfo;
 export class DebugInfo extends Control {
     el: HTMLDivElement;
     _watch: any;
+    _toggleBtn: ToggleButton;
+    _dialog: Dialog;
     addWatches(watches: any): void;
     addWatch(watch: any): void;
     _frame(): void;
 }
 import { Control } from "./Control.js";
+import { ToggleButton } from "../ui/ToggleButton.js";
+import { Dialog } from "../ui/Dialog.js";

package/types/control/SimpleNavigation.d.ts

@@ -9,6 +9,7 @@ export function simpleNavigation(options: any): SimpleNavigation;
  * @param {Object} [options] - Control options.
  */
 export class SimpleNavigation extends Control {
+    constructor(options?: {});
     camera: any;
     speed: any;
     onCameraMoveForward(): void;

package/types/control/heightRuler/HeightRuler.d.ts

@@ -0,0 +1,6 @@
+export class HeightRuler extends Ruler {
+    constructor(options: any);
+    _rulerScene: HeightRulerScene;
+}
+import { Ruler } from "../ruler/Ruler.js";
+import { HeightRulerScene } from "./HeightRulerScene.js";

package/types/control/heightRuler/HeightRulerScene.d.ts

@@ -0,0 +1,23 @@
+export class HeightRulerScene extends RulerScene {
+    _geoRulerLayer: Vector;
+    get deltaLabel(): Entity;
+    get startLabel(): Entity;
+    get endLabel(): Entity;
+    get corners(): Entity[];
+    get startCorner(): Entity;
+    get endCorner(): Entity;
+    get startCornerLonLat(): import("../../LonLat.js").LonLat;
+    get startCornerHeight(): number;
+    get endCornerLonLat(): import("../../LonLat.js").LonLat;
+    get endCornerHeight(): number;
+    get maxHeightCornerLonLat(): import("../../LonLat.js").LonLat;
+    get minHeightCornerLonLat(): import("../../LonLat.js").LonLat;
+    get deltaHeight(): number;
+    _updateHeightRaysAndLabels(): Promise<void>;
+    _rayH: Entity;
+    _rayV: Entity;
+    _heightLabels: Entity[];
+}
+import { RulerScene } from "../ruler/RulerScene.js";
+import { Vector } from "../../layer/Vector.js";
+import { Entity } from "../../entity/Entity.js";

package/types/control/index.d.ts

@@ -17,7 +17,8 @@ import { ZoomControl } from "./ZoomControl.js";
 import { MouseWheelZoomControl } from "./MouseWheelZoomControl.js";
 import { Lighting } from "./Lighting.js";
 import { Ruler } from "./ruler/Ruler.js";
+import { HeightRuler } from "./heightRuler/HeightRuler.js";
 import { SimpleSkyBackground } from "./SimpleSkyBackground.js";
 import { Selection } from "./selection/Selection.js";
 import { LayerAnimation } from "./LayerAnimation.js";
-export { Control, CompassButton, DebugInfo, EarthNavigation, EarthCoordinates, GeoImageDragControl, KeyboardNavigation, LayerSwitcher, MouseNavigation, ToggleWireframe, TouchNavigation, SimpleNavigation, ShowFps, ScaleControl, Sun, ZoomControl, MouseWheelZoomControl, Lighting, Ruler, SimpleSkyBackground, Selection, LayerAnimation };
+export { Control, CompassButton, DebugInfo, EarthNavigation, EarthCoordinates, GeoImageDragControl, KeyboardNavigation, LayerSwitcher, MouseNavigation, ToggleWireframe, TouchNavigation, SimpleNavigation, ShowFps, ScaleControl, Sun, ZoomControl, MouseWheelZoomControl, Lighting, Ruler, HeightRuler, SimpleSkyBackground, Selection, LayerAnimation };

package/types/control/ruler/RulerScene.d.ts

@@ -1,3 +1,4 @@
+export function distanceFormat(v: any): string;
 export class RulerScene extends RenderNode {
     constructor(options?: {});
     _ignoreTerrain: any;
@@ -9,14 +10,16 @@ export class RulerScene extends RenderNode {
     _startPos: any;
     _startClick: Vec2;
     _heading: number;
-    _propsLabel: Entity;
-    _trackEntity: Entity;
-    _cornerEntity: Entity[];
     _trackLayer: Vector;
+    _labelLayer: Vector;
     _cornersLayer: Vector;
     set ignoreTerrain(arg: any);
     bindPlanet(planet: any): void;
+    _createCorners(): void;
+    _cornerEntity: Entity[];
     init(): void;
+    _propsLabel: Entity;
+    _trackEntity: Entity;
     _activate(): void;
     _onLclick_: any;
     _onMouseMove_: any;
@@ -39,10 +42,10 @@ export class RulerScene extends RenderNode {
     _drawLine(startLonLat: any, endLonLat: any, startPos: any): void;
     _onMouseMove(e: any): void;
     clear(): void;
-    frame(): void;
+    isCornersPositionChanged(): boolean;
     get ellipsoid(): any;
 }
 import { RenderNode } from "../../scene/RenderNode.js";
 import { Vec2 } from "../../math/Vec2.js";
-import { Entity } from "../../entity/Entity.js";
 import { Vector } from "../../layer/Vector.js";
+import { Entity } from "../../entity/Entity.js";

package/types/control/selection/SelectionScene.d.ts

@@ -26,7 +26,6 @@ export class SelectionScene extends RenderNode {
     _drawLine(startLonLat: any, endLonLat: any, startPos: any): void;
     _onMouseMove(e: any): void;
     clear(): void;
-    frame(): void;
     get ellipsoid(): any;
 }
 import { RenderNode } from "../../scene/RenderNode.js";

package/types/entity/EntityCollection.d.ts

@@ -194,6 +194,7 @@ export class EntityCollection {
      * @param {number} [farInvisible] - Entity visibility distance.
      */
     public setScaleByDistance(near: number, far: number, farInvisible?: number): void;
+    appendChildEntity(entity: any): void;
     _addRecursively(entity: any): void;
     /**
      * Adds entity to the collection and returns collection.

package/types/layer/BaseGeoImage.d.ts

@@ -12,7 +12,12 @@ export class BaseGeoImage extends Layer {
     _sourceTexture: any;
     _materialTexture: any;
     _gridBuffer: any;
-    _extentWgs84Params: number[];
+    _extentWgs84Params: any;
+    _extentWgs84ParamsHigh: Float32Array;
+    _extentWgs84ParamsLow: Float32Array;
+    _extentMercParams: any;
+    _extentMercParamsHigh: Float32Array;
+    _extentMercParamsLow: Float32Array;
     _refreshFrame: boolean;
     _frameCreated: boolean;
     _sourceCreated: boolean;
@@ -26,7 +31,7 @@ export class BaseGeoImage extends Layer {
     /**
      * rendering function pointer
      */
-    rendering: any;
+    rendering: (() => void) | (() => void);
     get isIdle(): boolean;
     addTo(planet: any): BaseGeoImage;
     _onLoadend_: any;
@@ -65,7 +70,8 @@ export class BaseGeoImage extends Layer {
      */
     protected _createFrame(): void;
     _cornersMerc: any[];
-    _extentMercParams: number[];
+    _gridBufferHigh: any;
+    _gridBufferLow: any;
     /**
      * @virtual
      * @param {Material} material - GeoImage material.
@@ -96,6 +102,14 @@ export class BaseGeoImage extends Layer {
      * @returns {Number} Frame height.
      */
     public get getFrameHeight(): number;
+    /**
+     * Method depends on GeoImage instance
+     * @virtual
+     * @private
+     */
+    private _createSourceTexture;
+    _renderingProjType1(): void;
+    _renderingProjType0(): void;
 }
 import { Layer } from "./Layer.js";
 import { Extent } from "../Extent.js";

package/types/layer/GeoImage.d.ts

@@ -29,12 +29,6 @@ export class GeoImage extends BaseGeoImage {
      * @param {Image} image - Image object.
      */
     public setImage(image: new (width?: number, height?: number) => HTMLImageElement): void;
-    /**
-     * Creates source gl texture.
-     * @virtual
-     * @protected
-     */
-    protected _createSourceTexture(): void;
     /**
      * @private
      * @param {Image} img
@@ -47,7 +41,5 @@ export class GeoImage extends BaseGeoImage {
      * @param {Material} material - GeoImage planet material.
      */
     public loadMaterial(material: Material): void;
-    _renderingProjType1(): void;
-    _renderingProjType0(): void;
 }
 import { BaseGeoImage } from "./BaseGeoImage.js";

package/types/layer/GeoTexture2d.d.ts

@@ -3,7 +3,5 @@ export class GeoTexture2d extends BaseGeoImage {
     bindTexture(texture: any): void;
     setSize(width: any, height: any): void;
     abortMaterialLoading(material: any): void;
-    _renderingProjType1(): void;
-    _renderingProjType0(): void;
 }
 import { BaseGeoImage } from "./BaseGeoImage.js";

package/types/layer/GeoVideo.d.ts

@@ -28,12 +28,6 @@ export class GeoVideo extends BaseGeoImage {
      * @param {Object} video - HTML5 video element object.
      */
     public setVideoElement(video: any): void;
-    /**
-     * Creates or refresh source video GL texture.
-     * @virtual
-     * @protected
-     */
-    protected _createSourceTexture(): void;
     /**
      * @private
      */
@@ -49,7 +43,5 @@ export class GeoVideo extends BaseGeoImage {
      * @param {Material} material - GeoImage planet material.
      */
     public loadMaterial(material: Material): void;
-    _renderingProjType1(): void;
-    _renderingProjType0(): void;
 }
 import { BaseGeoImage } from "./BaseGeoImage.js";

package/types/renderer/Renderer.d.ts

@@ -1,5 +1,5 @@
 export class Renderer {
-    constructor(handler: any, params: any);
+    constructor(handler: any, params?: {});
     /**
      * Div element with WebGL canvas. Assigned in Globe class.
      * @public
@@ -138,7 +138,9 @@ export class Renderer {
      * @param {Number} id - Handler id to remove.
      */
     removePickingCallback(id: number): void;
-    getPickingObjectByColor(r: any, g: any, b: any): any;
+    getPickingObject(r: any, g: any, b: any): any;
+    getPickingObjectArr(arr: any): any;
+    getPickingObject3v(vec: any): any;
     /**
      * Assign picking color to the object.
      * @public
@@ -240,7 +242,14 @@ export class Renderer {
      * @public
      * @param {Array<og.EntityCollection>} ec - Entity collection array.
      */
-    public _drawEntityCollections(): void;
+    public _drawOpaqueEntityCollections(): void;
+    /**
+     * Draws entity collections.
+     * @public
+     * @param {Array<og.EntityCollection>} ec - Entity collection array.
+     */
+    public _drawTransparentEntityCollections(): void;
+    _clearEntityCollectionQueue(): void;
     /**
      * Draw nodes.
      * @public

package/types/scene/Axes.d.ts

@@ -1,9 +1,9 @@
 export class Axes extends RenderNode {
+    constructor(size: any);
     size: any;
     axesBuffer: any;
     axesColorBuffer: any;
     init(): void;
-    frame(): void;
     createAxisBuffer(gridSize: any): void;
     axisBuffer: any;
     axisColorBuffer: any;

package/types/scene/BaseNode.d.ts

@@ -16,9 +16,9 @@ export class BaseNode {
     /**
      * Top scene tree node pointer.
      * @public
-     * @type {RenderNode}
+     * @type {BaseNode}
      */
-    public topNode: RenderNode;
+    public topNode: BaseNode;
     _dictionary: BaseNode[];
     /**
      * Children nodes.

package/types/scene/Planet.d.ts

@@ -398,11 +398,6 @@ export class Planet extends RenderNode {
      */
     protected _collectRenderNodes(): void;
     _globalPreDraw(): void;
-    /**
-     * Render node callback.
-     * @public
-     */
-    public frame(): void;
     _checkRendercompleted(): void;
     lockQuadTree(): void;
     unlockQuadTree(): void;

package/types/scene/RenderNode.d.ts

@@ -1,14 +1,15 @@
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
- * Forexample one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
+ * For example one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
  * Each render node has own model view space defined with matrices(scale, rotation, translation, transformation).
  * There are collections of ligh sources, entities and so on in the node.
  * Access to the node is renderer.renderNodes["Earth"]
  * @class
- * @extends {RenderNode}
+ * @extends {BaseNode}
  * @param {string} name - Node name.
  */
-export class RenderNode {
+export class RenderNode extends BaseNode {
+    constructor(name?: string);
     /**
      * Renderer that calls frame() callback.
      * @public
@@ -45,12 +46,6 @@ export class RenderNode {
     public entityCollections: Array<EntityCollection>;
     _pickingId: number;
     events: Events;
-    /**
-     * Adds node to the current hierarchy.
-     * @public
-     * @type {RenderNode}
-     */
-    public addNode(node: any): void;
     /**
      * Assign render node with renderer.
      * @public
@@ -93,6 +88,11 @@ export class RenderNode {
      * @param {LightSource} light - Light source object.
      */
     public removeLight(light: LightSource): void;
+    /**
+     * Calls render frame node's callback. Used in renderer.
+     * @public
+     */
+    public preDrawNode(frustum: any, frustumIndex: any): void;
     /**
      * Calls render frame node's callback. Used in renderer.
      * @public
@@ -123,6 +123,12 @@ export class RenderNode {
     public transformLights(): void;
     updateBillboardsTexCoords(): void;
     updateGeoObjectsTexCoords(): void;
+    frame(): void;
+    preFrame(): void;
+    /**
+     * @private
+     */
+    private _preDrawNodes;
     /**
      * @private
      */
@@ -140,4 +146,5 @@ export class RenderNode {
      */
     private _entityCollectionPickingCallback;
 }
+import { BaseNode } from "./BaseNode.js";
 import { Events } from "../Events.js";

package/types/scene/SkyBox.d.ts

@@ -1,10 +1,10 @@
 export class SkyBox extends RenderNode {
     static createDefault(RESOURCES_URL: any): SkyBox;
+    constructor(params: any);
     params: any;
     vertexPositionBuffer: any;
     texture: any;
     init(): void;
-    frame(): void;
     _createBuffers(): void;
 }
 import { RenderNode } from "./RenderNode.js";

package/types/utils/VectorTileCreator.d.ts

@@ -1,12 +1,10 @@
 export class VectorTileCreator {
-    constructor(planet: any, maxFrames?: number, width?: number, height?: number);
+    constructor(planet: any, width?: number, height?: number);
     _width: number;
     _height: number;
     _handler: any;
     _planet: any;
     _framebuffer: Framebuffer;
-    MAX_FRAMES: number;
-    _currentFrame: number;
     _queue: any[];
     _initialize(): void;
     frame(): void;

package/types/webgl/Framebuffer.d.ts

@@ -89,6 +89,7 @@ export class Framebuffer {
      * @param {number} height - Framebuffer height.
      */
     public setSize(width: number, height: number, forceDestroy: any): void;
+    checkStatus(): any;
     /**
      * Returns framebuffer completed.
      * @public