@openglobus/og 0.16.2 → 0.17.0

package/src/og/scene/Planet.js

@@ -1,7 +1,3 @@
-/**
- * @module og/scene/Planet
- */
-
 "use strict";
 
 import { PlanetCamera } from "../camera/PlanetCamera.js";
@@ -50,10 +46,11 @@ const MAX_NODES = 200;
 
 const HORIZON_TANGENT = 0.81;
 
-const EVENT_NAMES = [/**
- * Triggered before globe frame begins to render.
- * @event og.scene.Planet#draw
- */
+const EVENT_NAMES = [
+    /**
+     * Triggered before globe frame begins to render.
+     * @event og.scene.Planet#draw
+     */
     "draw",
 
     /**
@@ -96,7 +93,8 @@ const EVENT_NAMES = [/**
      * Triggered when layer data is laded
      * @event og.scene.Planet#terraincompleted
      */
-    "layerloadend"];
+    "layerloadend"
+];
 
 /**
  * Main class for rendering planet
@@ -119,7 +117,7 @@ export class Planet extends RenderNode {
     constructor(options = {}) {
         super(options.name);
 
-        this._cameraFrustums = options.frustums || [[1, 100 + 0.075], [100, 1000 + 0.075], [1000, 1e6 + 10000], [1e6, 1e9]];
+        this._cameraFrustums = options.frustums || [[1, 100], [100, 1000 + 7.0], [1000 - 7.0, 1e6 + 17], [1e6 - 17, 1e9]];
 
         /**
          * @public
@@ -198,15 +196,22 @@ export class Planet extends RenderNode {
          */
         this._terrainPool = null;
 
+        this._minAltitude = options.minAltitude;
+        this._maxAltitude = options.maxAltitude;
+
         /**
          * Camera is this.renderer.activeCamera pointer.
          * @public
          * @type {PlanetCamera}
          */
-        this.camera = null;
-
-        this._minAltitude = options.minAltitude;
-        this._maxAltitude = options.maxAltitude;
+        this.camera = new PlanetCamera(this, {
+            frustums: this._cameraFrustums,
+            eye: new Vec3(0, 0, 28000000),
+            look: new Vec3(0, 0, 0),
+            up: new Vec3(0, 1, 0),
+            minAltitude: this._minAltitude,
+            maxAltitude: this._maxAltitude
+        });
 
         this.maxEqualZoomAltitude = options.maxEqualZoomAltitude || 15000000.0;
         this.minEqualZoomAltitude = options.minEqualZoomAltitude || 10000.0;
