@pirireis/webglobeplugins 0.0.9 → 0.0.10

package/package.json

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

package/partialrings/plugin.js

@@ -44,7 +44,6 @@ export default class {
         this.gl = gl;
         this.globe = globe;
         this.program = programCache.get(globe);
-        console.log(this.program);
         const { vao, buffer } = this.program.getVaoBuffer();
         this.vao = vao;
         this.buffer = buffer;
@@ -107,7 +106,6 @@ class BufferManager extends BufferOffsetManager {
 
 
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        console.log(bufferType, gl[bufferType], initialCapacity * ITEM_SIZE * 4);
         gl.bufferData(gl.ARRAY_BUFFER, initialCapacity * ITEM_SIZE * 4, gl[bufferType]);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
     }
@@ -130,7 +128,6 @@ class BufferManager extends BufferOffsetManager {
             }
             const block = new Float32Array([
                 ...center, startAngle, tailAngle, ...color, radius, colorMode]);
-            console.log(offset, block);
             gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
             // 2         1       1           1         4       1 = 10
         }
@@ -161,7 +158,7 @@ class BufferManager extends BufferOffsetManager {
 
     _autoExtendBuffer(payloadSize) {
         const { gl, buffer, bufferType, extendRatio } = this;
-        if (payloadSize <= this.spaceLeft()) return;
+        if (payloadSize <= this.spaceLeft) return;
         const newCapacity = Math.ceil((payloadSize + this.length) * extendRatio);
         this.extendBuffer(gl, buffer, bufferType, newCapacity);
     }

package/partialrings/program.js

@@ -72,7 +72,7 @@ void main() {
     float phase = ( vertexID / edge_count);
 
     if ( color_mode == 1.0 ) {
-        if ( tail_angle > 0.0 ) {
+        if ( tail_angle < 0.0 ) {
                 v_color = vec4( color.rgb , color.a * ( 1.0 - phase ) * alpha );
             } else {
                 v_color = vec4( color.rgb , color.a * (phase ) * alpha );
@@ -82,7 +82,7 @@ void main() {
     }
 
     float angle;
-    if ( tail_angle < 0.0 ) { 
+    if ( tail_angle > 0.0 ) { 
         angle =  tail_angle * (-phase + 1.0) + start_angle;
         } else {
         angle = tail_angle * phase + start_angle;
@@ -163,7 +163,6 @@ export class Logic {
 
 
     draw(bufferManager, vao, edgeCount, alphaMultiplier, drawMode) {
-        if (alphaMultiplier === 0) { console.log("no draw"); return };
         const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this
 
         gl.disable(gl.DEPTH_TEST);

package/programs/rings/distancering/circlepaddingfreeangleprogram.js

@@ -14,6 +14,7 @@ const vertexShader = `#version 300 es ` +
     shaderfunctions.longLatRadToCartesian3D +
     shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
     shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
+    shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistancePadding +
     shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
 
 in vec2 center;
@@ -49,7 +50,8 @@ void main() {
     if ( compass == 1 ){
         limp = circleLimpFromLongLatRadCenterMercatorCompass(center , radius_, angle);
     } else {
-        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);
+        limp = circleLimpFromLongLatRadCenterMercatorRealDistancePadding(center, radius_, angle);
+        // limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);
     }
     v_limp = limp;
     gl_Position = mercatorXYTo2DPoint(limp);

package/programs/rings/distancering/paddyflatprogram.js

@@ -12,6 +12,7 @@ const vertexShader = `#version 300 es ` +
     shaderfunctions.longLatRadToCartesian3D +
     shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
     shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
+    shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistancePadding +
     shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
 
 in vec2 center;
@@ -50,7 +51,8 @@ void main() {
     if ( compass == 1 ){
         limp = circleLimpFromLongLatRadCenterMercatorCompass(center , radius_, angle);
     } else {
-        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);
+        limp = circleLimpFromLongLatRadCenterMercatorRealDistancePadding(center, radius_, angle);
+        // limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);
     }
     v_limp = limp;
     gl_Position = mercatorXYTo2DPoint(limp);

package/rangerings/rangerings.js

@@ -54,7 +54,7 @@ export default class {
 
 
     draw3D() {
-        const { circleFlatProgram, paddyFlatProgram, padCount, paddingFreeAngleProgram, bufferManager, compass, gl, circleEdgeCount, paddingBufferManager } = this;
+        const { circleFlatProgram, paddyFlatProgram, paddingFreeAngleProgram, bufferManager, compass, gl, circleEdgeCount, paddingBufferManager } = this;
         // if (globe.api_GetCurrentGeometry() === 0) return; // do not draw in 3D mode
         if (this.bufferManager !== null && bufferManager.length > 0) {
             gl.disable(gl.DEPTH_TEST);
@@ -68,9 +68,7 @@ export default class {
         }
     }
 
-    setPadCount(padCount) {
-        this.padCount = padCount;
-    }
+
 
     /**
      * @param {RangeRingData} rangeRingData
@@ -88,11 +86,6 @@ export default class {
         this.paddingBufferManager = this.paddingFreeAngleProgram.initilizeBufferManager({ bufferType: bufferDrawType, initialRingCapacity });
     }
 
-    // getBufferManager() {
-    //     return this.bufferManager;
-    // }
-
-
 
     /**
      * @typedef {Array<{ringID, radius, paddingRange}>} rings
@@ -150,7 +143,7 @@ const ringItemsToCircleBufferInsertDataAdaptor = (ringItems) => {
             resultRings.push({
                 ringID,
                 radius,
-                padding: padding / 7,
+                padding: padding / 5,
                 rgba,
             });
         }

package/util/shaderfunctions/geometrytransformations.js

@@ -95,6 +95,7 @@ vec3 longLatRadToCartesian3D( vec2 longLat) {
 
 
 
+// TODO: Make it precise. It doesnt use haversine formula. If this changes, change the formmula which calculates text position. 
 export const circleLimpFromLongLatRadCenterCartesian3D = R + `
 vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float angle) {
     vec3 geoW = longLatRadToCartesian3D(center);
@@ -108,7 +109,7 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
     }
 `;
 
-// TODO: Make it precise
+// TODO: Make it precise.
 export const circleLimpFromLongLatRadCenterMercatorRealDistance = `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
     
@@ -123,6 +124,34 @@ 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 new_angle;
+    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;   
+        }
+    } else {
+        new_angle = angle;  
+    }
+    float new_lat = center.y - radius_radian * sin(new_angle);
+    float new_scale = 1.0/abs( cos( new_lat ) );
+
+    vec2 center_ = longLatRadToMercator(center);
+    float x = center_.x + new_scale * radius * cos(new_angle);
+    float y = center_.y - new_scale * radius * sin(new_angle);
+    return vec2(x, y);
+}
+`
+
 
 export const circleLimpFromLongLatRadCenterMercatorCompass = `
 vec2 circleLimpFromLongLatRadCenterMercatorCompass(vec2 center, float radius, float angle){