@openglobus/og 0.12.1 → 0.13.0

package/src/og/scene/Planet.js

@@ -411,7 +411,7 @@ export class Planet extends RenderNode {
 
         this._terrainWorker = new TerrainWorker(3);
 
-        this._plainSegmentWorker = new PlainSegmentWorker(4);
+        this._plainSegmentWorker = new PlainSegmentWorker(3);
 
         this._tileLoader = new Loader(options.loadingBatchSize || 12);
 
@@ -638,8 +638,11 @@ export class Planet extends RenderNode {
         var h = this.renderer.handler;
 
         h.addProgram(shaders.drawnode_screen_nl(), true);
-        //h.addProgram(shaders.drawnode_screen_wl(), true);
-        h.addProgram(shaders.drawnode_screen_wl_webgl2(), true);
+        if (h.isWebGl2()) {
+            h.addProgram(shaders.drawnode_screen_wl_webgl2(), true);
+        } else {
+            h.addProgram(shaders.drawnode_screen_wl(), true);
+        }
         h.addProgram(shaders.drawnode_colorPicking(), true);
         h.addProgram(shaders.drawnode_depth(), true);
         h.addProgram(shaders.drawnode_heightPicking(), true);
@@ -674,10 +677,10 @@ export class Planet extends RenderNode {
                 !this._indexesCache[i][j] && (this._indexesCache[i][j] = new Array(TABLESIZE));
                 for (var k = 0; k <= TABLESIZE; k++) {
                     !this._indexesCache[i][j][k] &&
-                        (this._indexesCache[i][j][k] = new Array(TABLESIZE));
+                    (this._indexesCache[i][j][k] = new Array(TABLESIZE));
                     for (var m = 0; m <= TABLESIZE; m++) {
                         !this._indexesCache[i][j][k][m] &&
-                            (this._indexesCache[i][j][k][m] = new Array(TABLESIZE));
+                        (this._indexesCache[i][j][k][m] = new Array(TABLESIZE));
                         for (var q = 0; q <= TABLESIZE; q++) {
                             let ptr = {
                                 buffer: null
@@ -817,7 +820,7 @@ export class Planet extends RenderNode {
     _preRender() {
         // Zoom 0
         this._quadTree.createChildrenNodes();
-        this._quadTree.segment.createPlainSegment();        
+        this._quadTree.segment.createPlainSegment();
 
         // Zoom 1
         for (let i = 0; i < this._quadTree.nodes.length; i++) {
@@ -843,19 +846,9 @@ export class Planet extends RenderNode {
     }
 
     _preLoad() {
-        this._skipPreRender = false;
-
-        // Zoom 0
-        this._quadTree.segment.passReady = true;
-        this._quadTree.renderNode(true);
-        this._normalMapCreator.drawSingle(this._quadTree.segment);
+        this._clearRenderedNodeList();
 
-        // Zoom 1
-        for (let i = 0; i < this._quadTree.nodes.length; i++) {
-            this._quadTree.nodes[i].segment.passReady = true;
-            this._quadTree.nodes[i].renderNode(true);
-            this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
-        }
+        this._skipPreRender = false;
 
         // Same for poles
         this._quadTreeNorth.segment.passReady = true;
@@ -877,6 +870,18 @@ export class Planet extends RenderNode {
             this._quadTreeSouth.nodes[i].renderNode(true);
             this._normalMapCreator.drawSingle(this._quadTreeSouth.nodes[i].segment);
         }
+
+        // Zoom 1
+        for (let i = 0; i < this._quadTree.nodes.length; i++) {
+            this._quadTree.nodes[i].segment.passReady = true;
+            this._quadTree.nodes[i].renderNode(true);
+            this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
+        }
+
+        // Zoom 0
+        this._quadTree.segment.passReady = true;
+        this._quadTree.renderNode(true);
+        this._normalMapCreator.drawSingle(this._quadTree.segment);
     }
 
     /**
@@ -955,8 +960,6 @@ export class Planet extends RenderNode {
                     html += "<li>" + li._attribution + "</li>";
                 }
 
-                this._preLoad();
-
             } else if (li._fading && li._fadingOpacity > 0) {
                 if (li.hasImageryTiles()) {
                     this.visibleTileLayers.push(li);
@@ -1340,15 +1343,15 @@ export class Planet extends RenderNode {
             rn[i].segment.colorPickingRendering(sh, sl[0], 0);
         }
 
-        gl.enable(gl.POLYGON_OFFSET_FILL);
+        //gl.enable(gl.POLYGON_OFFSET_FILL);
         for (let j = 1, len = sl.length; j < len; j++) {
             i = rn.length;
-            gl.polygonOffset(0, -j);
+            //gl.polygonOffset(0, -j);
             while (i--) {
                 rn[i].segment.colorPickingRendering(sh, sl[j], j, this.transparentTexture, true);
             }
         }
-        gl.disable(gl.POLYGON_OFFSET_FILL);
+        //gl.disable(gl.POLYGON_OFFSET_FILL);
 
         gl.disable(gl.BLEND);
     }