@openglobus/og 0.16.3 → 0.17.1

package/src/og/proj/EPSG3857.js

@@ -1,13 +1,13 @@
-/**
- * @module og/proj/EPSG3857
- */
-
-"use strict";
-
-import { Proj, Units } from "./Proj.js";
-
-/**
- * EPSG:3857 projection object.
- * @type {Proj}
- */
-export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });
+/**
+ * @module og/proj/EPSG3857
+ */
+
+"use strict";
+
+import { Proj, Units } from "./Proj.js";
+
+/**
+ * EPSG:3857 projection object.
+ * @type {Proj}
+ */
+export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });

package/src/og/proj/Proj.js

@@ -1,63 +1,59 @@
-/**
- * @module og/proj/Proj
- */
-
-"use strict";
-
-/**
- * Projection units: 'degrees', 'ft', 'm' or 'km'.
- * @enum {string}
- * @api
- */
-export const Units = {
-    DEGREES: "degrees",
-    FEET: "ft",
-    METERS: "m",
-    KILOMETERS: "km"
-};
-
-/**
- * Meters per unit lookup table.
- * @const
- * @type {Object.<og.proj.Units, number>}
- */
-export const METERS_PER_UNIT = {};
-METERS_PER_UNIT[Units.FEET] = 0.3048;
-METERS_PER_UNIT[Units.METERS] = 1;
-METERS_PER_UNIT[Units.KILOMETERS] = 1000;
-
-let _counter = 0;
-class Proj {
-    constructor(options) {
-        /**
-         * @public
-         * @type {string}
-         */
-        this.code = options.code;
-
-        /**
-         * @public
-         * @type {proj.Units}
-         */
-        this.units = /** @type {Units} */ (options.units);
-
-        /**
-         * Projection identifier, especially usefull for comparison.
-         * @const
-         * @type {integer}
-         */
-        this.id = _counter++;
-    }
-
-    /**
-     * Compare projections.
-     * @public
-     * @param {Proj} proj - Projetion object.
-     * @returns {boolean}
-     */
-    equal(proj) {
-        return proj.id === this.id;
-    }
-}
-
-export { Proj };
+"use strict";
+
+/**
+ * Projection units: 'degrees', 'ft', 'm' or 'km'.
+ * @enum {string}
+ * @api
+ */
+export const Units = {
+    DEGREES: "degrees",
+    FEET: "ft",
+    METERS: "m",
+    KILOMETERS: "km"
+};
+
+/**
+ * Meters per unit lookup table.
+ * @const
+ * @type {Object.<og.proj.Units, number>}
+ */
+export const METERS_PER_UNIT = {};
+METERS_PER_UNIT[Units.FEET] = 0.3048;
+METERS_PER_UNIT[Units.METERS] = 1;
+METERS_PER_UNIT[Units.KILOMETERS] = 1000;
+
+let _counter = 0;
+class Proj {
+    constructor(options) {
+        /**
+         * @public
+         * @type {string}
+         */
+        this.code = options.code;
+
+        /**
+         * @public
+         * @type {proj.Units}
+         */
+        this.units = /** @type {Units} */ (options.units);
+
+        /**
+         * Projection identifier, especially usefull for comparison.
+         * @const
+         * @type {integer}
+         */
+        this.id = _counter++;
+    }
+
+    /**
+     * Compare projections.
+     * @public
+     * @param {Proj} proj - Projetion object.
+     * @returns {boolean}
+     */
+    equal(proj) {
+        return proj.id === this.id;
+    }
+}
+
+export { Proj };

package/src/og/quadTree/EPSG4326QuadTreeStrategy.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { Extent } from "../Extent.js";
 import { EPSG4326 } from "../proj/EPSG4326.js";
 import { Node } from "../quadTree/Node.js";

package/src/og/quadTree/EarthQuadTreeStrategy.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { Extent } from "../Extent.js";
 import * as mercator from "../mercator.js";
 import { Node } from "../quadTree/Node.js";

package/src/og/quadTree/EntityCollectionNode.js

@@ -1,7 +1,3 @@
-/**
- * @module og/quadTree/EntityCollectionNode
- */
-
 'use strict';
 
 import { Sphere } from '../bv/Sphere.js';
