@pirireis/webglobeplugins 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.0.6",
+    "version": "0.0.8",
     "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);
@@ -178,13 +178,9 @@ export class BufferManager extends BufferOffsetManager {
     }
 
 
-    __centerMapMethod(x, y, rgba, rings, hide, paddingAngles) {
+    __centerMapMethod(rings, paddingAngles) {
         return new Map([
-            ["x", x],
-            ["y", y],
-            ["rgba", rgba],
             ["rings", rings],
-            ["hide", hide],
             ["paddingAngles", paddingAngles]
         ])
     }
@@ -212,10 +208,7 @@ export class BufferManager extends BufferOffsetManager {
         if (deleteCentersList.length > 0) {
             this.removeCenters(deleteCentersList);
         }
-
-
         const requiredSpace = this.__requiredSpaceForBulk(data);
-
         const spaceLeft = this.spaceLeft;
         console.log("space left:", spaceLeft, "required space:", requiredSpace);
         if (requiredSpace > spaceLeft) {
@@ -224,26 +217,20 @@ export class BufferManager extends BufferOffsetManager {
         }
 
         const items = [];
-
-        for (const { centerID, x, y, rgba, paddingAngles, hide = false, rings } of data) {
-
-            this._centerMaps.set(centerID, this.__centerMapMethod(x, y, rgba, rings, hide, paddingAngles)); // x,y, rgba, hide prograbably not needed
-
-            const hideFlag = hide ? 1 : 0;
+        for (const { centerID, x, y, rgba, paddingAngles, hide = 0, rings } of data) {
+            this._centerMaps.set(centerID, this.__centerMapMethod(rings, paddingAngles)); // x,y, rgba, hide prograbably not needed
             for (const { ringID, radius, padding } of rings) {
                 for (const paddingAngle of paddingAngles) {
                     const _offsetMapKey = `${centerID}_${ringID}_${paddingAngle}`;
                     const offset = this.getOffset(_offsetMapKey) | this.nextOffset();
                     items.push({
                         offset: offset,
-                        payload: new Float32Array([x, y, radius, padding, rgba[0], rgba[1], rgba[2], rgba[3], hideFlag, paddingAngle])
+                        payload: new Float32Array([x, y, radius, padding, rgba[0], rgba[1], rgba[2], rgba[3], hide, paddingAngle])
                     })
                     this.offSetMap.set(_offsetMapKey, offset);
                 }
             }
         }
-        const partOffset = 0;
-
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         for (let { offset, payload } of items) {
             gl.bufferSubData(gl.ARRAY_BUFFER, offset, payload);
@@ -257,8 +244,6 @@ export class BufferManager extends BufferOffsetManager {
 
         for (const { centerID, x, y } of data) {
             const center = this._centerMaps.get(centerID);
-            center.set("x", x);
-            center.set("y", y);
             const payload = new Float32Array([x, y]);
             const paddingAngles = center.get("paddingAngles");
             const rings = center.get("rings");

package/programs/rings/distancering/circlepaddysharedbuffer.js

@@ -238,31 +238,6 @@ export default class {
         this.globe.DrawRender();
     }
 
-    /**
-     * 
-     * @typedef centerData
-     * @property {String} centerID
-     * @property {Array<Number>} rgba - [r,g,b,a] - default undefined
-     * @property {Number} padding - default undefined
-     * @property {Boolean} hide - default undefined
-     * @param {Array<centerData>} centerDatas 
-     * @returns 
-     */
-    updateCenters(centerDatas) {
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { centerID, padding, rgba, hide } of centerDatas) {
-            const rings = this._centerMap.get(centerID).get("rings");
-            for (let i = 0; i < rings.length; i++) {
-                const offset = this._ringOffsets.get(rings[i]);
-                if (padding !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 12, new Float32Array([padding]));
-                if (rgba !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 16, new Float32Array(rgba));
-                if (hide !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 32, new Float32Array([hide ? 1 : 0]));
-            }
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.globe.DrawRender();
-    }
 
     insertBulk(rangeRingDatas) {
         const { gl, buffer } = this;
@@ -287,60 +262,21 @@ export default class {
             this._implicitExtendBufferInNeed(incomingRingSize);
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { centerID, x, y, rings } of rangeRingDatas) {
-            // if (!this._centerMap.has(centerID)) {
+        for (const { centerID, x, y, rings, hide = 0 } of rangeRingDatas) {
             this.registerCenter(centerID, { x, y })
-            // } else {
-            //     const rings = this._centerMap.get(centerID).get("rings");
-            //     const xy = new Float32Array([x, y]);
-            //     const emptyBlock =
-            //     for (let i = 0; i < rings.length; i++) {
-            //         const offset = this._ringOffsets.get(rings[i]);
-            //         gl.bufferSubData(gl.ARRAY_BUFFER, offset, );
-            //     }
-            // }
-            for (let { ringID, radius, padding, rgba, hide = false } of rings) {
+            for (const { ringID, radius, padding, rgba } of rings) {
                 const key = this._ringKey(centerID, ringID);
-                const bufferData = new Float32Array([x, y, radius, padding, ...rgba, hide ? 1 : 0]);
-                if (!this._ringOffsets.has(key)) {
-                    const offset = this._nextBufferOffset();
-                    gl.bufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
-
-                    this._ringOffsets.set(key, offset);
-                    this._centerMap.get(centerID).get("rings").push(key);
-                } else {
-                    const offset = this._ringOffsets.get(key);
-                    gl.bufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
-                }
+                const bufferData = new Float32Array([x, y, radius, padding, ...rgba, hide]);
+                const offset = this._nextBufferOffset();
+                gl.bufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
+                this._ringOffsets.set(key, offset);
+                this._centerMap.get(centerID).get("rings").push(key);
             }
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
     }
 
-    updateRing(centerID, ringID, { radius, padding, rgba, hide } = {}) {
-        if (!this._centerMap.has(centerID)) {
-            console.warn("Center is not registered yet");
-            return;
-        }
-        const key = this._ringKey(centerID, ringID);
-        if (!this._ringOffsets.has(key)) {
-            console.warn("Ring is not registered yet");
-            return;
-        }
-        if (!this.checkCapacity()) {
-            this._implicitExtendBufferInNeed(1);
-        }
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        const offset = this._ringOffsets.get(key);
-        if (radius !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 8, new Float32Array([radius]));
-        if (padding !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 12, new Float32Array([padding]));
-        if (rgba !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 16, new Float32Array(rgba));
-        if (hide !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset + 32, new Float32Array([hide ? 1 : 0]));
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.globe.DrawRender();
-    }
 
 
     /**

package/rangerings/rangerings.js

@@ -152,7 +152,6 @@ const ringItemsToCircleBufferInsertDataAdaptor = (ringItems) => {
                 radius,
                 padding: padding / 7,
                 rgba,
-                hide
             });
         }
 
@@ -160,7 +159,8 @@ const ringItemsToCircleBufferInsertDataAdaptor = (ringItems) => {
             centerID,
             x,
             y,
-            rings: resultRings
+            rings: resultRings,
+            hide
         });
     }
     return result;

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);
 }`;