@pirireis/webglobeplugins 0.9.11 → 0.9.12

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EDGE_COUNT = exports.CircleCache = void 0;
 exports.centerCoords2dflatDataCreator = centerCoords2dflatDataCreator;
 exports.centerCoords2dflatDataCreatorWithRadius = centerCoords2dflatDataCreatorWithRadius;
-var webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-var camerauniformblock_1 = require("../totems/camerauniformblock");
-var programcache_1 = require("../programcache");
-var util_1 = require("../../util/account/util");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var Pole = 20037508.34;
+const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
+const camerauniformblock_1 = require("../totems/camerauniformblock");
+const programcache_1 = require("../programcache");
+const util_1 = require("../../util/account/util");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const Pole = 20037508.34;
 /**
 * Warning:
 * Insert the points from the second index and skip 1 point as you placed 361 points
@@ -16,27 +16,88 @@ var Pole = 20037508.34;
 /**
  * Plus 1 for returning to the start point. 1 for cutting the circle into pieces.
  */
-var EDGE_COUNT = 62;
+const EDGE_COUNT = 62;
 exports.EDGE_COUNT = EDGE_COUNT;
-var ESCAPE_VALUE = 200000000;
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n\n# define escape_value ".concat(ESCAPE_VALUE, ".0\n\n").concat(camerauniformblock_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n\nuniform int edge_count;\n\n\nin vec2 position2d;\nin vec4 color;\nin float dash_ratio;\nin float dash_opacity;\n\nout float interpolation;\nout vec4 v_color;\nout float v_dash_ratio;\nout float v_dash_opacity;\nout vec2 v_limp;\n\n\nvoid main() {\n    if ( position2d.x == escape_value && position2d.y == escape_value){ return; }\n    interpolation = float( gl_VertexID % edge_count ) / float(edge_count);\n    if ( gl_VertexID % edge_count == 0 ) { return; } // cut on the first point.\n    if ( is3D ) {\n        return;\n        v_limp = vec2(0.0, 0.0);\n    } else {\n        v_limp = position2d;\n        gl_Position = mercatorXYToGLPosition( position2d);\n    }\n    v_dash_ratio = dash_ratio;\n    v_dash_opacity = dash_opacity;\n    v_color = color;\n    gl_PointSize = 15.0;\n\n}");
-var fragmentShaderSource = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\nuniform float opacity;\nin vec4 v_color;\nin float v_dash_ratio;\nin float v_dash_opacity;\nin float interpolation;\nin vec2 v_limp;\nout vec4 color;\nvoid main() {\n    if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ \n        discard;\n        // color = vec4(0.0,0.0,0.0,0.0); \n        // return; \n    }\n    color = v_color;\n    color.a *= opacity;\n    if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;\n    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5 ) {\n        color.a *= v_dash_opacity;\n    }   \n}");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const ESCAPE_VALUE = 200000000;
+const vertexShaderSource = `#version 300 es
+precision highp float;
+
+# define escape_value ${ESCAPE_VALUE}.0
+
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.mercatorXYToGLPosition}
+
+uniform int edge_count;
+
+
+in vec2 position2d;
+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() {
+    if ( position2d.x == escape_value && position2d.y == escape_value){ return; }
+    interpolation = float( gl_VertexID % edge_count ) / float(edge_count);
+    if ( gl_VertexID % edge_count == 0 ) { return; } // cut on the first point.
+    if ( is3D ) {
+        return;
+        v_limp = vec2(0.0, 0.0);
+    } else {
+        v_limp = position2d;
+        gl_Position = mercatorXYToGLPosition( position2d);
+    }
+    v_dash_ratio = dash_ratio;
+    v_dash_opacity = dash_opacity;
+    v_color = color;
+    gl_PointSize = 15.0;
+
+}`;
+const fragmentShaderSource = `#version 300 es
+${geometrytransformations_1.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 ){ 
+        discard;
+        // 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._lastMercatorMode = 0;
         this._lastEdgeCount = EDGE_COUNT;
         this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
             edgeCount: gl.getUniformLocation(program, "edge_count"),
             mercator_calculation_mode: gl.getUniformLocation(program, "mercator_calculation_mode")
         };
         // initial uniform values
-        var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
         gl.uniform1f(program.uniforms.opacity, 1.0);
         gl.uniform1i(program.uniforms.edgeCount, EDGE_COUNT);
@@ -49,35 +110,35 @@ var Logic = /** @class */ (function () {
         gl.bindAttribLocation(program, 3, "dash_opacity");
         this.cameraBindingPoint = 0;
         this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-        var cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
-    Logic.prototype.createVAO = function (centerObj, colorObj, dashRatioObj, dashOpacityObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    createVAO(centerObj, colorObj, dashRatioObj, dashOpacityObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         { // make this a function end import from account module. 
-            var buffer = centerObj.buffer, _a = centerObj.stride, stride = _a === void 0 ? 0 : _a, _b = centerObj.offset, offset = _b === void 0 ? 0 : _b;
+            const { buffer, stride = 0, offset = 0 } = centerObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 0, 2, stride, offset, null);
         }
         {
-            var buffer = colorObj.buffer, _c = colorObj.stride, stride = _c === void 0 ? 0 : _c, _d = colorObj.offset, offset = _d === void 0 ? 0 : _d;
+            const { buffer, stride = 0, offset = 0 } = colorObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 1, 4, stride, offset, null);
         }
         {
-            var buffer = dashRatioObj.buffer, _e = dashRatioObj.stride, stride = _e === void 0 ? 0 : _e, _f = dashRatioObj.offset, offset = _f === void 0 ? 0 : _f;
+            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 2, 1, stride, offset, null);
         }
         {
-            var buffer = dashOpacityObj.buffer, _g = dashOpacityObj.stride, stride = _g === void 0 ? 0 : _g, _h = dashOpacityObj.offset, offset = _h === void 0 ? 0 : _h;
+            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 3, 1, stride, offset, null);
         }
         gl.bindVertexArray(null);
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, length, edgeCount, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem, cameraBindingPoint = _a.cameraBindingPoint;
+    }
+    draw(vao, length, edgeCount, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
         gl.useProgram(program);
         if (this._lastOpacity !== opacity) {
             gl.uniform1f(program.uniforms.opacity, opacity);
@@ -93,37 +154,35 @@ var Logic = /** @class */ (function () {
         // gl.drawArrays(gl.POINTS, 0, length * EDGE_COUNT)
         cameraBlockTotem.unbind(cameraBindingPoint);
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
         camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
-    };
-    return Logic;
-}());
-var CircleCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    }
+}
+const CircleCache = Object.freeze({
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });
 exports.CircleCache = CircleCache;
-function centerCoords2dflatDataCreator(globe, centerLong, centerLat, targetLong, targetLat, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.startAngleOfCircle, startAngleOfCircle = _c === void 0 ? null : _c, _d = _b.edgeCount, edgeCount = _d === void 0 ? EDGE_COUNT : _d, _e = _b.radiusOffset, radiusOffset = _e === void 0 ? 0 : _e;
-    var centerCoords2dflat = new Float32Array(edgeCount * 2);
-    var radius2d = globe.Math.GetDist2D(centerLong, centerLat, targetLong, targetLat) + radiusOffset;
-    var angle;
+function centerCoords2dflatDataCreator(globe, centerLong, centerLat, targetLong, targetLat, { startAngleOfCircle = null, edgeCount = EDGE_COUNT, radiusOffset = 0 } = {}) {
+    const centerCoords2dflat = new Float32Array(edgeCount * 2);
+    const radius2d = globe.Math.GetDist2D(centerLong, centerLat, targetLong, targetLat) + radiusOffset;
+    let angle;
     if (startAngleOfCircle === null) {
         angle = globe.Math.GetAzimuthAngle(centerLong, centerLat, targetLong, targetLat);
     }
     else {
         angle = startAngleOfCircle;
     }
-    var pointsLongLat = globe.Math.GetEllipseGeo(centerLong, centerLat, radius2d, radius2d, angle, 360 / (edgeCount - 2));
-    var lastlg = pointsLongLat[0].long;
-    var lastlt = pointsLongLat[0].lat;
-    for (var i = 1; i < edgeCount; i++) {
-        var _f = pointsLongLat[i - 1], lg = _f.long, lt = _f.lat;
+    const pointsLongLat = globe.Math.GetEllipseGeo(centerLong, centerLat, radius2d, radius2d, angle, 360 / (edgeCount - 2));
+    let lastlg = pointsLongLat[0].long;
+    let lastlt = pointsLongLat[0].lat;
+    for (let i = 1; i < edgeCount; i++) {
+        const { long: lg, lat: lt } = pointsLongLat[i - 1];
         if (manhattanDistance(lastlg, lastlt, lg, lt) < 170) {
             centerCoords2dflat.set(globe.api_GetMercator2DPoint(lg, lt), i * 2);
         }
@@ -135,13 +194,12 @@ function centerCoords2dflatDataCreator(globe, centerLong, centerLat, targetLong,
     }
     return centerCoords2dflat;
 }
-function centerCoords2dflatDataCreatorWithRadius(globe, centerLong, centerLat, radius2d, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.startAngleOfCircle, startAngleOfCircle = _c === void 0 ? null : _c, _d = _b.edgeCount, edgeCount = _d === void 0 ? EDGE_COUNT : _d;
-    var centerCoords2dflat = new Float32Array(edgeCount * 2);
-    var pointsLongLat = globe.Math.GetEllipseGeo(centerLong, centerLat, radius2d, radius2d, 0, 360 / (edgeCount - 2));
-    var _e = pointsLongLat[0], lastlg = _e.long, lastlt = _e.lat;
-    for (var i = 1; i < edgeCount; i++) {
-        var _f = pointsLongLat[i - 1], lg = _f.long, lt = _f.lat;
+function centerCoords2dflatDataCreatorWithRadius(globe, centerLong, centerLat, radius2d, { startAngleOfCircle = null, edgeCount = EDGE_COUNT } = {}) {
+    const centerCoords2dflat = new Float32Array(edgeCount * 2);
+    const pointsLongLat = globe.Math.GetEllipseGeo(centerLong, centerLat, radius2d, radius2d, 0, 360 / (edgeCount - 2));
+    let { long: lastlg, lat: lastlt } = pointsLongLat[0];
+    for (let i = 1; i < edgeCount; i++) {
+        const { long: lg, lat: lt } = pointsLongLat[i - 1];
         if (manhattanDistance(lastlg, lastlt, lg, lt) < 170) {
             centerCoords2dflat.set(globe.api_GetMercator2DPoint(lg, lt), i * 2);
         }

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CircleCache = void 0;
-var webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-var camerauniformblock_1 = require("../totems/camerauniformblock");
-var programcache_1 = require("../programcache");
-var util_1 = require("../../util/account/util");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
+const camerauniformblock_1 = require("../totems/camerauniformblock");
+const programcache_1 = require("../programcache");
+const util_1 = require("../../util/account/util");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -14,21 +14,92 @@ var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytran
  * TODO:
  * center_position is too small or doenst loaded as expected.
  */
-var EDGE_COUNT_ON_SPHERE = 360;
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n".concat(camerauniformblock_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.longLatRadToMercator, "\n").concat(geometrytransformations_1.longLatRadToCartesian3D, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.realDistanceOnSphereR1, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D_accurate, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass_accurate, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate, "\n\nuniform float edge_count;\n\nin vec2 center_position;\nin vec3 center_position3d;\nin float radius;\nin vec4 color;\nin float dash_ratio;\nin float dash_opacity;\n\nout float interpolation;\nout vec4 v_color;\nout float v_dash_ratio;\nout float v_dash_opacity;\nout vec2 v_limp;\nvoid main() {\n    interpolation = float( gl_VertexID ) / ").concat(EDGE_COUNT_ON_SPHERE, ".0;\n    float angle = PI * 2.0 * interpolation;\n    if ( is3D ) {\n\n        vec3 position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, radius, angle);\n    \n        gl_Position = cartesian3DToGLPosition(position);\n        v_limp = vec2(0.0, 0.0);\n    } else {\n        vec2 position;  \n        if ( radius < 0.0) {\n            float cosine1 = cos(asin(tanh(center_position.y / 6378137.0)));\n            position = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center_position, radius /  cosine1 , angle);\n        } else {\n            position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);\n        }\n        v_limp = position;\n        gl_Position = mercatorXYToGLPosition( position);\n\n    }\n    v_dash_ratio = dash_ratio;\n    v_dash_opacity = dash_opacity;\n    v_color = color;\n    gl_PointSize = 3.0;\n\n}");
-var fragmentShaderSource = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\nuniform float opacity;\nin vec4 v_color;\nin float v_dash_ratio;\nin float v_dash_opacity;\nin float interpolation;\nin vec2 v_limp;\nout vec4 color;\nvoid main() {\n    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; }\n    color = v_color;\n    color.a *= opacity;\n    if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;\n    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5 ) {\n        color.a *= v_dash_opacity;\n    }   \n}\n");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const EDGE_COUNT_ON_SPHERE = 360;
+const vertexShaderSource = `#version 300 es
+precision highp float;
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.longLatRadToMercator}
+${geometrytransformations_1.longLatRadToCartesian3D}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.realDistanceOnSphereR1}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D_accurate}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass_accurate}
+${geometrytransformations_1.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 < 0.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;
+    gl_PointSize = 3.0;
+
+}`;
+const fragmentShaderSource = `#version 300 es
+${geometrytransformations_1.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 = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity")
         };
         { // initial uniform values
-            var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
             gl.useProgram(program);
             gl.uniform1f(program.uniforms.opacity, 1.0);
             gl.useProgram(currentProgram);
@@ -43,44 +114,44 @@ var Logic = /** @class */ (function () {
         }
         this.cameraBindingPoint = 0;
         this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-        var cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
-    Logic.prototype.createVAO = function (centerObj, center3dObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    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. 
-            var buffer = centerObj.buffer, _a = centerObj.stride, stride = _a === void 0 ? 0 : _a, _b = centerObj.offset, offset = _b === void 0 ? 0 : _b;
+            const { buffer, stride = 0, offset = 0 } = centerObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 0, 2, stride, offset, divisor);
         }
         { // make this a function end import from account module. 
-            var buffer = center3dObj.buffer, _c = center3dObj.stride, stride = _c === void 0 ? 0 : _c, _d = center3dObj.offset, offset = _d === void 0 ? 0 : _d;
+            const { buffer, stride = 0, offset = 0 } = center3dObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 1, 3, stride, offset, divisor);
         }
         {
-            var buffer = radiusObj.buffer, _e = radiusObj.stride, stride = _e === void 0 ? 0 : _e, _f = radiusObj.offset, offset = _f === void 0 ? 0 : _f;
+            const { buffer, stride = 0, offset = 0 } = radiusObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 2, 1, stride, offset, divisor);
         }
         {
-            var buffer = colorObj.buffer, _g = colorObj.stride, stride = _g === void 0 ? 0 : _g, _h = colorObj.offset, offset = _h === void 0 ? 0 : _h;
+            const { buffer, stride = 0, offset = 0 } = colorObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 3, 4, stride, offset, divisor);
         }
         {
-            var buffer = dashRatioObj.buffer, _j = dashRatioObj.stride, stride = _j === void 0 ? 0 : _j, _k = dashRatioObj.offset, offset = _k === void 0 ? 0 : _k;
+            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 4, 1, stride, offset, divisor);
         }
         {
-            var buffer = dashOpacityObj.buffer, _l = dashOpacityObj.stride, stride = _l === void 0 ? 0 : _l, _m = dashOpacityObj.offset, offset = _m === void 0 ? 0 : _m;
+            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 5, 1, stride, offset, divisor);
         }
         gl.bindVertexArray(null);
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, length, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem, cameraBindingPoint = _a.cameraBindingPoint;
+    }
+    draw(vao, length, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
         gl.useProgram(program);
         if (this._lastOpacity !== opacity) {
             gl.uniform1f(program.uniforms.opacity, opacity);
@@ -92,17 +163,16 @@ var Logic = /** @class */ (function () {
         gl.drawArraysInstanced(gl.POINTS, 0, EDGE_COUNT_ON_SPHERE + 1, length);
         cameraBlockTotem.unbind(cameraBindingPoint);
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
         camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
-    };
-    return Logic;
-}());
+    }
+}
 exports.CircleCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CircleCache = void 0;
