@pirireis/webglobeplugins 0.6.16 → 0.6.17

package/circle-line-chain/plugin.js

@@ -144,8 +144,8 @@ export class CircleLineChainPlugin {
                 ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
             this.circleVao = this.circleProgram.createVAO(
                 ...["centerCoords2d", "centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
-            // this.toOriginVao = this.lineToTheOriginProgram.createVAO(
-            //     ...["targetCoords", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            this.toOriginVao = this.lineToTheOriginProgram.createVAO(
+                ...["targetCoords3d", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
         }
 
     }
@@ -392,8 +392,8 @@ export class CircleLineChainPlugin {
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
         if (this._drawCircleOn) this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
         this._textContextWriterInjectionMap.forEach((writer) => writer.draw());
-        gl.enable(gl.DEPTH_TEST);
         this.lineToTheOriginProgram.draw(this.toOriginVao, this.bufferOrchestrator.length, this._opacity);
+        gl.enable(gl.DEPTH_TEST);
     }
 }
 

package/package.json

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

package/programs/line-on-globe/circle-accurate.js

@@ -58,7 +58,12 @@ void main() {
         v_limp = vec2(0.0, 0.0);
     } else {
         vec2 position;  
-        position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);
+        if ( radius < 1000.0) {
+            float cosine1 = cos(asin(tanh(center_position.y / 6378137.0)));
+            position = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center_position, radius /  cosine1 , angle);
+        } else {
+            position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);
+        }
         v_limp = position;
         gl_Position = mercatorXYToGLPosition( position);
 

package/programs/line-on-globe/naive-accurate.js

@@ -19,7 +19,7 @@ ${cartesian3DToGLPosition}
 in vec2 start_position;
 in vec3 start_poisition3d;
 in vec2 end_position;
-in vec3 end_position3;
+in vec3 end_position3d;
 in float dash_ratio;
 in vec4 color;
 in float dash_opacity;
@@ -34,7 +34,7 @@ void main() {
     vec2 longLat;
     if (is3D) {
         interpolation = float(gl_VertexID) / ${GLOBE_MIDPOINT_COUNT - 1}.0;
-        vec3 cartesian = pointsOnSphereBetween(start_poisition3d, end_position3, interpolation) * R_3D;
+        vec3 cartesian = pointsOnSphereBetween(start_poisition3d, end_position3d, interpolation) * length(end_position3d);
         gl_Position = cartesian3DToGLPosition(cartesian);
         v_limp = vec2(0.0, 0.0);
     } else {

package/programs/line-on-globe/to-the-origin.js

@@ -18,7 +18,7 @@ ${R_3D}
 ${longLatRadToCartesian3DWithR}
 ${cartesian3DToGLPosition}
 
-in vec2 position2d;
+in vec3 position3d;
 in vec4 rgba;
 uniform float origin_r;
 flat out vec4 v_rgba;
@@ -28,10 +28,10 @@ void main() {
     if (!is3D) {return;} 
     vec3 cartesian;
     if(gl_VertexID == 0) {
-        cartesian = longLatRadToCartesian3DWithR(position2d, R_3D);
+        cartesian =  normalize( position3d) * R_3D;
         interpolation_value = 1.0;
     } else {
-        cartesian = longLatRadToCartesian3DWithR(position2d, origin_r);
+        cartesian = position3d;
         interpolation_value = 0.0;
     }
     gl_Position = cartesian3DToGLPosition(cartesian);
@@ -48,11 +48,12 @@ in float interpolation_value;
 flat in vec4 v_rgba;
 out vec4 color;
 void main(){
-    if ( fract( interpolation_value * 100.0) < 0.5) {discard;}
+    if ( fract( interpolation_value * 30.0) < 0.5) {discard;}
     color = vec4( 
-        v_rgba.rgb,
-        v_rgba.a * plugin_opacity * interpolation_value * 0.9
+        v_rgba.rgb * 1.2,
+        v_rgba.a * plugin_opacity
     );
+
 }`;
 
 
@@ -65,7 +66,7 @@ class Logic {
         this._lastOriginR = 6378.137 - 1;
         const { gl, program } = this;
         {
-            gl.bindAttribLocation(program, 0, "position2d");
+            gl.bindAttribLocation(program, 0, "position3d");
             gl.bindAttribLocation(program, 1, "rgba");
 
         }
@@ -105,12 +106,10 @@ class Logic {
             gl.uniform1f(this._originRLocation, originR);
             this._lastOriginR = originR;
         }
-
-        // gl.disable(gl.DEPTH_TEST);
         gl.drawArraysInstanced(gl.LINE_STRIP, 0, 2, length);
+        gl.drawArraysInstanced(gl.POINTS, 0, 2, length);
         gl.bindVertexArray(null);
         cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        // gl.enable(gl.DEPTH_TEST);
     }
 
     _checkOpacity(opacity) {
@@ -122,15 +121,15 @@ class Logic {
         if (r < 0.0 || r > 6378.137 - 0.3) throw RangeError("r should be between 0 and 6378.137 - 0.3");
     }
 
-    createVAO(potisionBufferObj, colorBufferObj) {
+    createVAO(potision3dBufferObj, colorBufferObj) {
         const { gl } = this;
         const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         {
-            const { buffer, stride = 0, offset = 0 } = potisionBufferObj;
+            const { buffer, stride = 0, offset = 0 } = potision3dBufferObj;
             gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
             gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribPointer(0, 3, gl.FLOAT, false, stride, offset);
             gl.vertexAttribDivisor(0, 1);
         }
         {