@pirireis/webglobeplugins 0.0.6 → 0.0.7

package/package.json

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

package/programs/rings/distancering/circlepaddingfreeangleprogram.js

@@ -39,7 +39,7 @@ void main() {
     float angle = pad_angle - 1.5707963267948966192313216916398;
     float radius_ = radius - (pad_range * odd);
 
-    if ( is3D){  
+    if (is3D){  
         gl_Position = projection * view * vec4(
             circleLimpFromLongLatRadCenterCartesian3D( center, radius_, angle) - translate, 1.0);
         v_limp = vec2(0.0, 0.0);

package/util/shaderfunctions/geometrytransformations.js

@@ -99,11 +99,11 @@ export const circleLimpFromLongLatRadCenterCartesian3D = R + `
 vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float angle) {
     vec3 geoW = longLatRadToCartesian3D(center);
     vec3 normal = normalize(geoW);
-    vec3 tangent1 = cross(normal, vec3(0.0, 0.0, 1.0));
-    if ( length(tangent1) < 0.1 ){ tangent1 = cross(normal, vec3(0.0, 1.0, 0.0)); }
+    vec3 tangent1 = cross(normal, vec3(0.0, 0.0, -1.0));
+    if ( length(tangent1) < 0.1 ){ tangent1 = cross(normal, vec3(0.0, -1.0, 0.0)); }
     tangent1 = normalize(tangent1);
     // rotate tangent with given angle
-    tangent1 = cos(angle) * tangent1 + sin(angle) * cross(normal, tangent1);
+    tangent1 =  cos(angle) * tangent1 - sin(angle) * cross(normal, tangent1);
     return (geoW * cos(radius/R))+ tangent1 * radius / 1000.0;
     }
 `;
@@ -113,12 +113,12 @@ export const circleLimpFromLongLatRadCenterMercatorRealDistance = `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
     
     float radius_radian =  radius / R;
-    float lat = center.y + radius_radian * sin(angle);
+    float lat = center.y - radius_radian * sin(angle);
 
     float scale = 1.0/abs( cos( lat ) );
     vec2 center_ = longLatRadToMercator(center);
-    float x = center_.x +  scale * radius * cos(angle);
-    float y = center_.y +  scale * radius * sin(angle);
+    float x = center_.x + scale * radius * cos(angle);
+    float y = center_.y - scale * radius * sin(angle);
     return vec2(x, y);
 }
 `;
@@ -127,7 +127,7 @@ vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radiu
 export const circleLimpFromLongLatRadCenterMercatorCompass = `
 vec2 circleLimpFromLongLatRadCenterMercatorCompass(vec2 center, float radius, float angle){
     vec2 center_ = longLatRadToMercator(center);
-    float y = sin(angle) * radius + center_.y;
+    float y = -sin(angle) * radius + center_.y;
     float x = cos(angle) * radius + center_.x;
     return vec2(x, y);
 }`;