-var webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-var camerauniformblock_1 = require("../totems/camerauniformblock");
-var programcache_1 = require("../programcache");
-var util_1 = require("../../util/account/util");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
+const camerauniformblock_1 = require("../totems/camerauniformblock");
+const programcache_1 = require("../programcache");
+const util_1 = require("../../util/account/util");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -14,21 +14,87 @@ var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytran
  * TODO:
  * center_position is too small or doenst loaded as expected.
  */
-var EDGE_COUNT_ON_SPHERE = 360;
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n".concat(camerauniformblock_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.longLatRadToMercator, "\n").concat(geometrytransformations_1.longLatRadToCartesian3D, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.realDistanceOnSphereR1, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorRealDistance, "\n\nuniform float edge_count;\n\nin vec2 center_position;\nin float radius;\nin vec4 color;\nin float dash_ratio;\nin float dash_opacity;\n\nout float interpolation;\nout vec4 v_color;\nout float v_dash_ratio;\nout float v_dash_opacity;\nout vec2 v_limp;\nvoid main() {\n    interpolation = float( gl_VertexID ) / ").concat(EDGE_COUNT_ON_SPHERE, ".0;\n    float angle = PI * 2.0 * interpolation;\n    if ( is3D ) {\n        vec3 position = circleLimpFromLongLatRadCenterCartesian3D( center_position, radius, angle);\n        gl_Position = cartesian3DToGLPosition(position);\n        v_limp = vec2(0.0, 0.0);\n    } else {\n        vec2 position;\n        if (radius < 1400.0) {\n            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius/ cos(center_position.y), angle);\n        } else {\n           position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);\n        }\n        v_limp = position;\n        gl_Position = mercatorXYToGLPosition( position);\n\n    }\n    v_dash_ratio = dash_ratio;\n    v_dash_opacity = dash_opacity;\n    v_color = color;\n\n}");
-var fragmentShaderSource = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\nuniform float opacity;\nin vec4 v_color;\nin float v_dash_ratio;\nin float v_dash_opacity;\nin float interpolation;\nin vec2 v_limp;\nout vec4 color;\nvoid main() {\n    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; }\n    color = v_color;\n    color.a *= opacity;\n    if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;\n    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5 ) {\n        color.a *= v_dash_opacity;\n    }   \n}\n");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const EDGE_COUNT_ON_SPHERE = 360;
+const vertexShaderSource = `#version 300 es
+precision highp float;
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.longLatRadToMercator}
+${geometrytransformations_1.longLatRadToCartesian3D}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.realDistanceOnSphereR1}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorRealDistance}
+
+uniform float edge_count;
+
+in vec2 center_position;
+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( center_position, radius, angle);
+        gl_Position = cartesian3DToGLPosition(position);
+        v_limp = vec2(0.0, 0.0);
+    } else {
+        vec2 position;
+        if (radius < 1400.0) {
+            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius/ cos(center_position.y), angle);
+        } else {
+           position = circleLimpFromLongLatRadCenterMercatorRealDistance( 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
+${geometrytransformations_1.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 = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity")
         };
         { // initial uniform values
-            var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
             gl.useProgram(program);
             gl.uniform1f(program.uniforms.opacity, 1.0);
             gl.useProgram(currentProgram);
@@ -42,40 +108,40 @@ var Logic = /** @class */ (function () {
         }
         this.cameraBindingPoint = 0;
         this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-        var cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
-    Logic.prototype.createVAO = function (centerObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    createVAO(centerObj, 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. 
-            var buffer = centerObj.buffer, _a = centerObj.stride, stride = _a === void 0 ? 0 : _a, _b = centerObj.offset, offset = _b === void 0 ? 0 : _b;
+            const { buffer, stride = 0, offset = 0 } = centerObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 0, 2, stride, offset, divisor);
         }
         {
-            var buffer = radiusObj.buffer, _c = radiusObj.stride, stride = _c === void 0 ? 0 : _c, _d = radiusObj.offset, offset = _d === void 0 ? 0 : _d;
+            const { buffer, stride = 0, offset = 0 } = radiusObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 1, 1, stride, offset, divisor);
         }
         {
-            var buffer = colorObj.buffer, _e = colorObj.stride, stride = _e === void 0 ? 0 : _e, _f = colorObj.offset, offset = _f === void 0 ? 0 : _f;
+            const { buffer, stride = 0, offset = 0 } = colorObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 2, 4, stride, offset, divisor);
         }
         {
-            var buffer = dashRatioObj.buffer, _g = dashRatioObj.stride, stride = _g === void 0 ? 0 : _g, _h = dashRatioObj.offset, offset = _h === void 0 ? 0 : _h;
+            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 3, 1, stride, offset, divisor);
         }
         {
-            var buffer = dashOpacityObj.buffer, _j = dashOpacityObj.stride, stride = _j === void 0 ? 0 : _j, _k = dashOpacityObj.offset, offset = _k === void 0 ? 0 : _k;
+            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
             (0, util_1.vaoAttributeLoader)(gl, buffer, 4, 1, stride, offset, divisor);
         }
         gl.bindVertexArray(null);
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, length, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem, cameraBindingPoint = _a.cameraBindingPoint;
+    }
+    draw(vao, length, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
         gl.useProgram(program);
         if (this._lastOpacity !== opacity) {
             gl.uniform1f(program.uniforms.opacity, opacity);
@@ -86,17 +152,16 @@ var Logic = /** @class */ (function () {
         gl.drawArraysInstanced(gl.LINE_STRIP, 0, EDGE_COUNT_ON_SPHERE + 1, length);
         cameraBlockTotem.unbind(cameraBindingPoint);
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
         camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
-    };
-    return Logic;
-}());
+    }
+}
 exports.CircleCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });