@pirireis/webglobeplugins 0.3.5 → 0.3.6

package/bearing-line/plugin.js

@@ -147,7 +147,6 @@ export default class Plugin {
                         'adaptor': (item) => new Float32Array([item.dashOpacity])
                     }],
                     ["circleDashAngle", {
-
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.circleDashAngle / 360])
                     }]

package/package.json

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

package/util/shaderfunctions/geometrytransformations.js

@@ -102,22 +102,22 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
     tangent1 = normalize(tangent1);
     // rotate tangent with given angle
     tangent1 =  cos(angle) * tangent1 - sin(angle) * cross(normal, tangent1);
-    return (geoW * cos(radius/R))+ tangent1 * radius / 1000.0;
+    float radius_in_angle = radius/R;
+    float projected_radius = sin(radius_in_angle) * R / 1000.0;
+    return (geoW * cos(radius_in_angle))+ tangent1 * projected_radius;
     }
 `;
 
 // TODO: Make it precise. Y axis is not correct.
 
-// ln | tan [ (x/2) + (π/4) ] | + C
-export const circleLimpFromLongLatRadCenterMercatorRealDistance = `
+export const circleLimpFromLongLatRadCenterMercatorRealDistance = PI + `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
-    float radius_radian =  radius / R;
-    float lat = center.y - radius_radian * sin(angle);
-    float scale = 1.0/abs( cos( lat ) );
-    float y =  log( tan( PI / 4.0 + lat / 2.0 ) ) * R;
-    vec2 center_ = longLatRadToMercator(center);
-    float x = center_.x + scale * radius * cos(angle);
-    return vec2(x, y);
+    float ang = angle + PI / 2.0; // this is there because rest of the program is 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 lat = asin(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));
 }
 `;
 
@@ -206,7 +206,7 @@ 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));
+    float angle = atan( (end_lat - start_lat ) / (end_.x - start_.x));
     return angle;   
 }
 `