@pirireis/webglobeplugins 0.6.36-a → 0.6.37-a

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.6.36-a",
+    "version": "0.6.37-a",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

package/programs/line-on-globe/lines-color-instanced-flat.js

@@ -34,9 +34,9 @@ void main() {
     if ( gap > 37000000.0) { return; }
     float z_alpha;
     if ( z_alpha_on == 1 ){ 
-        z_alpha =  pow(z_level,3.0) /  ( 20000000.0 / gap);
-        if( z_alpha < 0.1 ) {return;}
-        if( z_alpha > 1.0 ) {z_alpha = 1.0;}
+        z_alpha =  pow(2.0,z_level+1.0) /  ( 10000000.0 / gap);
+        z_alpha = smoothstep(0.1,0.9, z_alpha);
+        if( z_alpha < 0.01) {return;}
     } else {
         z_alpha = 1.0;
     }
@@ -149,3 +149,5 @@ const LinesColorInstancedFlatCache = Object.freeze({
 });
 
 export { LinesColorInstancedFlatCache, Z_ALPHA_MODE };
+
+

package/rangerings/plugin.js

@@ -265,7 +265,7 @@ class RangeRings {
         if (typeof opacity !== "number" || opacity < 0 || opacity > 1) throw new Error("Invalid opacity value");
         this._opacity = opacity;
         this.textPlugin?.setOpacity(opacity);
-        this._textWritersMap((writer) => writer.setOpacity(opacity));
+        this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
     }
 
@@ -376,7 +376,7 @@ class RangeRings {
             ...["centerCoords3d", "radius3d", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
         );
 
-        this._oneDegreePaddingVao = this._padding2dProgram.createVAO(
+        this._oneDegree2DPaddingVao = this._padding2dProgram.createVAO(
             { buffer: this.bufferManagersCompMap.get("centerCoords2dflat").bufferManager.buffer, size: 2, stride: 0, offset: 0 },
             { buffer: this.bufferManagersCompMap.get("centerCoords2dflatForPadding").bufferManager.buffer, size: 2, stride: 0, offset: 0 },
             { buffer: this.bufferManagersCompMap.get("rgbaMercator").bufferManager.buffer, size: 4, stride: 0, offset: 0 },
@@ -549,7 +549,7 @@ class RangeRings {
         const {
             globe, gl,
             _circleProgram2D, _circleProgram3D, _padding2dProgram, _padding3dProgram, _bigPadding3dFlatProgram,
-            _circle2DVao, _circle3DVao, _oneDegreePaddingVao, _padding3dOneDegreeVao, _bigPadding3dFlatVAO,
+            _circle2DVao, _circle3DVao, _oneDegree2DPaddingVao, _padding3dOneDegreeVao, _bigPadding3dFlatVAO,
             bufferOrchestrator, paddingBufferOrchestrator,
             _opacity, _oneDegreePadding, _zAlphaOnDegreePadding } = this;
         gl.disable(gl.DEPTH_TEST);
@@ -561,7 +561,7 @@ class RangeRings {
         } else {
             _circleProgram2D.draw(_circle2DVao, bufferOrchestrator.length, CIRCLE_FLAT_EDGE_COUNT, _opacity);
             // _padding2dProgram.draw(bigPaddingVAO, paddingBufferOrchestrator.length, _opacity);
-            if (_oneDegreePadding) _padding2dProgram.draw(_oneDegreePaddingVao, bufferOrchestrator.length * CIRCLE_FLAT_EDGE_COUNT, _opacity, _zAlphaOnDegreePadding);
+            if (_oneDegreePadding) _padding2dProgram.draw(_oneDegree2DPaddingVao, bufferOrchestrator.length * CIRCLE_FLAT_EDGE_COUNT, _opacity, _zAlphaOnDegreePadding);
         }
         _bigPadding3dFlatProgram.draw(_bigPadding3dFlatVAO, paddingBufferOrchestrator.length, _opacity);
         this._textWritersMap.forEach((textWriter) => textWriter.draw());
@@ -576,7 +576,7 @@ class RangeRings {
         // delete vaos
         this.gl.deleteVertexArray(this._circle2DVao);
         this.gl.deleteVertexArray(this._circle3DVao);
-        this.gl.deleteVertexArray(this._oneDegreePaddingVao);
+        this.gl.deleteVertexArray(this._oneDegree2DPaddingVao);
         this.gl.deleteVertexArray(this._padding3dOneDegreeVao);
         this.gl.deleteVertexArray(this._bigPadding3dFlatVAO);
         // delete programs

package/timetracks/program-line-strip.js

@@ -455,12 +455,12 @@ ${shaderfunctions.pixelXYToCartesian3DPoint}
 ${shaderfunctions.pixelXYToCartesian2DPoint}
     
 void main() {
-    if ( a_color.x < .0 || a_color.y < .0 || a_color.z < .0) {
-        v_time = -1000000000.0;   
-        v_track_end_time = -1000000000.0;
-        v_track_start_time = -1000000001.0;   
-        return;
-    }
+    // if ( a_color.x < .0 || a_color.y < .0 || a_color.z < .0) {
+    //     v_time = -1000000000.0;   
+    //     v_track_end_time = -1000000000.0;
+    //     v_track_start_time = -1000000001.0;   
+    //     return;
+    // }
     v_time = a_time;
     v_color = a_color;
     v_track_start_time = a_track_start_time;
@@ -470,7 +470,7 @@ void main() {
         gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(pos - uTranslate, 1.0);
     }  else {
         vec2 xy = pixelXYToCartesian2DPoint(a_position.xy, uTranslate.xy, u_mapWH, u_scrWH);
-        gl_Position = uProjectionMatrix * vec4(xy.x, xy.y, 0.0, 1.0);    
+        gl_Position = uProjectionMatrix * vec4(xy.x, xy.y, 0.0, 1.0);
     }
 }
 `;