@openglobus/og 0.13.0 → 0.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.13.0",
+  "version": "0.13.3",
   "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"

package/src/og/entity/LabelHandler.js

@@ -252,10 +252,9 @@ class LabelHandler extends BillboardHandler {
 
         gl.drawArrays(gl.TRIANGLES, 0, this._vertexBuffer.numItems);
 
-        gl.depthFunc(gl.EQUAL);
-
         //
         // no outline PASS
+        gl.depthFunc(gl.EQUAL);
         gl.uniform1i(shu.isOutlinePass, 0);
         gl.uniform1f(shu.depthOffset, ec.polygonOffsetUnits + window.LABEL_DEPTH_OFFSET);
 

package/src/og/shaders/drawnode.js

@@ -158,7 +158,7 @@ export function drawnode_screen_wl() {
             varying vec4 vTextureCoord;
             varying vec2 vGlobalTextureCoord;
             varying vec4 v_vertex;
-            varying float v_height;
+            varying float v_height;           
 
             void main(void) {
 
@@ -209,27 +209,31 @@ export function drawnode_screen_wl() {
 
             ${DEF_BLEND_WEBGL1}
 
+            float shininess;
+            float reflection;
+            float diffuseLightWeighting;
+            vec3 night;
 
             void main(void) {
-
+            
                 float overGround = 1.0 - step(0.1, v_height);
                 vec3 normal = normalize(normalMatrix * ((texture2D(uNormalMap, vTextureCoord.zw).rgb - 0.5) * 2.0));
                 vec3 lightDirection = normalize(lightsPositions[0].xyz - v_vertex.xyz * lightsPositions[0].w);
                 vec3 eyeDirection = normalize(-v_vertex.xyz);
                 vec3 reflectionDirection = reflect(-lightDirection, normal);
                 vec4 nightImageColor = texture2D( nightTexture, vGlobalTextureCoord.st );
-                float shininess = texture2D( specularTexture, vGlobalTextureCoord.st ).r * 255.0 * overGround;
-                float reflection = max( dot(reflectionDirection, eyeDirection), 0.0);
-                float diffuseLightWeighting = max(dot(normal, lightDirection), 0.0);
-                vec3 night = nightStep * (0.3 - diffuseLightWeighting) * nightImageColor.rgb;
+                shininess = texture2D( specularTexture, vGlobalTextureCoord.st ).r * 255.0 * overGround;
+                reflection = max( dot(reflectionDirection, eyeDirection), 0.0);
+                diffuseLightWeighting = max(dot(normal, lightDirection), 0.0);
+                night = nightStep * (.18 - diffuseLightWeighting * 3.0) * nightImageColor.rgb;
                 night *= overGround * step(0.0, night);
 
                 vec3 spec = specular.rgb * pow( reflection, specular.w) * shininess;
-                vec3 lightWeighting = ambient + diffuse * diffuseLightWeighting + spec + night;
+                vec4 lightWeighting = vec4(ambient + diffuse * diffuseLightWeighting + spec + night, 1.0);
 
                 gl_FragColor = texture2D( defaultTexture, vTextureCoord.xy );
                 if( samplerCount == 0 ) {
-                    gl_FragColor *= vec4(lightWeighting, 1);
+                    gl_FragColor *= lightWeighting;
                     return;
                 }
     
@@ -237,30 +241,30 @@ export function drawnode_screen_wl() {
 
                 blend(gl_FragColor, samplerArr[0], tileOffsetArr[0], layerOpacityArr[0]);
                 if( samplerCount == 1 ) {
-                    gl_FragColor *= vec4(lightWeighting, 1);
+                    gl_FragColor *= lightWeighting;
                     return;
                 }
 
                 blend(gl_FragColor, samplerArr[1], tileOffsetArr[1], layerOpacityArr[1]);
                 if( samplerCount == 2 ) {
-                    gl_FragColor *= vec4(lightWeighting, 1);
+                    gl_FragColor *= lightWeighting;
                     return;
                 }
 
                 blend(gl_FragColor, samplerArr[2], tileOffsetArr[2], layerOpacityArr[2]);
                 if( samplerCount == 3 ) {
-                    gl_FragColor *= vec4(lightWeighting, 1);
+                    gl_FragColor *= lightWeighting;
                     return;
                 }
 
                 blend(gl_FragColor, samplerArr[3], tileOffsetArr[3], layerOpacityArr[3]);
                 if( samplerCount == 4 ) {
-                    gl_FragColor *= vec4(lightWeighting, 1);
+                    gl_FragColor *= lightWeighting;
                     return;
                 }
 
                 blend(gl_FragColor, samplerArr[4], tileOffsetArr[4], layerOpacityArr[4]);
-                gl_FragColor *= vec4(lightWeighting, 1);
+                gl_FragColor *= lightWeighting;
             }`
     });
 }

package/src/og/shaders/label.js

@@ -65,7 +65,6 @@ export function label_webgl2() {
             flat out int v_fontIndex;            
             out vec4 v_outlineColor;
             flat out float v_outline;
-            flat out int v_isOutlinePass;
 
             uniform vec2 viewport;
             uniform mat4 viewMatrix;
@@ -75,7 +74,6 @@ export function label_webgl2() {
             uniform float planetRadius;
             uniform vec3 scaleByDistance;
             uniform float opacity;
-            uniform int isOutlinePass;
             uniform float depthOffset;
 
             const vec3 ZERO3 = vec3(0.0);
@@ -95,7 +93,6 @@ export function label_webgl2() {
                 vec3 cameraPos = eyePositionHigh + eyePositionLow;
 
                 v_outline = a_outline;
-                v_isOutlinePass = isOutlinePass;
 
                 v_fontIndex = int(a_fontIndex);
                 v_uv = vec2(a_texCoord.xy);
@@ -138,6 +135,8 @@ export function label_webgl2() {
         fragmentShader:
             `#version 300 es
 
+            uniform int isOutlinePass;
+            
             precision highp float;
             precision highp int;
 
@@ -150,7 +149,6 @@ export function label_webgl2() {
 
             uniform sampler2D fontTextureArr[MAX_SIZE];
             uniform vec4 sdfParamsArr[MAX_SIZE];
-            flat in int v_isOutlinePass;
 
             flat in int v_fontIndex;
             in vec2 v_uv;
@@ -219,42 +217,25 @@ export function label_webgl2() {
                     return sdfParamsArr[10];
                 }
             }
-            
-            // void main () {
-            //
-            //     float sd = getDistance();
-            //    
-            //     vec4 sdfParams = getSDFParams();
-            //    
-            //     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);
-            //    
-            //     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.01) {
-            //         discard;
-            //     } 
-            //    
-            //     outScreen = v_rgba * opacity * v_rgba.a + v_outlineColor * v_outlineColor.a * strokeAlpha * (1.0 - opacity);
-            // }
-            
+                        
             void main () {
 
                 vec4 sdfParams = getSDFParams();
-                
+                float sd = getDistance();             
                 vec2 dxdy = fwidth(v_uv) * sdfParams.xy;
-                float dist = getDistance() + min(v_isOutlinePass == 0 ? 0.001 : v_outline, 0.5 - 1.0 / sdfParams.w) - 0.5;
+                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);
 
-                vec4 color = v_rgba;
-                color.a *= opacity;
-                if (color.a < 0.01) {
-                    discard;
-                }
-
-                outScreen = vec4(v_rgba.rgb, opacity * v_rgba.a);
+                if(isOutlinePass == 0){                             
+                    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){
+                        discard;
+                    }
+                    outScreen = v_rgba * strokeAlpha * (0.5 - opacity) * 2.0;
+                }                
             }`
     });
 }
@@ -302,12 +283,10 @@ export function label_screen() {
             attribute vec4 a_rgba;
             attribute float a_fontIndex;
 
+            varying float v_outline;
             varying vec2 v_uv;
             varying vec4 v_rgba;
             varying float v_fontIndex;            
-            varying vec4 v_outlineColor;
-            varying float v_outline;
-            varying float v_isOutlinePass;
 
             uniform vec2 viewport;
             uniform mat4 viewMatrix;
@@ -317,7 +296,6 @@ export function label_screen() {
             uniform float planetRadius;
             uniform vec3 scaleByDistance;
             uniform float opacity;
-            uniform int isOutlinePass;
             uniform float depthOffset;
 
             const vec3 ZERO3 = vec3(0.0);
@@ -337,13 +315,12 @@ export function label_screen() {
                 vec3 cameraPos = eyePositionHigh + eyePositionLow;
 
                 v_outline = a_outline;
-                v_isOutlinePass = float(isOutlinePass);
-
-                v_fontIndex = a_fontIndex;
                 v_uv = vec2(a_texCoord.xy);
+                v_rgba = a_rgba;
+                v_fontIndex = a_fontIndex;
+                
                 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;
@@ -392,16 +369,14 @@ export function label_screen() {
 
             uniform sampler2D fontTextureArr[MAX_SIZE];
             uniform vec4 sdfParamsArr[MAX_SIZE];
+            uniform int isOutlinePass;
             
-            varying float v_isOutlinePass;
-
-            varying float v_fontIndex;
+            varying float v_outline;
             varying vec2 v_uv;
             varying vec4 v_rgba;           
-
-            varying float v_outline;
-
-            varying vec3 v_pickingColor;
+            varying float v_fontIndex;
+            
+            float fontIndex;
 
             float median(float r, float g, float b) {
                 return max(min(r, g), min(max(r, g), b));
@@ -409,27 +384,27 @@ export function label_screen() {
 
             float getDistance() {
                 vec3 msdf;
-                if(v_fontIndex >= 0.0 && v_fontIndex < 1.0) {
+                if(fontIndex >= 0.0 && fontIndex < 1.0) {
                     msdf = texture2D(fontTextureArr[0], v_uv).rgb;
-                } else if(v_fontIndex >= 1.0 && v_fontIndex < 2.0){
+                } else if(fontIndex >= 1.0 && fontIndex < 2.0){
                     msdf = texture2D(fontTextureArr[1], v_uv).rgb;
-                } else if(v_fontIndex >= 2.0 && v_fontIndex < 3.0){
+                } else if(fontIndex >= 2.0 && fontIndex < 3.0){
                     msdf = texture2D(fontTextureArr[2], v_uv).rgb;
-                } else if(v_fontIndex >= 3.0 && v_fontIndex < 4.0){
+                } else if(fontIndex >= 3.0 && fontIndex < 4.0){
                     msdf = texture2D(fontTextureArr[3], v_uv).rgb;
-                } else if(v_fontIndex >= 4.0 && v_fontIndex < 5.0){
+                } else if(fontIndex >= 4.0 && fontIndex < 5.0){
                     msdf = texture2D(fontTextureArr[4], v_uv).rgb;
-                } else if(v_fontIndex >= 5.0 && v_fontIndex < 6.0){
+                } else if(fontIndex >= 5.0 && fontIndex < 6.0){
                     msdf = texture2D(fontTextureArr[5], v_uv).rgb;
-                } else if(v_fontIndex >= 6.0 && v_fontIndex < 7.0){
+                } else if(fontIndex >= 6.0 && fontIndex < 7.0){
                     msdf = texture2D(fontTextureArr[6], v_uv).rgb;
-                } else if(v_fontIndex >= 7.0 && v_fontIndex < 8.0){
+                } else if(fontIndex >= 7.0 && fontIndex < 8.0){
                     msdf = texture2D(fontTextureArr[7], v_uv).rgb;
-                } else if(v_fontIndex >= 8.0 && v_fontIndex < 9.0){
+                } else if(fontIndex >= 8.0 && fontIndex < 9.0){
                     msdf = texture2D(fontTextureArr[8], v_uv).rgb;
-                } else if(v_fontIndex >= 9.0 && v_fontIndex < 10.0){
+                } else if(fontIndex >= 9.0 && fontIndex < 10.0){
                     msdf = texture2D(fontTextureArr[9], v_uv).rgb;
-                } else if(v_fontIndex >= 10.0 && v_fontIndex < 11.0){
+                } else if(fontIndex >= 10.0 && fontIndex < 11.0){
                     msdf = texture2D(fontTextureArr[10], v_uv).rgb;
                 }
                 return median(msdf.r, msdf.g, msdf.b);
@@ -437,46 +412,51 @@ export function label_screen() {
 
 
             vec4 getSDFParams() {
-                if(v_fontIndex >= 0.0 && v_fontIndex < 1.0) {
+                if(fontIndex >= 0.0 && fontIndex < 1.0) {
                     return sdfParamsArr[0];
-                } else if(v_fontIndex >= 1.0 && v_fontIndex < 2.0){
+                } else if(fontIndex >= 1.0 && fontIndex < 2.0){
                     return sdfParamsArr[1];
-                } else if(v_fontIndex >= 2.0 && v_fontIndex < 3.0){
+                } else if(fontIndex >= 2.0 && fontIndex < 3.0){
                     return sdfParamsArr[2];
-                } else if(v_fontIndex >= 3.0 && v_fontIndex < 4.0){
+                } else if(fontIndex >= 3.0 && fontIndex < 4.0){
                     return sdfParamsArr[3];
-                } else if(v_fontIndex >= 4.0 && v_fontIndex < 5.0){
+                } else if(fontIndex >= 4.0 && fontIndex < 5.0){
                     return sdfParamsArr[4];
-                } else if(v_fontIndex >= 5.0 && v_fontIndex < 6.0){
+                } else if(fontIndex >= 5.0 && fontIndex < 6.0){
                     return sdfParamsArr[5];
-                } else if(v_fontIndex >= 6.0 && v_fontIndex < 7.0){
+                } else if(fontIndex >= 6.0 && fontIndex < 7.0){
                     return sdfParamsArr[6];
-                } else if(v_fontIndex >= 7.0 && v_fontIndex < 8.0){
+                } else if(fontIndex >= 7.0 && fontIndex < 8.0){
                     return sdfParamsArr[7];
-                } else if(v_fontIndex >= 8.0 && v_fontIndex < 9.0){
+                } else if(fontIndex >= 8.0 && fontIndex < 9.0){
                     return sdfParamsArr[8];
-                } else if(v_fontIndex >= 9.0 && v_fontIndex < 10.0){
+                } else if(fontIndex >= 9.0 && fontIndex < 10.0){
                     return sdfParamsArr[9];
-                } else if(v_fontIndex >= 10.0 && v_fontIndex < 11.0){
+                } else if(fontIndex >= 10.0 && fontIndex < 11.0){
                     return sdfParamsArr[10];
                 }
             }
                     
             void main () {
 
-                vec4 sdfParams = getSDFParams();
+                fontIndex = v_fontIndex + 0.1;
                 
+                vec4 sdfParams = getSDFParams();
+                float sd = getDistance();             
                 vec2 dxdy = fwidth(v_uv) * sdfParams.xy;
-                float dist = getDistance() + min(v_isOutlinePass == 0.0 ? 0.001 : v_outline, 0.5 - 1.0 / sdfParams.w) - 0.5;
+                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);
 
-                vec4 color = v_rgba;
-                color.a *= opacity;
-                if (color.a < 0.01) {
-                    discard;
+                if(isOutlinePass == 0){                             
+                    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 = vec4(v_rgba.rgb, opacity * v_rgba.a);
             }`
     });
 }