@pirireis/webglobeplugins 0.1.1 → 0.1.3

package/package.json

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

package/programs/rings/distancering/circleflatprogram.js

@@ -27,9 +27,9 @@ out vec4 v_color;
 out vec2 v_limp;
 
 void main() {
-    if( flag == 1.0 || radius == 0.0) return; // 1.0 is hide
+    if( flag == 1.0 || radius == 0.0) return; // flag 1.0 is hide
     v_color = color;
-    gl_PointSize = 2.0;
+    if ( gl_VertexID == 270 ) v_color.rgb += 0.2;
     float angle = 3.1415926535897932384626433832795 * 2.0 * (float(gl_VertexID) /  circle_edge_count);
     if ( is3D ){
             gl_Position = projection * view * vec4(

package/programs/rings/distancering/circlepaddingfreeangleprogram.js

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

package/rangerings/rangeringangletext.js

@@ -116,11 +116,11 @@ export default class RangeRingAngleText {
 
         for (const { centerID, x, y, rings, stepAngle, hide = ENUM_HIDE.SHOW, textHide = ENUM_TEXT_HIDE.SHOW } of ringDatas) {
             if (this._centerCollection.has(centerID)) {
-                const stepAngle = this._centerCollection.get(centerID).get("stepAngle");
-                this._fillDeleteBucket(centerID, stepAngle, deleteBucket);
+                this._fillDeleteBucket(centerID, deleteBucket);
             }
             const maxRadius = rings.reduce((acc, { radius }) => Math.max(acc, radius), 0);
-            this._appendCircle(x, y, maxRadius, stepAngle, centerID, addBucket);
+            const show = hide !== ENUM_HIDE.HIDE && textHide === ENUM_TEXT_HIDE.SHOW;
+            if (show) this._appendCircle(x, y, maxRadius, stepAngle, centerID, addBucket);
             this._centerCollection.set(centerID,
                 new Map([
                     ["stepAngle", stepAngle],
@@ -208,7 +208,7 @@ export default class RangeRingAngleText {
 
 
     // TODO : Implement this
-    deleteCenters(centerIDs) {
+    removeCenters(centerIDs) {
         const deleteBucket = {
             coords: [],
             coordsZ: [],

package/rangerings/rangerings.js

@@ -22,11 +22,11 @@ const { CircleFlatProgram, PaddyFlatProgram, CirclePaddySharedBuffer } = rings;
 
 export default class {
 
-    constructor(id, { oneDegreePadding = true, compass = COMPASS_MODES.COMPASS, circleEdgeCount = 360, showNumbers = true } = {}) {
+    constructor(id, { oneDegreePadding = true, compass = COMPASS_MODES.COMPASS, showNumbers = true } = {}) {
         this.id = id;
         this.compass = compass;
         this._showNumbers = showNumbers;
-        this.circleEdgeCount = circleEdgeCount;
+        this.circleEdgeCount = 360;
         this._onedegreepaddingOn = oneDegreePadding;
         this.bufferManager = null;
     }
@@ -57,16 +57,6 @@ export default class {
 
 
 
-    // // TODO: Client should reinsert all data to be able to see numbers. Think Better Solution.
-    // setShowNumbers(showNumbers) {
-    //     this._showNumbers = showNumbers;
-    //     if (this._showNumbers) {
-    //         this._textPlugin = new RangeRingAngleText(this.globe);
-    //     } else {
-    //         this._textPlugin?.free();
-    //         this._textPlugin = null;
-    //     }
-    // }
 
     setGeometry() {
         this._textPlugin?.setGeometry();
@@ -116,6 +106,9 @@ export default class {
         const insertData = ringItemsToCircleBufferInsertDataAdaptor(items);
 
         this.bufferManager.insertBulk(insertData);
+        for (const item of items) {
+            item.paddingAngles = angleToPaddingAngles(item.stepAngle, 0);
+        }
         this.paddingBufferManager.insertBulk(items);
         this._textPlugin?.insertBulk(items);
         this.globe.DrawRender();
@@ -162,7 +155,7 @@ export default class {
 const ringItemsToCircleBufferInsertDataAdaptor = (ringItems) => {
 
     const result = [];
-    for (const { centerID, x, y, paddingAngles, rgba, rings, hide = 0 } of ringItems) {
+    for (const { centerID, x, y, rgba, rings, hide = 0, textHide = 0 } of ringItems) {
         const resultRings = [];
         for (const { ringID, radius, padding } of rings) {
             resultRings.push({
@@ -178,8 +171,12 @@ const ringItemsToCircleBufferInsertDataAdaptor = (ringItems) => {
             x,
             y,
             rings: resultRings,
-            hide
+            hide,
+            textHide
         });
     }
     return result;
-};
+};
+
+const angleToPaddingAngles = (gapDegree, offsetDegree = 0) => Array.from({ length: Math.ceil(360 / gapDegree) }, (_, i) => (i * gapDegree + offsetDegree) * Math.PI / 180);
+