@@ -75,16 +71,16 @@ class EntityCollectionNode {
 
     __setLonLat__(entity) {
 
-        if (entity._lonlat.isZero() && !entity._cartesian.isZero()) {
-            entity._lonlat = this.layer._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
+        if (entity._lonLat.isZero() && !entity._cartesian.isZero()) {
+            entity._lonLat = this.layer._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
         }
 
-        if (Math.abs(entity._lonlat.lat) < mercator.MAX_LAT) {
-            entity._lonlatMerc = entity._lonlat.forwardMercator();
+        if (Math.abs(entity._lonLat.lat) < mercator.MAX_LAT) {
+            entity._lonLatMerc = entity._lonLat.forwardMercator();
         } else {
-            entity._lonlatMerc = null;
+            entity._lonLatMerc = null;
         }
-        return entity._lonlatMerc;
+        return entity._lonLatMerc;
     }
 
     buildTree(entities, rightNow) {
@@ -131,8 +127,8 @@ class EntityCollectionNode {
     }
 
     isInside(entity) {
-        if (entity._lonlatMerc) {
-            return this.extent.isInside(entity._lonlatMerc);
+        if (entity._lonLatMerc) {
+            return this.extent.isInside(entity._lonLatMerc);
         } else {
             return false;
         }
@@ -343,10 +339,10 @@ class EntityCollectionNodeWGS84 extends EntityCollectionNode {
     }
 
     __setLonLat__(entity) {
-        if (entity._lonlat.isZero()) {
-            entity._lonlat = this.layer._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
+        if (entity._lonLat.isZero()) {
+            entity._lonLat = this.layer._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
         }
-        return entity._lonlat;
+        return entity._lonLat;
     }
 
     isVisible() {
@@ -359,7 +355,7 @@ class EntityCollectionNodeWGS84 extends EntityCollectionNode {
     }
 
     isInside(entity) {
-        return this.extent.isInside(entity._lonlat);
+        return this.extent.isInside(entity._lonLat);
     }
 
     /**

package/src/og/quadTree/MarsQuadTreeStrategy.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { Extent } from "../Extent.js";
 import { EPSG4326 } from "../proj/EPSG4326.js";
 import { Node } from "../quadTree/Node.js";

package/src/og/quadTree/Node.js

@@ -76,16 +76,17 @@ class Node {
     createChildrenNodes() {
         this.ready = true;
 
-        var p = this.planet;
-        var ps = this.segment;
-        var ext = ps._extent;
-        var size_x = ext.getWidth() * 0.5;
-        var size_y = ext.getHeight() * 0.5;
-        var ne = ext.northEast, sw = ext.southWest;
-        var z = ps.tileZoom + 1;
-        var id = this.nodeId * 4 + 1;
-        var c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        var nd = this.nodes;
+        const p = this.planet;
+        const ps = this.segment;
+        const ext = ps._extent;
+        const z = ps.tileZoom + 1;
+        const size_x = ext.getWidth() * 0.5;
+        const size_y = ext.getHeight() * 0.5;
+        const ne = ext.northEast;
+        const sw = ext.southWest;
+        const id = this.nodeId * 4 + 1;
+        const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
+        const nd = this.nodes;
 
         nd[NW] = new Node(this.SegmentPrototype, p, NW, this, id, z, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)));
         nd[NE] = new Node(this.SegmentPrototype, p, NE, this, id, z, new Extent(c, new LonLat(ne.lon, ne.lat)));
@@ -333,7 +334,7 @@ class Node {
 
         var nodes = this.planet._renderedNodes;
 
-        for (var i = nodes.length - 1; i >= 0; --i) {
+        for (let i = nodes.length - 1; i >= 0; --i) {
             var ni = nodes[i];
 
             var cs = this.getCommonSide(ni);
@@ -597,7 +598,7 @@ class Node {
                 tempVerticesHigh = new Float32Array(3 * _vertOrder.length);
                 tempVerticesLow = new Float32Array(3 * _vertOrder.length);
 
-                for (var i = 0; i < _vertOrder.length; i++) {
+                for (let i = 0; i < _vertOrder.length; i++) {
                     let vi_y = _vertOrder[i].y + t_i0, vi_x = _vertOrder[i].x + t_j0;
 
                     let vi_x_is = vi_x * gridSize, vi_y_is = vi_y * gridSize;
@@ -725,7 +726,7 @@ class Node {
         if (state === NOTRENDERING || state === RENDERING) {
             this.destroyBranches();
         } else {
-            for (var i = 0; i < this.nodes.length; i++) {
+            for (let i = 0; i < this.nodes.length; i++) {
                 this.nodes[i] && this.nodes[i].clearTree();
             }
         }
@@ -763,7 +764,7 @@ class Node {
     traverseTree(callback) {
         callback(this);
         if (this.ready) {
-            for (var i = 0; i < this.nodes.length; i++) {
+            for (let i = 0; i < this.nodes.length; i++) {
                 this.nodes[i].traverseTree(callback);
             }
         }

package/src/og/quadTree/QuadTreeStrategy.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { EPSG3857 } from "../proj/EPSG3857.js";
 
 export class QuadTreeStrategy {

package/src/og/quadTree/Wgs84QuadTreeStrategy.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { Extent } from "../Extent.js";
 import { EPSG4326 } from "../proj/EPSG4326.js";
 import { Node } from "../quadTree/Node.js";

package/src/og/renderer/Renderer.js

@@ -230,11 +230,24 @@ class Renderer {
         this.__useDistanceFramebuffer__ = true;
 
         if (params.autoActivate || isEmpty(params.autoActivate)) {
-            this.initialize();
             this.start();
         }
     }
 
+    enableBlendOneSrcAlpha() {
+        let gl = this.handler.gl;
+        gl.enable(gl.BLEND);
+        gl.blendEquation(gl.FUNC_ADD);
+        gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
+    }
+
+    enableBlendDefault() {
+        let gl = this.handler.gl;
+        gl.enable(gl.BLEND);
+        gl.blendEquation(gl.FUNC_ADD);
+        gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
+    }
+
     /**
      * Sets renderer events activity.
      * @param {Boolean} activity - Events activity.
@@ -252,7 +265,7 @@ class Renderer {
     }
 
     removeDepthCallback(id) {
-        for (var i = 0; i < this._depthCallbacks.length; i++) {
+        for (let i = 0; i < this._depthCallbacks.length; i++) {
             if (id === this._depthCallbacks[i].id) {
                 this._depthCallbacks.splice(i, 1);
                 break;
@@ -269,7 +282,7 @@ class Renderer {
     }
 
     removeDistanceCallback(id) {
-        for (var i = 0; i < this._distanceCallbacks.length; i++) {
+        for (let i = 0; i < this._distanceCallbacks.length; i++) {
             if (id === this._distanceCallbacks[i].id) {
                 this._distanceCallbacks.splice(i, 1);
                 break;
@@ -297,7 +310,7 @@ class Renderer {
      * @param {Number} id - Handler id to remove.
      */
     removePickingCallback(id) {
-        for (var i = 0; i < this._pickingCallbacks.length; i++) {
+        for (let i = 0; i < this._pickingCallbacks.length; i++) {
             if (id === this._pickingCallbacks[i].id) {
                 this._pickingCallbacks.splice(i, 1);
                 break;
@@ -401,7 +414,7 @@ class Renderer {
      * @param {Array.<control.Control>} cArr - Control array.
      */
     addControls(cArr) {
-        for (var i = 0; i < cArr.length; i++) {
+        for (let i = 0; i < cArr.length; i++) {
             cArr[i].addTo(this);
         }
     }
@@ -414,17 +427,24 @@ class Renderer {
         control.remove();
     }
 
+    isInitialized() {
+        return this._initialized;
+    }
+
     /**
      * Renderer initialization.
      * @public
      */
     initialize() {
+
         if (this._initialized) {
             return;
         } else {
             this._initialized = true;
         }
 
+        this.handler.initialize();
+
         this.billboardsTextureAtlas.assignHandler(this.handler);
         this.geoObjectsTextureAtlas.assignHandler(this.handler);
 
@@ -537,17 +557,24 @@ class Renderer {
 
         this.screenFramePositionBuffer = this.handler.createArrayBuffer(new Float32Array([1, 1, -1, 1, 1, -1, -1, -1]), 2, 4);
 
-        let temp = this.controls;
-        this.controls = {};
-        for (let i in temp) {
-            this.addControl(temp[i]);
-        }
 
         this.outputTexture = this.screenTexture.screen;
 
         this.fontAtlas.initFont("arial", arial.data, arial.image);
 
         this._pickingMaskCoordinatesBuffer = this.handler.createArrayBuffer(new Float32Array([0, 0]), 2, 1);
+
+        this._initializeRenderNodes();
+
+        this._initializeControls();
+    }
+
+    _initializeControls() {
+        let temp = this.controls;
+        this.controls = {};
+        for (let i in temp) {
+            this.addControl(temp[i]);
+        }
     }
 
     resize() {
@@ -616,6 +643,12 @@ class Renderer {
         }
     }
 
+    _initializeRenderNodes() {
+        for (let i = 0; i < this._renderNodesArr.length; i++) {
+            this._renderNodesArr[i].initialize();
+        }
+    }
+
     /**
      * Adds render node to the renderer before specific node.
      * @public
@@ -643,7 +676,7 @@ class Renderer {
      * @param {Array.<scene.RenderNode>} nodesArr - Render nodes array.
      */
     addNodes(nodesArr) {
-        for (var i = 0; i < nodesArr.length; i++) {
+        for (let i = 0; i < nodesArr.length; i++) {
             this.addNode(nodesArr[i]);
         }
     }
@@ -674,10 +707,8 @@ class Renderer {
         let ec = this._entityCollections;
 
         if (ec.length) {
-            let gl = this.handler.gl;
-            gl.enable(gl.BLEND);
-            gl.blendEquation(gl.FUNC_ADD);
-            gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
+
+            this.enableBlendDefault();
 
             //geoObject
             let i = ec.length;
@@ -709,9 +740,7 @@ class Renderer {
         if (ec.length) {
             let gl = this.handler.gl;
 
-            gl.enable(gl.BLEND);
-            gl.blendEquation(gl.FUNC_ADD);
-            gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
+            this.enableBlendDefault();
 
             // billboards pass
             gl.activeTexture(gl.TEXTURE0);
@@ -775,10 +804,6 @@ class Renderer {
 
         let h = this.handler, gl = h.gl;
 
-        gl.enable(gl.BLEND);
-        gl.blendEquation(gl.FUNC_ADD);
-        gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
-
         gl.clearColor(0.0, 0.0, 0.0, 1.0);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
@@ -805,10 +830,7 @@ class Renderer {
 
             i = rn.length;
             while (i--) {
-                gl.enable(gl.BLEND);
-                gl.blendEquation(gl.FUNC_ADD);
-                gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
-
+                this.enableBlendDefault();
                 rn[i].drawNode();
             }
 
@@ -1087,12 +1109,77 @@ class Renderer {
     }
 
     /**
-     * Function starts rendering.
+     * Function starts renderer
      * @public
      */
     start() {
+        if (!this._initialized) {
+            this.initialize();
+        }
         this.handler.start();
     }
+
+    destroy() {
+        for (let i in this.controls) {
+            this.controls[i].remove();
+        }
+
+        for (let i = 0; i < this._renderNodesArr.length; i++) {
+            this._renderNodesArr[i].remove();
+        }
+
+        this.div = null;
+
+        this._renderNodesArr = [];
+
+        this.renderNodes = {};
+
+        this.activeCamera = null;
+
+        this.controls = {};
+
+        this.controlsBag = {};
+
+        this.colorObjects = new Map();
+
+        this._pickingCallbacks = [];
+
+        this.pickingFramebuffer = null;
+
+        this._tempPickingPix_ = null;
+
+        this.distanceFramebuffer = null;
+
+        this._distanceCallbacks = [];
+
+        this._tempDistancePix_ = null;
+
+        this._depthCallbacks = [];
+
+        this.depthFramebuffer = null;
+
+        this.sceneFramebuffer = null;
+
+        this.blitFramebuffer = null;
+
+        this.toneMappingFramebuffer = null;
+
+        // todo
+        //this.billboardsTextureAtlas.clear();
+        //this.geoObjectsTextureAtlas.clear()
+        //this.fontAtlas.clear();
+
+        this._entityCollections = [];
+
+        this.colorObjects = null;
+
+        this.handler.destroy();
+
+        this.handler = null;
+
+        this._initialized = false;
+    }
+
 }
 
 export { Renderer };

package/src/og/renderer/RendererEvents.js

@@ -1,7 +1,3 @@
-/**
- * @module og/renderer/RendererEvents
- */
-
 "use strict";
 
 import { Events } from "../Events.js";