@openglobus/og 0.13.5 → 0.13.8

package/src/og/scene/Planet.js

@@ -88,7 +88,13 @@ const EVENT_NAMES = [
      * Triggered when all data is loaded
      * @event og.scene.Planet#rendercompleted
      */
-    "rendercompleted"
+    "rendercompleted",
+
+    /**
+     * Triggered when all data is loaded
+     * @event og.scene.Planet#terraincompleted
+     */
+    "terraincompleted"
 ];
 
 /**
@@ -221,7 +227,7 @@ export class Planet extends RenderNode {
          */
         this.maxCurrZoom = math.MIN;
 
-        this._viewExtent = null;
+        this._viewExtent = new Extent(new LonLat(180, 180), new LonLat(-180, -180));
 
         /**
          * @protected
@@ -428,6 +434,10 @@ export class Planet extends RenderNode {
         this.always = [];
 
         this._renderCompleted = false;
+        this._renderCompletedActivated = false;
+
+        this._terrainCompleted = false;
+        this._terrainCompletedActivated = false;
     }
 
     static getBearingNorthRotationQuat(cartesian) {
@@ -454,6 +464,7 @@ export class Planet extends RenderNode {
         this._minLodSize = minLodSize || this._minLodSize;
         this._curLodSize = currentLodSize || this._curLodSize;
         this._renderCompletedActivated = false;
+        this._terrainCompletedActivated = false;
     }
 
     /**
@@ -571,6 +582,7 @@ export class Planet extends RenderNode {
      */
     setHeightFactor(factor) {
         this._renderCompletedActivated = false;
+        this._terrainCompletedActivated = false;
 
         if (this._heightFactor !== factor) {
             this._heightFactor = factor;
@@ -593,6 +605,7 @@ export class Planet extends RenderNode {
      */
     setTerrain(terrain) {
         this._renderCompletedActivated = false;
+        this._terrainCompletedActivated = false;
 
         if (this._initialized) {
             this.memClear();
@@ -613,21 +626,36 @@ export class Planet extends RenderNode {
             this._quadTree.destroyBranches();
         }
 
-        if (terrain._geoid) {
-            if (!terrain._geoid.model) {
-                terrain._geoid.model = null;
-                Geoid.loadModel(terrain._geoid.src)
-                    .then((m) => {
-                        terrain.getGeoid().setModel(m);
-                        this._plainSegmentWorker.setGeoid(terrain.getGeoid());
-                    })
-                    .catch((err) => {
-                        console.log(err);
-                    });
-            } else {
-                this._plainSegmentWorker.setGeoid(terrain.getGeoid());
-            }
+        //if (terrain._geoid) {
+
+        if (terrain._geoid.model) {
+            this._plainSegmentWorker.setGeoid(terrain.getGeoid());
+            terrain._isReady = true;
+        } else {
+            Geoid.loadModel(terrain._geoid.src)
+                .then((m) => {
+                    terrain.getGeoid().setModel(m);
+                    this._plainSegmentWorker.setGeoid(terrain.getGeoid());
+                    terrain._isReady = true;
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
         }
+
+        // if (!terrain._geoid.model) {
+        //     Geoid.loadModel(terrain._geoid.src)
+        //         .then((m) => {
+        //             terrain.getGeoid().setModel(m);
+        //             this._plainSegmentWorker.setGeoid(terrain.getGeoid());
+        //         })
+        //         .catch((err) => {
+        //             console.log(err);
+        //         });
+        // } else {
+        //     this._plainSegmentWorker.setGeoid(terrain.getGeoid());
+        // }
+        //}
     }
 
     /**
@@ -677,10 +705,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
@@ -708,6 +736,7 @@ export class Planet extends RenderNode {
 
         this.renderer.events.on("resize", () => {
             this._renderCompletedActivated = false;
+            this._terrainCompletedActivated = false;
         });
 
         // Initialize texture coordinates buffer pool
@@ -917,15 +946,7 @@ export class Planet extends RenderNode {
             }
         }
 
-        if (this.renderer) {
-            if (html.length) {
-                this.renderer.div.attributions.style.display = "block";
-                this.renderer.div.attributions.innerHTML = "<ul>" + html + "</ul>";
-            } else {
-                this.renderer.div.attributions.style.display = "none";
-                this.renderer.div.attributions.innerHTML = "";
-            }
-        }
+        this._applyAttribution(html)
     }
 
     /**
@@ -971,17 +992,28 @@ export class Planet extends RenderNode {
             }
         }
 
+        this._applyAttribution(html);
+
+        this._sortLayers();
+    }
+
+    /**
+     * Apply to render list of layer attributions
+     * @private
+     */
+    _applyAttribution(html) {
         if (this.renderer) {
             if (html.length) {
-                this.renderer.div.attributions.style.display = "block";
-                this.renderer.div.attributions.innerHTML = "<ul>" + html + "</ul>";
+                html = "<ul>" + html + "</ul>";
+                if (this.renderer.div.attributions.innerHTML !== html) {
+                    this.renderer.div.attributions.style.display = "block";
+                    this.renderer.div.attributions.innerHTML = html;
+                }
             } else {
                 this.renderer.div.attributions.style.display = "none";
                 this.renderer.div.attributions.innerHTML = "";
             }
         }
-
-        this._sortLayers();
     }
 
     /**
@@ -1040,7 +1072,8 @@ export class Planet extends RenderNode {
         // clear first
         this._clearRenderedNodeList();
 
-        this._viewExtent = null;
+        this._viewExtent.southWest.set(180, 180);
+        this._viewExtent.northEast.set(-180, -180);
 
         this._visibleNodes = {};
         this._visibleNodesNorth = {};
@@ -1138,6 +1171,17 @@ export class Planet extends RenderNode {
             this._renderCompletedActivated = false;
         }
         this._renderCompleted = true;
+
+        if (this._terrainCompleted) {
+            if (!this._terrainCompletedActivated) {
+                this._terrainCompletedActivated = true;
+                this.events.dispatch(this.events.terraincompleted, true);
+            }
+        } else {
+            this._terrainCompletedActivated = false;
+        }
+
+        this._terrainCompleted = true;
     }
 
     /**
@@ -1789,4 +1833,20 @@ export class Planet extends RenderNode {
             }
         }
     }
+
+    async getHeightDefault(lonLat) {
+        return new Promise((resolve, reject) => {
+            this.terrain.getHeightAsync(lonLat.clone(), (alt) => {
+                resolve(alt);
+            });
+        });
+    }
+
+    async getHeightAboveELL(lonLat) {
+        return new Promise((resolve, reject) => {
+            this.terrain.getHeightAsync(lonLat.clone(), (alt) => {
+                resolve(alt + this.terrain.geoid.getHeightLonLat(lonLat));
+            });
+        });
+    }
 }

package/src/og/segment/Segment.js

@@ -1209,14 +1209,6 @@ class Segment {
     _addViewExtent() {
         var ext = this._extentLonLat;
 
-        if (!this.planet._viewExtent) {
-            this.planet._viewExtent = new Extent(
-                new LonLat(ext.southWest.lon, ext.southWest.lat),
-                new LonLat(ext.northEast.lon, ext.northEast.lat)
-            );
-            return;
-        }
-
         var viewExt = this.planet._viewExtent;
 
         if (ext.southWest.lon < viewExt.southWest.lon) {
@@ -1488,6 +1480,7 @@ class Segment {
 
                 if (!m.isReady) {
                     this.planet._renderCompleted = false;
+                    this.planet._terrainReady = false;
                 }
 
                 slice.append(li, m);

package/src/og/shaders/label.js

@@ -92,6 +92,7 @@ export function label_webgl2() {
 
                 if(a_texCoord.w == EMPTY) {
                     gl_Position = vec4(0.0);
+                    v_fontIndex = -1;
                     return;
                 }
                
@@ -154,7 +155,6 @@ export function label_webgl2() {
             uniform int isOutlinePass;
             
             precision highp float;
-            precision highp int;
 
             const int MAX_SIZE = 11;
 
@@ -207,51 +207,33 @@ export function label_webgl2() {
                 }
                 return median(msdf.r, msdf.g, msdf.b);
             }
-
-            vec4 getSDFParams() {
-                if(v_fontIndex == 0) {
-                    return sdfParamsArr[0];
-                } else if(v_fontIndex == 1){
-                    return sdfParamsArr[1];
-                } else if(v_fontIndex == 2){
-                    return sdfParamsArr[2];
-                } else if(v_fontIndex == 3){
-                    return sdfParamsArr[3];
-                } else if(v_fontIndex == 4){
-                    return sdfParamsArr[4];
-                } else if(v_fontIndex == 5){
-                    return sdfParamsArr[5];
-                } else if(v_fontIndex == 6){
-                    return sdfParamsArr[6];
-                } else if(v_fontIndex == 7){
-                    return sdfParamsArr[7];
-                } else if(v_fontIndex == 8){
-                    return sdfParamsArr[8];
-                } else if(v_fontIndex == 9){
-                    return sdfParamsArr[9];
-                } else if(v_fontIndex == 10){
-                    return sdfParamsArr[10];
-                }
-            }
                         
             void main () {
-
-                vec4 sdfParams = getSDFParams();
+            
+                if(v_fontIndex == -1) {
+                    return;
+                }
+                
+                vec4 sdfParams = sdfParamsArr[v_fontIndex];
                 float sd = getDistance();             
                 vec2 dxdy = fwidth(v_uv) * sdfParams.xy;
-                float dist = sd + min(0.001, 0.5 - 1.0 / sdfParams.w) - 0.5;
-                float opacity = clamp(dist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);
 
                 if(isOutlinePass == 0){                             
+                    float dist = sd + min(0.001, 0.5 - 1.0 / sdfParams.w) - 0.5;
+                    float opacity = clamp(dist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);
+                    if(opacity <= 0.1){
+                        discard;
+                    }
                     outScreen = vec4(v_rgba.rgb, opacity * v_rgba.a);
-                } else {                
-                    float strokeDist = sd + min(v_outline, 0.5 - 1.0 / sdfParams.w) - 0.5;
-                    float strokeAlpha = v_rgba.a * clamp(strokeDist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);                    
-                    if(strokeAlpha < 0.1){
+                } else {             
+                    float dist = sd + min(v_outline, 0.5 - 1.0 / sdfParams.w) - 0.5;
+                    float opacity = clamp(dist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);                       
+                    if(opacity <= 0.1){
                         discard;
                     }
-                    outScreen = v_rgba * strokeAlpha * (0.5 - opacity) * 2.0;
-                }                
+                    outScreen = vec4(v_rgba.rgb, opacity * v_rgba.a);
+                    //outScreen = v_rgba * strokeAlpha * (0.5 - opacity) * 2.0;
+                }         
             }`
     });
 }
@@ -326,6 +308,7 @@ export function label_screen() {
 
                 if(a_texCoord.w == EMPTY) {
                     gl_Position = vec4(0.0);
+                    v_fontIndex = -1.0;
                     return;
                 }
                
@@ -469,6 +452,10 @@ export function label_screen() {
 
                 fontIndex = v_fontIndex + 0.1;
                 
+                if(v_fontIndex < 0.0){
+                    return;
+                }
+                
                 vec4 sdfParams = getSDFParams();
                 float sd = getDistance();             
                 vec2 dxdy = fwidth(v_uv) * sdfParams.xy;
@@ -476,14 +463,14 @@ export function label_screen() {
                 float opacity = clamp(dist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);
 
                 if(isOutlinePass == 0){                             
-                    gl_FragColor = vec4(v_rgba.rgb, opacity * v_rgba.a);
+                    //gl_FragColor = vec4(v_rgba.rgb, opacity * v_rgba.a);
                 } else {                
                     float strokeDist = sd + min(v_outline, 0.5 - 1.0 / sdfParams.w) - 0.5;
                     float strokeAlpha = v_rgba.a * clamp(strokeDist * sdfParams.w / length(dxdy) + 0.5, 0.0, 1.0);                    
                     if(strokeAlpha < 0.1){
                         discard;
                     }
-                    gl_FragColor = v_rgba * strokeAlpha * (0.5 - opacity) * 2.0;
+                    //gl_FragColor = v_rgba * strokeAlpha * (0.5 - opacity) * 2.0;
                 }
             }`
     });
@@ -549,15 +536,16 @@ export function labelPicking() {
             void main() {
                 vec3 a_positions = a_positionsHigh + a_positionsLow;
                 vec3 cameraPos = eyePositionHigh + eyePositionLow;
-
+                v_rgba = a_rgba;
+                
                 if(a_texCoord.w == EMPTY) {
+                    v_rgba.a = 0.0;
                     gl_Position = vec4(0.0);
                     return;
                 }
 
                 vec3 look = a_positions - cameraPos;
                 float lookDist = length(look);
-                v_rgba = a_rgba;
                 if(opacity * step(lookDist, sqrt(dot(cameraPos,cameraPos) - planetRadius) + sqrt(dot(a_positions,a_positions) - planetRadius)) == 0.0){
                     return;
                 }
@@ -611,7 +599,7 @@ export function labelPicking() {
 
                 vec4 color = v_rgba;
                 if (color.a < 0.05) {
-                    discard;
+                    return;
                 }
 
                 gl_FragColor = vec4(v_rgba.rgb, v_rgba.a);