@pirireis/webglobeplugins 0.6.10 → 0.6.12

package/package.json

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

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

@@ -55,8 +55,8 @@ void main() {
         v_limp = vec2(0.0, 0.0);
     } else {
         vec2 position;
-        if (radius < 250.0) {
-            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius, angle);
+        if (radius < 1400.0) {
+            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius/ cos(center_position.y), angle);
         } else {
            position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);
         }

package/util/shaderfunctions/geometrytransformations.js

@@ -17,7 +17,8 @@ export const R = `
 
 export const PI = `
 #ifndef PI
-#define PI 3.1415926535897932384626433832795
+#define PI 3.141592653589793
+
 #endif
 `;
 
@@ -77,6 +78,7 @@ export const longLatRadToMercator = R + PI + `
 vec2 longLatRadToMercator( vec2 longLatRad) {
     float x = R * longLatRad.x;
     float y = R * log( tan( PI / 4.0 + longLatRad.y / 2.0 ) );
+    y -= mix(-60.0, 60.0, abs(longLatRad.y + PI / 8.0) / (PI / 4.0));
     return vec2(x, y);
 }
 `;
@@ -110,13 +112,33 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
 
 // TODO: Make it precise. Y axis is not correct.
 
+export const circleLimpFromLongLatRadCenterMercatorRealDistanceNew = PI + `
+vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle) {
+    float ang = angle + PI / 2.0; // Shift angle to align with +x axis
+    float r = radius / R;
+    float cos_r = cos(r);
+    float sin_r = sin(r);
+
+    float sin_lat = sin(center.y) * cos_r + cos(center.y) * sin_r * cos(ang);
+    float lat = asin(sin_lat);
+
+    float delta_long = atan(sin(ang) * sin_r * cos(center.y), cos_r - sin(center.y) * sin_lat);
+    float longi = center.x + delta_long;
+
+    return vec2(
+        R * longi,
+        R * log(tan(PI / 4.0 + lat / 2.0))
+    );
+}`;
+
+
 export const circleLimpFromLongLatRadCenterMercatorRealDistance = PI + `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
     float ang = angle + PI / 2.0; // this is there because the other methods are implemented in, angle 0 is +x axis orientatation
-    float r =  radius / R;
-    float sin_lat =  sin( center.y) * cos(r) + cos(center.y)*sin(r)* cos(ang);
+    float r = radius / R;
+    float sin_lat = sin(center.y) * cos(r) + cos(center.y) * sin(r) * cos(ang);
     float lat = asin(sin_lat);
-    float longi = center.x + atan( sin(ang) * sin(r) * cos(center.y), cos(r) - sin(center.y) * sin_lat);
+    float longi = center.x + atan(sin(ang) * sin(r) * cos(center.y), cos(r) - sin(center.y) * sin_lat);
     return longLatRadToMercator(vec2(longi, lat));
 }
 `;
@@ -124,23 +146,23 @@ vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radiu
 // TODO: reconstruct this function
 export const circleLimpFromLongLatRadCenterMercatorRealDistancePadding = `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistancePadding(vec2 center, float radius, float angle){
-    float radius_radian =  radius / R;
+    float radius_radian = radius / R;
     float new_angle;
-    if ( angle !=  - 1.5707963267948966192313216916398){
-        float section = floor(angle / ( PI / 2.0)) + 1.0;
+    if (angle != - 1.5707963267948966192313216916398) {
+        float section = floor(angle / (PI / 2.0)) + 1.0;
         float lat = center.y - radius_radian * sin(angle);
-        float scale = 1.0/abs( cos( lat ) );
-        new_angle = atan( tan(angle) * scale );
-        if ( section == 2.0 ){
-            new_angle = mod( new_angle, PI );   
-        } else if ( section == 3.0 ){
-            new_angle = new_angle + PI;   
+        float scale = 1.0 / abs(cos(lat));
+        new_angle = atan(tan(angle) * scale);
+        if (section == 2.0) {
+            new_angle = mod(new_angle, PI);
+        } else if (section == 3.0) {
+            new_angle = new_angle + PI;
         }
     } else {
-        new_angle = angle;  
+        new_angle = angle;
     }
     float new_lat = center.y - radius_radian * sin(new_angle);
-    float new_scale = 1.0/abs( cos( new_lat ) );
+    float new_scale = 1.0 / abs(cos(new_lat));
 
     vec2 center_ = longLatRadToMercator(center);
     float x = center_.x + new_scale * radius * cos(new_angle);
@@ -156,7 +178,7 @@ vec2 circleLimpFromLongLatRadCenterMercatorCompass(vec2 center, float radius, fl
     float y = -sin(angle) * radius + center_.y;
     float x = cos(angle) * radius + center_.x;
     return vec2(x, y);
-}`;
+} `;
 
 
 // Function to interpolate between two Cartesian points using spherical interpolation (slerp)
@@ -186,7 +208,7 @@ vec2 cartesianToSpherical(vec3 point) {
     float lon = degrees(atan(point.y, point.x));    // Longitude
 
     return vec2(lat, lon);
-}`;
+} `;
 
 // Main function to calculate an intermediate point
 
@@ -204,10 +226,10 @@ vec3 interpolateGeographicPoint(vec2 start, vec2 end, float t) {
 
 export const angleBetweenTwoPointsRadian = `
 float angleBetweenTwoPointsRadian(vec2 start_, vec2 end_) {
-    float start_lat = log( tan( ( 1.0 - start_.y ) * PI / 2.0  ) );
-    float end_lat = log( tan( ( 1.0 - end_.y ) * PI / 2.0  ) );
-    float angle = atan( (end_lat - start_lat ) / (end_.x - start_.x));
-    return angle;   
+    float start_lat = log(tan((1.0 - start_.y) * PI / 2.0));
+    float end_lat = log(tan((1.0 - end_.y) * PI / 2.0));
+    float angle = atan((end_lat - start_lat) / (end_.x - start_.x));
+    return angle;
 }
 `