@pirireis/webglobeplugins 0.6.15 → 0.6.17

package/circle-line-chain/plugin.js

@@ -1,5 +1,5 @@
-import { LineOnGlobeCache } from '../programs/line-on-globe/naive';
-import { CircleCache } from '../programs/line-on-globe/circle';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
+import { CircleCache } from '../programs/line-on-globe/circle-accurate';
 import { LineToTheOriginCache } from "../programs/line-on-globe/to-the-origin"
 import { BufferOrchestrator, BufferManager } from "../util/account";
 import { ChainListMap } from "./chain-list-map";
@@ -84,13 +84,21 @@ export class CircleLineChainPlugin {
             const initialCapacity = this.bufferOrchestrator.capacity;
             this.bufferManagersCompMap = new Map(
                 [
-                    ["centerCoords", {
+                    ["centerCoords2d", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([radian * item.long, radian * item.lat]),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)),
                     }],
-                    ["targetCoords", {
+                    ["centerCoords3d", {
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.long, item.lat, 0, 0)),
+                    }],
+                    ["targetCoords2d", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([radian * item.targetLong, radian * item.targetLat])
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.targetLong, item.targetLat)),
+                    }],
+                    ["targetCoords3d", {
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.targetLong, item.targetLat, 0, 0)),
                     }],
                     ["rgba", {
                         'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
@@ -133,11 +141,11 @@ export class CircleLineChainPlugin {
                 return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0 }
             };
             this.lineVao = this.lineProgram.createVAO(
-                ...['centerCoords', 'targetCoords', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
             this.circleVao = this.circleProgram.createVAO(
-                ...["centerCoords", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...["centerCoords2d", "centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
             this.toOriginVao = this.lineToTheOriginProgram.createVAO(
-                ...["targetCoords", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...["targetCoords3d", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
         }
 
     }
@@ -384,8 +392,8 @@ export class CircleLineChainPlugin {
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
         if (this._drawCircleOn) this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
         this._textContextWriterInjectionMap.forEach((writer) => writer.draw());
-        gl.enable(gl.DEPTH_TEST);
         this.lineToTheOriginProgram.draw(this.toOriginVao, this.bufferOrchestrator.length, this._opacity);
+        gl.enable(gl.DEPTH_TEST);
     }
 }
 

package/circle-line-chain/{plugin-accurate.js → plugin_old.js}

@@ -1,4 +1,4 @@
-import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive';
 import { CircleCache } from '../programs/line-on-globe/circle';
 import { LineToTheOriginCache } from "../programs/line-on-globe/to-the-origin"
 import { BufferOrchestrator, BufferManager } from "../util/account";
@@ -84,21 +84,13 @@ export class CircleLineChainPlugin {
             const initialCapacity = this.bufferOrchestrator.capacity;
             this.bufferManagersCompMap = new Map(
                 [
-                    ["centerCoords2d", {
+                    ["centerCoords", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)),
+                        'adaptor': (item) => new Float32Array([radian * item.long, radian * item.lat]),
                     }],
-                    ["centerCoords3d", {
-                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.long, item.lat, 0, 0)),
-                    }],
-                    ["targetCoords2d", {
+                    ["targetCoords", {
                         'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.targetLong, item.targetLat)),
-                    }],
-                    ["targetCoords3d", {
-                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.targetLong, item.targetLat, 0, 0)),
+                        'adaptor': (item) => new Float32Array([radian * item.targetLong, radian * item.targetLat])
                     }],
                     ["rgba", {
                         'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
@@ -141,11 +133,11 @@ export class CircleLineChainPlugin {
                 return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0 }
             };
             this.lineVao = this.lineProgram.createVAO(
-                ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-            // this.circleVao = this.circleProgram.createVAO(
-            //     ...["centerCoords", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
-            // this.toOriginVao = this.lineToTheOriginProgram.createVAO(
-            //     ...["targetCoords", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...['centerCoords', 'targetCoords', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
+            this.circleVao = this.circleProgram.createVAO(
+                ...["centerCoords", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            this.toOriginVao = this.lineToTheOriginProgram.createVAO(
+                ...["targetCoords", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
         }
 
     }

package/package.json

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

package/programs/line-on-globe/circle-accurate.js

@@ -0,0 +1,200 @@
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { vaoAttributeLoader } from "../../util/account/util";
+import {
+    longLatRadToMercator, longLatRadToCartesian3D, cartesian3DToGLPosition, mercatorXYToGLPosition, realDistanceOnSphereR1,
+    circleLimpFromLongLatRadCenterCartesian3D_accurate,
+    circleLimpFromLongLatRadCenterMercatorCompass_accurate,
+    circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate,
+    POLE
+} from "../../util/shaderfunctions/geometrytransformations";
+
+
+/**
+ * TODO: 
+ * 1. integrate geometry functions for radius angle and center
+ * 2. integrate attributes
+ * 
+ * TODO:
+ * center_position is too small or doenst loaded as expected.
+ */
+const EDGE_COUNT_ON_SPHERE = 360;
+
+const vertexShaderSource = `#version 300 es
+precision highp float;
+${CameraUniformBlockString}
+${longLatRadToMercator}
+${longLatRadToCartesian3D}
+${cartesian3DToGLPosition}
+${mercatorXYToGLPosition}
+${realDistanceOnSphereR1}
+${circleLimpFromLongLatRadCenterCartesian3D_accurate}
+${circleLimpFromLongLatRadCenterMercatorCompass_accurate}
+${circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate}
+
+uniform float edge_count;
+
+in vec2 center_position;
+in vec3 center_position3d;
+in float radius;
+in vec4 color;
+in float dash_ratio;
+in float dash_opacity;
+
+out float interpolation;
+out vec4 v_color;
+out float v_dash_ratio;
+out float v_dash_opacity;
+out vec2 v_limp;
+void main() {
+    interpolation = float( gl_VertexID ) / ${EDGE_COUNT_ON_SPHERE}.0;
+    float angle = PI * 2.0 * interpolation;
+    if ( is3D ) {
+
+        vec3 position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, radius, angle);
+    
+        gl_Position = cartesian3DToGLPosition(position);
+        v_limp = vec2(0.0, 0.0);
+    } else {
+        vec2 position;  
+        if ( radius < 1000.0) {
+            float cosine1 = cos(asin(tanh(center_position.y / 6378137.0)));
+            position = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center_position, radius /  cosine1 , angle);
+        } else {
+            position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);
+        }
+        v_limp = position;
+        gl_Position = mercatorXYToGLPosition( position);
+
+    }
+    v_dash_ratio = dash_ratio;
+    v_dash_opacity = dash_opacity;
+    v_color = color;
+
+}`
+
+const fragmentShaderSource = `#version 300 es
+${POLE}
+precision highp float;
+uniform float opacity;
+in vec4 v_color;
+in float v_dash_ratio;
+in float v_dash_opacity;
+in float interpolation;
+in vec2 v_limp;
+out vec4 color;
+void main() {
+    if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ color = vec4(0.0,0.0,0.0,0.0); return; }
+    color = v_color;
+    color.a *= opacity;
+    if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;
+    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5 ) {
+        color.a *= v_dash_opacity;
+    }   
+}
+`;
+
+
+
+class Logic {
+
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._lastOpacity = 1.0;
+
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+
+        const { gl, program } = this;
+        this.program.uniforms = {
+            opacity: gl.getUniformLocation(program, "opacity")
+        };
+
+        { // initial uniform values
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1f(program.uniforms.opacity, 1.0);
+            gl.useProgram(currentProgram);
+        }
+
+        {   // assign attribute locations
+            gl.bindAttribLocation(program, 0, "center_position");
+            gl.bindAttribLocation(program, 1, "center_position3d");
+            gl.bindAttribLocation(program, 2, "radius");
+            gl.bindAttribLocation(program, 3, "color");
+            gl.bindAttribLocation(program, 4, "dash_ratio");
+            gl.bindAttribLocation(program, 5, "dash_opacity");
+        }
+
+        this.cameraBindingPoint = 0;
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
+    }
+
+    createVAO(centerObj, center3dObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
+        gl.bindVertexArray(vao);
+        {  // make this a function end import from account module. 
+            const { buffer, stride = 0, offset = 0 } = centerObj;
+            vaoAttributeLoader(gl, buffer, 0, 2, stride, offset, divisor);
+        }
+        {  // make this a function end import from account module. 
+            const { buffer, stride = 0, offset = 0 } = center3dObj;
+            vaoAttributeLoader(gl, buffer, 1, 3, stride, offset, divisor);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = radiusObj;
+            vaoAttributeLoader(gl, buffer, 2, 1, stride, offset, divisor);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = colorObj;
+            vaoAttributeLoader(gl, buffer, 3, 4, stride, offset, divisor);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
+            vaoAttributeLoader(gl, buffer, 4, 1, stride, offset, divisor);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
+            vaoAttributeLoader(gl, buffer, 5, 1, stride, offset, divisor);
+        }
+        gl.bindVertexArray(null);
+        gl.bindVertexArray(null);
+        return vao;
+    }
+
+    draw(vao, length, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
+        gl.useProgram(program);
+
+        if (this._lastOpacity !== opacity) {
+            gl.uniform1f(program.uniforms.opacity, opacity);
+            this._lastOpacity = opacity;
+        }
+        gl.bindVertexArray(vao);
+        cameraBlockTotem.bind(cameraBindingPoint);
+        gl.drawArraysInstanced(gl.LINE_STRIP, 0, EDGE_COUNT_ON_SPHERE + 1, length);
+        cameraBlockTotem.unbind(cameraBindingPoint);
+        gl.bindVertexArray(null);
+    }
+
+
+
+    free() {
+        if (this.isFreed) return;
+        CameraUniformBlockTotemCache.release(this.globe);
+        this.gl.deleteProgram(this.program);
+        this.isFreed = true;
+    }
+}
+
+
+
+export const CircleCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+});

package/programs/line-on-globe/naive-accurate.js

@@ -19,7 +19,7 @@ ${cartesian3DToGLPosition}
 in vec2 start_position;
 in vec3 start_poisition3d;
 in vec2 end_position;
-in vec3 end_position3;
+in vec3 end_position3d;
 in float dash_ratio;
 in vec4 color;
 in float dash_opacity;
@@ -34,7 +34,7 @@ void main() {
     vec2 longLat;
     if (is3D) {
         interpolation = float(gl_VertexID) / ${GLOBE_MIDPOINT_COUNT - 1}.0;
-        vec3 cartesian = pointsOnSphereBetween(start_poisition3d, end_position3, interpolation) * R_3D;
+        vec3 cartesian = pointsOnSphereBetween(start_poisition3d, end_position3d, interpolation) * length(end_position3d);
         gl_Position = cartesian3DToGLPosition(cartesian);
         v_limp = vec2(0.0, 0.0);
     } else {

package/programs/line-on-globe/to-the-origin.js

@@ -18,7 +18,7 @@ ${R_3D}
 ${longLatRadToCartesian3DWithR}
 ${cartesian3DToGLPosition}
 
-in vec2 position2d;
+in vec3 position3d;
 in vec4 rgba;
 uniform float origin_r;
 flat out vec4 v_rgba;
@@ -28,10 +28,10 @@ void main() {
     if (!is3D) {return;} 
     vec3 cartesian;
     if(gl_VertexID == 0) {
-        cartesian = longLatRadToCartesian3DWithR(position2d, R_3D);
+        cartesian =  normalize( position3d) * R_3D;
         interpolation_value = 1.0;
     } else {
-        cartesian = longLatRadToCartesian3DWithR(position2d, origin_r);
+        cartesian = position3d;
         interpolation_value = 0.0;
     }
     gl_Position = cartesian3DToGLPosition(cartesian);
@@ -48,11 +48,12 @@ in float interpolation_value;
 flat in vec4 v_rgba;
 out vec4 color;
 void main(){
-    if ( fract( interpolation_value * 100.0) < 0.5) {discard;}
+    if ( fract( interpolation_value * 30.0) < 0.5) {discard;}
     color = vec4( 
-        v_rgba.rgb,
-        v_rgba.a * plugin_opacity * interpolation_value * 0.9
+        v_rgba.rgb * 1.2,
+        v_rgba.a * plugin_opacity
     );
+
 }`;
 
 
@@ -65,7 +66,7 @@ class Logic {
         this._lastOriginR = 6378.137 - 1;
         const { gl, program } = this;
         {
-            gl.bindAttribLocation(program, 0, "position2d");
+            gl.bindAttribLocation(program, 0, "position3d");
             gl.bindAttribLocation(program, 1, "rgba");
 
         }
@@ -105,12 +106,10 @@ class Logic {
             gl.uniform1f(this._originRLocation, originR);
             this._lastOriginR = originR;
         }
-
-        // gl.disable(gl.DEPTH_TEST);
         gl.drawArraysInstanced(gl.LINE_STRIP, 0, 2, length);
+        gl.drawArraysInstanced(gl.POINTS, 0, 2, length);
         gl.bindVertexArray(null);
         cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        // gl.enable(gl.DEPTH_TEST);
     }
 
     _checkOpacity(opacity) {
@@ -122,15 +121,15 @@ class Logic {
         if (r < 0.0 || r > 6378.137 - 0.3) throw RangeError("r should be between 0 and 6378.137 - 0.3");
     }
 
-    createVAO(potisionBufferObj, colorBufferObj) {
+    createVAO(potision3dBufferObj, colorBufferObj) {
         const { gl } = this;
         const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         {
-            const { buffer, stride = 0, offset = 0 } = potisionBufferObj;
+            const { buffer, stride = 0, offset = 0 } = potision3dBufferObj;
             gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
             gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribPointer(0, 3, gl.FLOAT, false, stride, offset);
             gl.vertexAttribDivisor(0, 1);
         }
         {

package/util/shaderfunctions/geometrytransformations.js

@@ -118,6 +118,8 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
     }
 `;
 
+
+
 // TODO: Make it precise. Y axis is not correct.
 
 export const circleLimpFromLongLatRadCenterMercatorRealDistanceNew = PI + `
@@ -306,7 +308,52 @@ const pointsOnSphereBetween = `vec3 pointsOnSphereBetween(vec3 a, vec3 b, float
     return normalize(result);
 }`
 
+
+const circleLimpFromLongLatRadCenterCartesian3D_accurate = R + `
+vec3 circleLimpFromLongLatRadCenterCartesian3D_accurate( vec3 geoW, float radius, float angle) {
+    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)); }
+    tangent1 = normalize(tangent1);
+    // rotate tangent with given angle
+    tangent1 =  cos(angle) * tangent1 - sin(angle) * cross(normal, tangent1);
+    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;
+}`;
+
+const circleLimpFromLongLatRadCenterMercatorCompass_accurate = `
+vec2 circleLimpFromLongLatRadCenterMercatorCompass_accurate(vec2 center, float radius, float angle){
+    float y = -sin(angle) * radius + center.y;
+    float x = cos(angle) * radius + center.x;
+    return vec2(x, y);
+} `;
+
+//TODO make it work...
+const circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate = PI + `
+vec2 circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate(vec2 mercator_center, float radius, float angle) {
+    vec2 center = vec2(mercator_center.x /6378137.0 , asin(tanh(mercator_center.y / 6378137.0 )));
+    float ang = angle + PI / 2.0; // Shift angle to align with +x axis
+    float r = radius / R;
+    float cos_r = cos(r);
+    float sin_r = sin(r);
+
+    float sin_lat = sin(center.y) * cos_r + cos(center.y) * sin_r * cos(ang);
+    float lat = asin(sin_lat);
+
+    float delta_long = atan(sin(ang) * sin_r * cos(center.y), cos_r - sin(center.y) * sin_lat);
+    float longi = center.x + delta_long;
+
+    return vec2(
+        R * longi,
+        R * log(tan(PI / 4.0 + lat / 2.0))
+    );
+}`;
+
 export {
-    pointsOnSphereBetween
+    pointsOnSphereBetween,
+    circleLimpFromLongLatRadCenterCartesian3D_accurate,
+    circleLimpFromLongLatRadCenterMercatorCompass_accurate,
+    circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate
 
 }