@openglobus/og 0.13.1 → 0.13.4

package/src/og/shaders/billboard.js

@@ -92,6 +92,14 @@ export function billboardPicking() {
                 vec4 posRTE = viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
                 vec4 projPos = projectionMatrix * posRTE;
                                 
+                float camSlope = dot(vec3(viewMatrix[0][2], viewMatrix[1][2], viewMatrix[2][2]), normalize(cameraPos));                
+                if(camSlope > 0.5) {
+                    float dist = dot(look, normalize(cameraPos));
+                    projPos.z += dist * 0.02;
+                }else{
+                    projPos.z += -(abs(projPos.z)) * 0.002;                 
+                }
+                
                 projPos.z += depthOffset + a_offset.z;
                                 
                 vec2 screenPos = project(projPos);

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;
+                }                
             }`
     });
 }
@@ -303,7 +284,6 @@ export function label_screen() {
             attribute float a_fontIndex;
 
             varying float v_outline;
-            varying float v_isOutlinePass;
             varying vec2 v_uv;
             varying vec4 v_rgba;
             varying float v_fontIndex;            
@@ -316,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);
@@ -336,7 +315,6 @@ export function label_screen() {
                 vec3 cameraPos = eyePositionHigh + eyePositionLow;
 
                 v_outline = a_outline;
-                v_isOutlinePass = float(isOutlinePass);
                 v_uv = vec2(a_texCoord.xy);
                 v_rgba = a_rgba;
                 v_fontIndex = a_fontIndex;
@@ -391,9 +369,9 @@ export function label_screen() {
 
             uniform sampler2D fontTextureArr[MAX_SIZE];
             uniform vec4 sdfParamsArr[MAX_SIZE];
+            uniform int isOutlinePass;
             
             varying float v_outline;
-            varying float v_isOutlinePass;
             varying vec2 v_uv;
             varying vec4 v_rgba;           
             varying float v_fontIndex;
@@ -464,18 +442,21 @@ export function label_screen() {
                 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);
             }`
     });
 }

package/types/entity/GeoObject.d.ts

@@ -91,6 +91,7 @@ export class GeoObject {
     setPitch(pitch: any): void;
     setRoll(roll: any): void;
     setScale(scale: any): void;
+    getScale(): any;
     /**
      * Removes geo object from handler.
      * @public