@@ -239,6 +244,8 @@ export class Planet extends RenderNode {
 
         this._viewExtent = new Extent(new LonLat(180, 180), new LonLat(-180, -180));
 
+        this._initialViewExtent = null;
+
         /**
          * @protected
          */
@@ -287,12 +294,6 @@ export class Planet extends RenderNode {
          */
         this.terrainLock = new Lock();
 
-        /**
-         * Layer's transparent colors.
-         * @protected
-         */
-        this._tcolorArr = [];
-
         /**
          * Height scale factor. 1 - is normal elevation scale.
          * @protected
@@ -354,7 +355,7 @@ export class Planet extends RenderNode {
          */
         this._useSpecularTexture = isUndef(options.useSpecularTexture) ? true : options.useSpecularTexture;
 
-        this._maxGridSize = Math.log2(options.maxGridSize || 256);
+        this._maxGridSize = Math.log2(options.maxGridSize || 128);
 
         /**
          * Segment multiple textures size.(4 - convinient value for the most devices)
@@ -382,13 +383,23 @@ export class Planet extends RenderNode {
         /**
          * GeoImage creator.
          * @protected
-         * @type{utils.GeoImageCreator}
+         * @type{GeoImageCreator}
          */
-        this._geoImageCreator = null;
+        this._geoImageCreator = new GeoImageCreator(this);
 
-        this._vectorTileCreator = null;
+        /**
+         * VectorTileCreator creator.
+         * @protected
+         * @type{VectorTileCreator}
+         */
+        this._vectorTileCreator = new VectorTileCreator(this);
 
-        this._normalMapCreator = null;
+        /**
+         * NormalMapCreator creator.
+         * @protected
+         * @type{NormalMapCreator}
+         */
+        this._normalMapCreator = new NormalMapCreator(this);
 
         this._terrainWorker = new TerrainWorker(3);
 
@@ -759,6 +770,7 @@ export class Planet extends RenderNode {
         // Initialization indexes table
         segmentHelper.getInstance().setMaxGridSize(this._maxGridSize);
         const TABLESIZE = this._maxGridSize;
+
         let kk = 0;
         // Initialization indexes buffers cache. It takes about 120mb RAM!
         for (var i = 0; i <= TABLESIZE; i++) {
@@ -816,17 +828,6 @@ export class Planet extends RenderNode {
 
         this.transparentTexture = this.renderer.handler.transparentTexture;
 
-        this.camera = this.renderer.activeCamera = new PlanetCamera(this, {
-            frustums: this._cameraFrustums,
-            eye: new Vec3(0, 0, 28000000),
-            look: new Vec3(0, 0, 0),
-            up: new Vec3(0, 1, 0),
-            minAltitude: this._minAltitude,
-            maxAltitude: this._maxAltitude
-        });
-
-        this.camera.update();
-
         this._renderedNodesInFrustum = new Array(this.camera.frustums.length);
         for (let i = 0, len = this._renderedNodesInFrustum.length; i < len; i++) {
             this._renderedNodesInFrustum[i] = [];
@@ -856,26 +857,44 @@ export class Planet extends RenderNode {
             createImageBitmap(SPECULAR).then((e) => (this._specularTexture = this.renderer.handler.createTexture_l(e)));
         }
 
-        this._geoImageCreator = new GeoImageCreator(this);
+        this._geoImageCreator.init();
 
-        this._vectorTileCreator = new VectorTileCreator(this);
+        this._vectorTileCreator.init();
 
-        this._normalMapCreator = new NormalMapCreator(this, {
-            minTableSize: 1,
-            maxTableSize: TABLESIZE,
-            blur: this.terrain && (this.terrain.blur != undefined ? this.terrain.blur : true)
-        });
+        this._normalMapCreator.init();
 
         this.renderer.events.on("draw", this._globalPreDraw, this, -100);
 
         // Loading first nodes for better viewing if you have started on a lower altitude.
         this._preRender();
 
-        this._initialized = true;
-
         this.renderer.events.on("postdraw", () => {
             this._checkRendercompleted();
         });
+
+        this.initLayers();
+
+        this._initialized = true;
+
+
+        //
+        // after init
+        //
+        if (this._initialViewExtent) {
+            this.viewExtent(this._initialViewExtent);
+        }
+
+        this.renderer.activeCamera = this.camera;
+        this.camera.bindRenderer(this.renderer);
+        this.camera.update();
+    }
+
+    initLayers() {
+        let temp = [...this._layers];
+        for (let i = 0; i < temp.length; i++) {
+            this.removeLayer(temp[i]);
+            this.addLayer(temp[i]);
+        }
     }
 
     clearIndexesCache() {
@@ -1143,13 +1162,32 @@ export class Planet extends RenderNode {
 
         if (this.camera.isFirstPass) {
             this.camera.update();
-            this._firstPASS();
+
+            if (this._skipPreRender && this._collectRenderNodesIsActive) {
+                this._collectRenderNodes();
+            }
+            this._skipPreRender = true;
+
+            this.transformLights();
+
+            // creates terrain normal maps
+            this._normalMapCreator.frame();
+
+            // Creating geoImages textures.
+            this._geoImageCreator.frame();
+
+            // Vector tiles rasteriazation
+            this._vectorTileCreator.frame();
+
             this.camera.checkTerrainCollision();
             this.camera.update();
 
             // Here is the planet node dispatches a draw event before
             // rendering begins and we have got render nodes.
             this.events.dispatch(this.events.draw, this);
+
+            // Collect entity collections from vector layers
+            this._collectVectorLayerCollections();
         }
 
         this.drawEntityCollections(this._frustumEntityCollections);
@@ -1196,27 +1234,6 @@ export class Planet extends RenderNode {
         this.camera.setTerrainCollisionActivity(true);
     }
 
-    _firstPASS() {
-
-        if (this._skipPreRender && this._collectRenderNodesIsActive) {
-            this._collectRenderNodes();
-        }
-        this._skipPreRender = true;
-
-        this.transformLights();
-
-        this._normalMapCreator.frame();
-
-        // Creating geoImages textures.
-        this._geoImageCreator.frame();
-
-        // Collect entity collections from vector layers
-        this._collectVectorLayerCollections();
-
-        // Vector tiles rasteriazation
-        this._vectorTileCreator.frame();
-    }
-
     _renderScreenNodesPASSNoAtmos() {
 
         let sh, shu;
@@ -1229,9 +1246,7 @@ export class Planet extends RenderNode {
 
         gl.enable(gl.CULL_FACE);
 
-        gl.enable(gl.BLEND);
-        gl.blendEquation(gl.FUNC_ADD);
-        gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+        renderer.enableBlendOneSrcAlpha();
 
         if (this.lightEnabled) {
             h.programs.drawnode_screen_wl.activate();
@@ -1339,9 +1354,7 @@ export class Planet extends RenderNode {
 
         gl.enable(gl.CULL_FACE);
 
-        gl.enable(gl.BLEND);
-        gl.blendEquation(gl.FUNC_ADD);
-        gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+        renderer.enableBlendOneSrcAlpha();
 
         if (this.lightEnabled) {
             h.programs.drawnode_screen_wl.activate();
@@ -1492,9 +1505,10 @@ export class Planet extends RenderNode {
         let shu = sh.uniforms;
         let cam = renderer.activeCamera;
 
-        gl.blendEquation(gl.FUNC_ADD);
-        gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-        gl.enable(gl.BLEND);
+        // Special blend
+        // gl.enable(gl.BLEND);
+        // gl.blendEquation(gl.FUNC_ADD);
+        // gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
 
         gl.enable(gl.CULL_FACE);
 
@@ -1686,8 +1700,8 @@ export class Planet extends RenderNode {
      * @param {Boolean} [force=false] - Force framebuffer rendering.
      * @returns {LonLat} -
      */
-    getLonLatFromPixelTerrain(px, force) {
-        var coords = this.getCartesianFromPixelTerrain(px, force);
+    getLonLatFromPixelTerrain(px) {
+        var coords = this.getCartesianFromPixelTerrain(px);
         if (coords) {
             return this.ellipsoid.cartesianToLonLat(coords);
         }
@@ -1695,7 +1709,7 @@ export class Planet extends RenderNode {
     }
 
     /**
-     * Returns projected 2d screen coordinates by 3d cartesian coordiantes.
+     * Returns projected 2d screen coordinates by 3d cartesian coordinates.
      * @public
      * @param {Vec3} coords - Cartesian coordinates.
      * @returns {Vec2} -
@@ -1720,7 +1734,7 @@ export class Planet extends RenderNode {
 
     /**
      * Returns distance from active camera to the the planet ellipsoid
-     * coordiantes unprojected by 2d screen coordiantes, or null if screen coordinates outside the planet.
+     * coordinates unprojected by 2d screen coordinates, or null if screen coordinates outside the planet.
      * @public
      * @param {Vec2} px - Screen coordinates.
      * @returns {number} -
@@ -1731,8 +1745,8 @@ export class Planet extends RenderNode {
     }
 
     /**
-     * Returns distance from active camera to the the relief planet coordiantes unprojected
-     * by 2d screen coordiantes, or null if screen coordinates outside the planet.
+     * Returns distance from active camera to the the relief planet coordinates unprojected
+     * by 2d screen coordinates, or null if screen coordinates outside the planet.
      * If screen coordinates inside the planet but relief is not exists in the
      * point than function returns distance to the planet ellipsoid.
      * @public
@@ -1784,7 +1798,11 @@ export class Planet extends RenderNode {
      * @param {Extent} extent - Geographical extent.
      */
     viewExtent(extent) {
-        this.renderer.activeCamera.viewExtent(extent);
+        if (this.camera) {
+            this.camera.viewExtent(extent);
+        } else {
+            this._initialViewExtent = extent;
+        }
     }
 
     /**
@@ -1794,7 +1812,7 @@ export class Planet extends RenderNode {
      * where index 0 - southwest longitude, 1 - latitude southwest, 2 - longitude northeast, 3 - latitude northeast.
      */
     viewExtentArr(extentArr) {
-        this.renderer.activeCamera.viewExtent(new Extent(new LonLat(extentArr[0], extentArr[1]), new LonLat(extentArr[2], extentArr[3])));
+        this.viewExtent(new Extent(new LonLat(extentArr[0], extentArr[1]), new LonLat(extentArr[2], extentArr[3])));
     }
 
     /**
@@ -1804,28 +1822,6 @@ export class Planet extends RenderNode {
      */
     getViewExtent() {
         return this._viewExtent;
-        // if (this._viewExtentMerc) {
-        //     var ne = this._viewExtentMerc.northEast.inverseMercator(),
-        //         sw = this._viewExtentMerc.southWest.inverseMercator();
-        //     if (this._viewExtentWGS84) {
-        //         var e = this._viewExtentWGS84;
-        //         if (e.northEast.lon > ne.lon) {
-        //             ne.lon = e.northEast.lon;
-        //         }
-        //         if (e.northEast.lat > ne.lat) {
-        //             ne.lat = e.northEast.lat;
-        //         }
-        //         if (e.southWest.lon < sw.lon) {
-        //             sw.lon = e.southWest.lon;
-        //         }
-        //         if (e.southWest.lat < sw.lat) {
-        //             sw.lat = e.southWest.lat;
-        //         }
-        //     }
-        //     return new Extent(sw, ne);
-        // } else if (this._viewExtentWGS84) {
-        //     return this._viewExtentWGS84;
-        // }
     }
 
     /**
@@ -1849,13 +1845,13 @@ export class Planet extends RenderNode {
      * @param {cameraCallback} [completeCallback] - Callback that calls befor the flying begins.
      */
     flyExtent(extent, height, up, ampl, completeCallback, startCallback) {
-        this.renderer.activeCamera.flyExtent(extent, height, up, ampl, completeCallback, startCallback);
+        this.camera.flyExtent(extent, height, up, ampl, completeCallback, startCallback);
     }
 
     /**
      * Fly camera to the new point.
      * @public
-     * @param {Vec3} cartesian - Fly coordiantes.
+     * @param {Vec3} cartesian - Fly coordinates.
      * @param {Vec3} [look] - Camera "look at" point.
      * @param {Vec3} [up] - Camera UP vector on the end of a flying.
      * @param {Number} [ampl] - Altitude amplitude factor.
@@ -1864,13 +1860,13 @@ export class Planet extends RenderNode {
      * @param [frameCallback]
      */
     flyCartesian(cartesian, look, up, ampl, completeCallback, startCallback, frameCallback) {
-        this.renderer.activeCamera.flyCartesian(cartesian, look, up, ampl, completeCallback, startCallback, frameCallback);
+        this.camera.flyCartesian(cartesian, look, up, ampl, completeCallback, startCallback, frameCallback);
     }
 
     /**
      * Fly camera to the new geographical position.
      * @public
-     * @param {LonLat} lonlat - Fly geographical coordiantes.
+     * @param {LonLat} lonlat - Fly geographical coordinates.
      * @param {Vec3} [look] - Camera "look at" point on the end of a flying.
      * @param {Vec3} [up] - Camera UP vector on the end of a flying.
      * @param {Number} [ampl] - Altitude amplitude factor.
@@ -1879,7 +1875,7 @@ export class Planet extends RenderNode {
      * @param [frameCallback]
      */
     flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback, frameCallback) {
-        this.renderer.activeCamera.flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback, frameCallback);
+        this.camera.flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback, frameCallback);
     }
 
     /**
@@ -1887,7 +1883,7 @@ export class Planet extends RenderNode {
      * @public
      */
     stopFlying() {
-        this.renderer.activeCamera.stopFlying();
+        this.camera.stopFlying();
     }
 
     updateBillboardsTexCoords() {
@@ -1933,4 +1929,10 @@ export class Planet extends RenderNode {
             });
         });
     }
+
+    onremove() {
+        this.memClear();
+        this.quadTreeStrategy.destroyBranches();
+        this._renderedNodes = [];
+    }
 }

package/src/og/scene/RenderNode.js

@@ -82,12 +82,20 @@ class RenderNode extends BaseNode {
     assign(renderer) {
         this.renderer = renderer;
         this._pickingId = renderer.addPickingCallback(this, this._entityCollectionPickingCallback);
+        this.initialize();
+    }
 
-        for (var i = 0; i < this.entityCollections.length; i++) {
-            this.entityCollections[i].bindRenderNode(this);
+    initialize() {
+        if (this.renderer.isInitialized()) {
+            for (let i = 0; i < this.entityCollections.length; i++) {
+                this.entityCollections[i].bindRenderNode(this);
+            }
+            this.init();
         }
+    }
 
-        this.init && this.init();
+    init() {
+        //virtual
     }
 
     onremove() {