@openglobus/og 0.12.0 → 0.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "[OpenGlobus](http://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"
@@ -43,24 +43,24 @@
     "./css/og.css": "./css/og.css"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-env": "^7.16.8",
     "@rollup/plugin-json": "^4.1.0",
-    "@types/jest": "^27.0.3",
-    "eslint": "^8.3.0",
+    "@types/jest": "^27.4.0",
+    "eslint": "^8.6.0",
     "jaguarjs-jsdoc": "^1.1.0",
-    "jest": "^27.3.1",
+    "jest": "^27.4.7",
     "jest-canvas-mock": "^2.3.1",
     "jest-webgl-canvas-mock": "^0.2.3",
     "jsdoc": "^3.6.7",
-    "lint-staged": "^12.1.2",
+    "lint-staged": "^12.1.7",
     "local-web-server": "^5.1.1",
     "msdf-bmfont-xml": "^2.5.4",
-    "postcss": "^8.4.1",
-    "prettier": "^2.5.0",
-    "rollup": "^2.60.1",
+    "postcss": "^8.4.5",
+    "prettier": "^2.5.1",
+    "rollup": "^2.63.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.4"
   },
   "lint-staged": {
     "*.{js,ts}": [

package/src/og/layer/CanvasTiles.js

@@ -98,17 +98,14 @@ class CanvasTiles extends Layer {
      * @public
      * @param {boolean} visibility - Layer visibility.
      */
-    setVisibility(visibility) {
+    setVisibility(visibility) {
         if (visibility !== this._visibility) {
-            this._visibility = visibility;
-            if (this._isBaseLayer && visibility) {
-                this._planet.setBaseLayer(this);
-            } else if (!visibility) {
+            super.setVisibility(visibility);
+
+            if (!visibility) {
                 this.abortLoading();
             }
-            this._planet.updateVisibleLayers();
-            this.events.dispatch(this.events.visibilitychange, this);
-        }
+        }
     }
 
     /**
@@ -128,7 +125,7 @@ class CanvasTiles extends Layer {
             material.texture = seg.planet.transparentTexture;
         }
 
-        if (this._planet.layerLock.isFree()) {
+        if (this._planet.layerLock.isFree() || material.segment.tileZoom < 2) {
             material.isReady = false;
             material.isLoading = true;
             if (CanvasTiles.__requestsCounter >= CanvasTiles.MAX_REQUESTS && this._counter) {
@@ -240,12 +237,12 @@ class CanvasTiles extends Layer {
             var mId = this._id;
             var psegm = material;
             while (pn.parentNode) {
+                pn = pn.parentNode;
+                psegm = pn.segment.materials[mId];
                 if (psegm && psegm.isReady) {
                     notEmpty = true;
                     break;
                 }
-                pn = pn.parentNode;
-                psegm = pn.segment.materials[mId];
             }
 
             if (notEmpty) {

package/src/og/layer/XYZ.js

@@ -151,8 +151,9 @@ class XYZ extends Layer {
         } else {
             material.texture = seg.planet.transparentTexture;
         }
-
-        if (this._planet.layerLock.isFree()) {
+
+        // Q: Maybe we should change "<2" to material.segment.tileZoom < (material.layer.minZoom + 1)
+        if (this._planet.layerLock.isFree() || material.segment.tileZoom < 2) {
             material.isReady = false;
             material.isLoading = true;
 
@@ -245,17 +246,16 @@ class XYZ extends Layer {
             let mId = this._id;
             let psegm = material;
             while (pn.parentNode) {
+                pn = pn.parentNode;
+                psegm = pn.segment.materials[mId];
                 if (psegm && psegm.textureExists) {
                     notEmpty = true;
                     break;
                 }
-                pn = pn.parentNode;
-                psegm = pn.segment.materials[mId];
             }
-
-            let maxNativeZoom = material.layer.maxNativeZoom;
 
-            if (segment.loadTile) {
+            if (segment.passReady) {
+                let maxNativeZoom = material.layer.maxNativeZoom;
                 if (pn.segment.tileZoom === maxNativeZoom) {
                     material.textureNotExists();
                 } else if (material.segment.tileZoom <= maxNativeZoom) {
@@ -312,7 +312,7 @@ class XYZ extends Layer {
 
         material.isReady = false;
         material.textureExists = false;
-        material.isLoading = false;
+        material.isLoading = false;        
     }
 
     /**

package/src/og/quadTree/Node.js

@@ -275,7 +275,7 @@ class Node {
                 maxZoom && ((seg.tileZoom === maxZoom) || !altVis))) {
 
                 if (altVis) {
-                    seg.loadTile = true;
+                    seg.passReady = true;
                     this.renderNode(this.inFrustum, !this.inFrustum, terrainReadySegment, stopLoading);
                 } else {
                     this.state = NOTRENDERING;
@@ -287,7 +287,7 @@ class Node {
                 (!maxZoom || maxZoom && cam.projectedSize(seg.bsphere.center, seg.bsphere.radius) > this.planet._maxLodSize)) {
                 this.traverseNodes(cam, maxZoom, seg, stopLoading);
             } else if (altVis) {
-                seg.loadTile = false;
+                seg.passReady = maxZoom ? seg.terrainReady : false;
                 this.renderNode(this.inFrustum, !this.inFrustum, terrainReadySegment, stopLoading);
             } else {
                 this.state = NOTRENDERING;

package/src/og/scene/Planet.js

@@ -815,35 +815,65 @@ 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++) {
+            this._quadTree.nodes[i].segment.createPlainSegment();
+        }
+
+        // same for poles
+        this._quadTreeNorth.createChildrenNodes();
+        this._quadTreeNorth.segment.createPlainSegment();
+
+        for (let i = 0; i < this._quadTreeNorth.nodes.length; i++) {
+            this._quadTreeNorth.nodes[i].segment.createPlainSegment();
+        }
+
+        this._quadTreeSouth.createChildrenNodes();
+        this._quadTreeSouth.segment.createPlainSegment();
+
+        for (let i = 0; i < this._quadTreeSouth.nodes.length; i++) {
+            this._quadTreeSouth.nodes[i].segment.createPlainSegment();
+        }
+
+        this._preLoad();
+    }
+
+    _preLoad() {
+        this._skipPreRender = false;
+
+        // Zoom 0
+        this._quadTree.segment.passReady = true;
         this._quadTree.renderNode(true);
         this._normalMapCreator.drawSingle(this._quadTree.segment);
 
+        // Zoom 1
         for (let i = 0; i < this._quadTree.nodes.length; i++) {
-            this._quadTree.nodes[i].segment.createPlainSegment();
+            this._quadTree.nodes[i].segment.passReady = true;
             this._quadTree.nodes[i].renderNode(true);
             this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
         }
 
-        this._quadTreeNorth.createChildrenNodes();
-        this._quadTreeNorth.segment.createPlainSegment();
+        // Same for poles
+        this._quadTreeNorth.segment.passReady = true;
         this._quadTreeNorth.renderNode(true);
         this._normalMapCreator.drawSingle(this._quadTreeNorth.segment);
 
         for (let i = 0; i < this._quadTreeNorth.nodes.length; i++) {
-            this._quadTreeNorth.nodes[i].segment.createPlainSegment();
+            this._quadTreeNorth.nodes[i].segment.passReady = true;
             this._quadTreeNorth.nodes[i].renderNode(true);
             this._normalMapCreator.drawSingle(this._quadTreeNorth.nodes[i].segment);
         }
 
-        this._quadTreeSouth.createChildrenNodes();
-        this._quadTreeSouth.segment.createPlainSegment();
+        this._quadTreeSouth.segment.passReady = true;
         this._quadTreeSouth.renderNode(true);
         this._normalMapCreator.drawSingle(this._quadTreeSouth.segment);
 
         for (let i = 0; i < this._quadTreeSouth.nodes.length; i++) {
-            this._quadTreeSouth.nodes[i].segment.createPlainSegment();
+            this._quadTreeSouth.nodes[i].segment.passReady = true;
             this._quadTreeSouth.nodes[i].renderNode(true);
             this._normalMapCreator.drawSingle(this._quadTreeSouth.nodes[i].segment);
         }
@@ -924,6 +954,9 @@ export class Planet extends RenderNode {
                 if (li._attribution.length) {
                     html += "<li>" + li._attribution + "</li>";
                 }
+
+                this._preLoad();
+
             } else if (li._fading && li._fadingOpacity > 0) {
                 if (li.hasImageryTiles()) {
                     this.visibleTileLayers.push(li);

package/src/og/segment/Segment.js

@@ -199,6 +199,12 @@ class Segment {
          */
         this.terrainExists = false;
 
+        /**
+         * Means that tree passage reach the segment, and the segment terrain is ready.
+         * @type {boolean}
+         */
+        this.passReady = false;
+
         this.plainVertices = null;
         this.plainVerticesHigh = null;
         this.plainVerticesLow = null;