@openglobus/og - npm Package Compare versions

Comparing version 0.13.0 to 0.13.1

package.json

 {
   "name": "@openglobus/og",
-  "version": "0.13.0",
+  "version": "0.13.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.",
@@ -5,0 +5,0 @@ "directories": {

src/og/shaders/label.js

@@ -305,8 +305,7 @@ /**
 
+            varying float v_outline;
+            varying float v_isOutlinePass;
             varying vec2 v_uv;
             varying vec4 v_rgba;
             varying float v_fontIndex;            
-            varying vec4 v_outlineColor;
-            varying float v_outline;
-            varying float v_isOutlinePass;
 
@@ -342,8 +341,8 @@ uniform vec2 viewport;
                 v_isOutlinePass = float(isOutlinePass);
-
+                v_uv = vec2(a_texCoord.xy);
+                v_rgba = a_rgba;
                 v_fontIndex = a_fontIndex;
-                v_uv = vec2(a_texCoord.xy);
+                
                 vec3 look = a_positions - cameraPos;
                 float lookDist = length(look);
-                v_rgba = a_rgba;
                 
@@ -398,12 +397,10 @@ if(opacity * step(lookDist, sqrt(dot(cameraPos,cameraPos) - planetRadius) + sqrt(dot(a_positions,a_positions) - planetRadius)) == 0.0){
             
+            varying float v_outline;
             varying float v_isOutlinePass;
-
-            varying float v_fontIndex;
             varying vec2 v_uv;
             varying vec4 v_rgba;           
+            varying float v_fontIndex;
+            
+            float fontIndex;
 
-            varying float v_outline;
-
-            varying vec3 v_pickingColor;
-
             float median(float r, float g, float b) {
@@ -415,23 +412,23 @@ return max(min(r, g), min(max(r, g), b));
                 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;
@@ -444,23 +441,23 @@ }
             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];
@@ -472,2 +469,4 @@ }
 
+                fontIndex = v_fontIndex + 0.1;
+                
                 vec4 sdfParams = getSDFParams();
@@ -474,0 +473,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

11548338

No dependency changes