@openglobus/og 0.11.7 → 0.12.3

package/src/og/layer/GeoTexture2d.js

@@ -67,14 +67,10 @@ class GeoTexture2d extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
         
@@ -117,14 +113,10 @@ class GeoTexture2d extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 

package/src/og/layer/GeoVideo.js

@@ -211,14 +211,10 @@ class GeoVideo extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 
@@ -265,14 +261,10 @@ class GeoVideo extends BaseGeoImage {
         var sha = sh.attributes,
             shu = sh.uniforms;
 
-        var tr = this.transparentColor[0],
-            tg = this.transparentColor[1],
-            tb = this.transparentColor[2];
-
         gl.disable(gl.CULL_FACE);
 
         f.bindOutputTexture(this._materialTexture);
-        gl.clearColor(tr, tg, tb, 0.0);
+        gl.clearColor(0.0, 0.0, 0.0, 0.0);
         gl.clear(gl.COLOR_BUFFER_BIT);
         gl.bindBuffer(gl.ARRAY_BUFFER, creator._texCoordsBuffer);
 

package/src/og/layer/KML.js

@@ -3,6 +3,7 @@
  */
 
 "use strict";
+import { Billboard } from "../entity/Billboard.js";
 import { Entity } from "../entity/Entity.js";
 import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
@@ -40,12 +41,14 @@ export class KML extends Vector {
      */
     _extractCoordonatesFromKml(xmlDoc) {
         const raw = Array.from(xmlDoc.getElementsByTagName("coordinates"));
-        const coordinates = raw.map((item) =>
-            item.textContent
-                .trim()
-                .replace(/\n/g, " ")
-                .split(" ")
-                .map((co) => co.split(",").map(parseFloat))
+        const rawText = raw.map(item => item.textContent.trim());
+        const coordinates = rawText.map(item => 
+            item
+             .replace(/\n/g, " ")
+             .replace(/\t/g, " ")
+             .replace(/ +/g," ")
+             .split(" ")
+             .map((co) => co.split(",").map(parseFloat))
         );
         return coordinates;
     }
@@ -121,15 +124,17 @@ export class KML extends Vector {
     /**
      * @public
      * @param {File[]} kmls
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
      * @returns {Promise<{entities: Entity[], extent: Extent}>}
      */
-    async addKmlFromFiles(kmls) {
+    async addKmlFromFiles(kmls, color = null, billboard = null) {
         const kmlObjs = await Promise.all(kmls.map(this._getXmlContent));
         const coordonates = kmlObjs.map(this._extractCoordonatesFromKml);
         const { entities, extent } = this._convertCoordonatesIntoEntities(
             coordonates,
-            this._color,
-            this._billboard
+            color || this._color,
+            billboard || this._billboard
         );
         this._extent = this._expandExtents(this._extent, extent);
         entities.forEach(this.add.bind(this));
@@ -168,15 +173,17 @@ export class KML extends Vector {
     /**
      * @public
      * @param {string} url - Url of the KML to display. './myFile.kml' or 'http://mySite/myFile.kml' for example.
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
      * @returns {Promise<{entities: Entity[], extent: Extent}>}
      */
-    async addKmlFromUrl(url) {
+    async addKmlFromUrl(url, color = null, billboard = null) {
         const kml = await this._getKmlFromUrl(url);
         const coordonates = this._extractCoordonatesFromKml(kml);
         const { entities, extent } = this._convertCoordonatesIntoEntities(
             [coordonates],
-            this._color,
-            this._billboard
+            color || this._color,
+            billboard || this._billboard
         );
         this._extent = this._expandExtents(this._extent, extent);
         entities.forEach(this.add.bind(this));

package/src/og/layer/Layer.js

@@ -22,7 +22,6 @@ export const FADING_FACTOR = 0.29;
  * @param {String} [name="noname"] - Layer name.
  * @param {Object} [options] - Layer options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
@@ -30,11 +29,7 @@ export const FADING_FACTOR = 0.29;
  * @param {boolean} [options.visibility=true] - Layer visibility.
  * @param {boolean} [options.isSRGB=false] - Layer image webgl nternal format.
  * @param {Extent} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
- * @param {Vec3} [options.ambient=[0.1, 0.1, 0.1]] - Ambient RGB color.
- * @param {Vec3} [options.diffuse=[0.9, 0.9, 0.9]] - Diffuse RGB color.
- * @param {Vec3} [options.specular=[0.00025, 0.00015, 0.0001]] - Specular RGB color.
  * @param {string} [options.textureFilter="anisotropic"] - Image texture filter. Available values: "nearest", "linear", "mipmap" and "anisotropic".
- * @param {Number} [options.shininess=100] - Shininess.
  *
  * @fires og.Layer#visibilitychange
  * @fires og.Layer#add
@@ -86,13 +81,6 @@ class Layer {
          */
         this._opacity = options.opacity || 1.0;
 
-        /**
-         * Transparent RGB color mask.
-         * @public
-         * @type {Array.<number>} - (exactly 3 entries)
-         */
-        this.transparentColor = options.transparentColor || [-1, -1, -1];
-
         /**
          * Minimal zoom level when layer is visibile.
          * @public
@@ -107,16 +95,6 @@ class Layer {
          */
         this.maxZoom = options.maxZoom || 50;
 
-        /**
-         * Layer light material parameters.
-         * @public
-         * @type {Object}
-         */
-        this.ambient = utils.createColorRGB(options.ambient, new Vec3(0.2, 0.2, 0.2));
-        this.diffuse = utils.createColorRGB(options.diffuse, new Vec3(0.8, 0.8, 0.8));
-        this.specular = utils.createColorRGB(options.specular, new Vec3(0.0003, 0.0003, 0.0003));
-        this.shininess = options.shininess || 20.0;
-
         /**
          * Planet node.
          * @protected
@@ -519,7 +497,10 @@ class Layer {
                 if (this._isBaseLayer && visibility) {
                     this._planet.setBaseLayer(this);
                 }
-                this._planet.updateVisibleLayers();
+                this._planet.updateVisibleLayers();
+                if (visibility) {
+                    this._planet._preLoad();
+                }
             }
             this.events.dispatch(this.events.visibilitychange, this);
         }

package/src/og/layer/WMS.js

@@ -17,7 +17,6 @@ import { XYZ } from "./XYZ.js";
  * @param {string} name - Layer name.
  * @param {Object} options - Options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
@@ -36,7 +35,6 @@ import { XYZ } from "./XYZ.js";
  *     opacity: 0.5,
  *     zIndex: 50,
  *     attribution: 'USA states - geoserver WMS example',
- *     transparentColor: [1.0, 1.0, 1.0],
  *     version: "1.1.1",
  *     visibility: false }
  * );

package/src/og/layer/XYZ.js

@@ -17,7 +17,6 @@ import { RENDERING } from "../quadTree/quadTree.js";
  * @param {string} name - Layer name.
  * @param {Object} options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {Array.<string>} [options.subdomains=['a','b','c']] - Subdomains of the tile service.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
@@ -51,8 +50,6 @@ class XYZ extends Layer {
 
         this.events.registerNames(EVENT_NAMES);
 
-        this.transparentColor = options.transparentColor || [-1, -1, -1];
-
         /**
          * Tile url source template.
          * @public
@@ -103,8 +100,10 @@ class XYZ extends Layer {
      * Abort loading tiles.
      * @public
      */
-    abortLoading() {
-        this._planet._tileLoader.abort();
+    abortLoading() {
+        if (this._planet) {
+            this._planet._tileLoader.abort();
+        }
     }
 
     /**
@@ -152,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;
 
@@ -238,9 +238,6 @@ class XYZ extends Layer {
         if (material.isReady) {
             return material.texOffset;
         } else {
-            // if (material.loadingAttempts > 20) {
-            //     debugger;
-            // }
 
             let segment = material.segment,
                 pn = segment.node,
@@ -249,34 +246,35 @@ 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 (pn.segment.tileZoom === maxNativeZoom) {
-                material.textureNotExists();
-            } else if (material.segment.tileZoom <= maxNativeZoom) {
-                !material.isLoading && !material.isReady && this.loadMaterial(material);
-            } else {
-                let pn = segment.node;
-                while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
-                    pn = pn.parentNode;
-                }
-                let pnm = pn.segment.materials[material.layer._id];
-                if (pnm) {
-                    !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+
+            if (segment.passReady) {
+                let maxNativeZoom = material.layer.maxNativeZoom;
+                if (pn.segment.tileZoom === maxNativeZoom) {
+                    material.textureNotExists();
+                } else if (material.segment.tileZoom <= maxNativeZoom) {
+                    !material.isLoading && !material.isReady && this.loadMaterial(material);
                 } else {
-                    pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
-                        pn.segment
-                    );
-                    this.loadMaterial(pnm, true);
-                }
+                    let pn = segment.node;
+                    while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
+                        pn = pn.parentNode;
+                    }
+                    let pnm = pn.segment.materials[material.layer._id];
+                    if (pnm) {
+                        !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+                    } else {
+                        pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
+                            pn.segment
+                        );
+                        this.loadMaterial(pnm, true);
+                    }
+                }
             }
 
             if (notEmpty) {
@@ -314,7 +312,7 @@ class XYZ extends Layer {
 
         material.isReady = false;
         material.textureExists = false;
-        material.isLoading = false;
+        material.isLoading = false;        
     }
 
     /**

package/src/og/math/Vec3.js

@@ -699,8 +699,24 @@ export class Vec3 {
      * @param {Vec3} point3 - Distant point.
      * @returns {number} -
      */
-    distance(point3) {
-        return Vec3.sub(this, point3).length();
+    distance(point3) {
+        let dx = this.x - point3.x,
+            dy = this.y - point3.y,
+            dz = this.z - point3.z;
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+    }
+
+    /**
+     * Gets square distance to point.
+     * @public
+     * @param {Vec3} point3 - Distant point.
+     * @returns {number} -
+     */
+    distance2(point3) {
+        let dx = this.x - point3.x,
+            dy = this.y - point3.y,
+            dz = this.z - point3.z;
+        return dx * dx + dy * dy + dz * dz;
     }
 
     /**

package/src/og/quadTree/Node.js

@@ -7,7 +7,6 @@ import { Vec3 } from "../math/Vec3.js";
 import { MAX_LAT } from "../mercator.js";
 import { EPSG3857 } from "../proj/EPSG3857.js";
 import { EPSG4326 } from "../proj/EPSG4326.js";
-import { MAX_NORMAL_ZOOM } from "../segment/Segment.js";
 import { getMatrixSubArray, getMatrixSubArrayBoundsExt } from "../utils/shared.js";
 import {
     COMSIDE,
@@ -30,8 +29,6 @@ import {
     WALKTHROUGH
 } from "./quadTree.js";
 
-const VISIBLE_HEIGHT = 1400000.0;
-
 let _tempHigh = new Vec3(),
     _tempLow = new Vec3();
 
@@ -67,6 +64,7 @@ class Node {
 
     constructor(SegmentPrototype, planet, partId, parent, id, tileZoom, extent) {
         this.SegmentPrototype = SegmentPrototype;
+        planet._createdNodesCount++;
         this.planet = planet;
         this.parentNode = parent;
         this.partId = partId;
@@ -84,7 +82,6 @@ class Node {
         this._cameraInside = false;
         this.inFrustum = 0;
         this.createBounds();
-        this.planet._createdNodesCount++;
     }
 
     createChildrenNodes() {
@@ -102,45 +99,10 @@ class Node {
         var c = new LonLat(sw.lon + size_x, sw.lat + size_y);
         var 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))
-        );
-
-        nd[SW] = new Node(
-            this.SegmentPrototype,
-            p,
-            SW,
-            this,
-            id,
-            z,
-            new Extent(new LonLat(sw.lon, sw.lat), c)
-        );
-
-        nd[SE] = new Node(
-            this.SegmentPrototype,
-            p,
-            SE,
-            this,
-            id,
-            z,
-            new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y))
-        );
+        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)));
+        nd[SW] = new Node(this.SegmentPrototype, p, SW, this, id, z, new Extent(new LonLat(sw.lon, sw.lat), c));
+        nd[SE] = new Node(this.SegmentPrototype, p, SE, this, id, z, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)));
     }
 
     createBounds() {
@@ -153,6 +115,15 @@ class Node {
         } else {
             seg.createBoundsByParent();
         }
+
+        let x = seg.bsphere.center.x,
+            y = seg.bsphere.center.y,
+            z = seg.bsphere.center.z;
+
+        let length = 1.0 / Math.sqrt(x * x + y * y + z * z);
+        seg.centerNormal.x = x * length;
+        seg.centerNormal.y = y * length;
+        seg.centerNormal.z = z * length;
     }
 
     getState() {
@@ -204,15 +175,10 @@ class Node {
     }
 
     renderTree(cam, maxZoom, terrainReadySegment, stopLoading) {
-        if (
-            this.planet._renderedNodes.length >= MAX_RENDERED_NODES ||
-            this.planet._nodeCounterError_ > 2000
-        ) {
+        if (this.planet._renderedNodes.length >= MAX_RENDERED_NODES) {
             return;
         }
 
-        this.planet._nodeCounterError_++;
-
         this.state = WALKTHROUGH;
 
         this.neighbors[0] = null;
@@ -282,27 +248,49 @@ class Node {
         if (this.inFrustum || this._cameraInside || seg.tileZoom < 3) {
             let h = cam._lonLat.height;
 
-            let altVis =
-                cam.eye.distance(seg.bsphere.center) - seg.bsphere.radius <
-                VISIBLE_DISTANCE * Math.sqrt(h) ||
+            let eye = cam.eye;
+            let horizonDist = eye.length2() - this.planet.ellipsoid._b2;
+
+            let altVis = seg.tileZoom > 19 ||
                 (seg.tileZoom < 4 && !seg.terrainReady) ||
                 seg.tileZoom < 2;
 
+            if (h > 21000) {
+                altVis = altVis || eye.distance2(seg._sw) < horizonDist
+                    || eye.distance2(seg._nw) < horizonDist
+                    || eye.distance2(seg._ne) < horizonDist
+                    || eye.distance2(seg._se) < horizonDist;
+            } else {
+                altVis = altVis || cam.eye.distance(seg.bsphere.center) - seg.bsphere.radius < VISIBLE_DISTANCE * Math.sqrt(h);
+            }
+
             if ((this.inFrustum && (altVis || h > 10000.0)) || this._cameraInside) {
                 seg._collectVisibleNodes();
             }
 
             if (seg.tileZoom < 2 && seg.normalMapReady) {
                 this.traverseNodes(cam, maxZoom, terrainReadySegment, stopLoading);
-            } else if ((!maxZoom && seg.acceptForRendering(cam)) || seg.tileZoom === maxZoom || !altVis && maxZoom) {
-                this.prepareForRendering(cam, altVis, this.inFrustum, terrainReadySegment, stopLoading);
-            } else if (seg.tileZoom < planet.terrain._maxNodeZoom && seg.terrainReady) {
-                // Deleting terrainReady here, you have to remove
-                // this.appliedTerrainNodeId !== pn.nodeId in whileTerrainLoading,
-                // also have to fix createBoundsByParent(*)
+            } else if (seg.terrainReady && (
+                !maxZoom && cam.projectedSize(seg.bsphere.center, seg._plainRadius) < planet._lodSize ||
+                maxZoom && ((seg.tileZoom === maxZoom) || !altVis))) {
+
+                if (altVis) {
+                    seg.passReady = true;
+                    this.renderNode(this.inFrustum, !this.inFrustum, terrainReadySegment, stopLoading);
+                } else {
+                    this.state = NOTRENDERING;
+                }
+
+            } else if (
+                seg.terrainReady &&
+                seg.tileZoom < planet.terrain._maxNodeZoom &&
+                (!maxZoom || maxZoom && cam.projectedSize(seg.bsphere.center, seg.bsphere.radius) > this.planet._maxLodSize)) {
                 this.traverseNodes(cam, maxZoom, seg, stopLoading);
+            } else if (altVis) {
+                seg.passReady = maxZoom ? seg.terrainReady : false;
+                this.renderNode(this.inFrustum, !this.inFrustum, terrainReadySegment, stopLoading);
             } else {
-                this.prepareForRendering(cam, altVis, this.inFrustum, terrainReadySegment, stopLoading);
+                this.state = NOTRENDERING;
             }
         } else {
             this.state = NOTRENDERING;
@@ -322,39 +310,6 @@ class Node {
         n[3].renderTree(cam, maxZoom, terrainReadySegment, stopLoading);
     }
 
-    prepareForRendering(
-        cam,
-        altVis,
-        inFrustum,
-        terrainReadySegment,
-        stopLoading
-    ) {
-        let seg = this.segment;
-
-        if (cam._lonLat.height < VISIBLE_HEIGHT) {
-            if (altVis) {
-                this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
-            } else {
-                this.state = NOTRENDERING;
-            }
-        } else {
-            if (seg.tileZoom < 2) {
-                this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
-            } else if (seg.tileZoom > MAX_NORMAL_ZOOM) {
-                this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
-            } else if (
-                seg._swNorm.dot(cam._n) > 0.0 ||
-                seg._nwNorm.dot(cam._n) > 0.0 ||
-                seg._neNorm.dot(cam._n) > 0.0 ||
-                seg._seNorm.dot(cam._n) > 0.0
-            ) {
-                this.renderNode(inFrustum, !inFrustum, terrainReadySegment, stopLoading);
-            } else {
-                this.state = NOTRENDERING;
-            }
-        }
-    }
-
     renderNode(inFrustum, onlyTerrain, terrainReadySegment, stopLoading) {
         var seg = this.segment;
 
@@ -376,7 +331,7 @@ class Node {
         }
 
         // Create normal map texture
-        if (seg.planet.lightEnabled && !seg.normalMapReady && !seg.parentNormalMapReady) {
+        if (seg.planet.lightEnabled && !seg.normalMapReady /*&& !seg.parentNormalMapReady*/) {
             this.whileNormalMapCreating();
         }
 

package/src/og/quadTree/quadTree.js

@@ -1,7 +1,7 @@
 "use strict";
 
 export const VISIBLE_DISTANCE = 3570.0;
-export const MAX_RENDERED_NODES = 700;
+export const MAX_RENDERED_NODES = 1000;
 
 export const NW = 0;
 export const NE = 1;