@pirireis/webglobeplugins 0.9.11 → 0.9.13

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

@@ -1,11 +1,8 @@
-"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");
+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, circleLimpFromLongLatRadCenterMercatorCompass, circleLimpFromLongLatRadCenterMercatorRealDistance, POLE } from "../../util/shaderfunctions/geometrytransformations";
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -14,21 +11,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;
+${CameraUniformBlockString}
+${longLatRadToMercator}
+${longLatRadToCartesian3D}
+${cartesian3DToGLPosition}
+${mercatorXYToGLPosition}
+${realDistanceOnSphereR1}
+${circleLimpFromLongLatRadCenterCartesian3D}
+${circleLimpFromLongLatRadCenterMercatorCompass}
+${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
+${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;
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+        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);
@@ -41,41 +104,41 @@ var Logic = /** @class */ (function () {
             gl.bindAttribLocation(program, 4, "dash_opacity");
         }
         this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-        var cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        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;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 0, 2, stride, offset, divisor);
+            const { buffer, stride = 0, offset = 0 } = centerObj;
+            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;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 1, 1, stride, offset, divisor);
+            const { buffer, stride = 0, offset = 0 } = radiusObj;
+            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;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 2, 4, stride, offset, divisor);
+            const { buffer, stride = 0, offset = 0 } = colorObj;
+            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;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 3, 1, stride, offset, divisor);
+            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
+            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;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 4, 1, stride, offset, divisor);
+            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
+            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 +149,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);
+        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); }
+    }
+}
+export const CircleCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });

package/programs/line-on-globe/degree-padding-around-circle-3d.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CirclePadding3DCache = void 0;
-var webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-var camerauniformblock_1 = require("../totems/camerauniformblock");
-var programcache_1 = require("../programcache");
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
+import { noRegisterGlobeProgramCache } from "../programcache";
 // import { vaoAttributeLoader } from "../../util/account/util";
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
-var util_1 = require("./util");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { Z_ALPHA_MODE } from "./util";
+import { cartesian3DToGLPosition, circleLimpFromLongLatRadCenterCartesian3D_accurate, POLE, } from "../../util/shaderfunctions/geometrytransformations";
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -16,19 +13,71 @@ var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytran
  * TODO:
  * center_position is too small or doenst loaded as expected.
  */
-var INITIAL_EDGE_COUNT = 720;
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n".concat(camerauniformblock_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D_accurate, "\n\n\nin vec3 center_position3d;\nin float big_radius;\nin float small_radius;\nin vec4 color;\n\nuniform float edge_count;\nuniform float step_angle;\nuniform int z_alpha_on;\n\nout float interpolation;\nout vec4 v_color;\nvoid main() {\n    if( !is3D) {\n        return;\n    }\n    v_color = color;\n    if ( z_alpha_on == 1 ){\n        float z_alpha = pow(z_level * 0.75, 3.0) * distance(big_radius, small_radius) / (R * 2.0);\n        if ( z_alpha < 0.1 ) { return; }\n        v_color.a *= z_alpha;\n    }\n    int pad_phase =  gl_VertexID % 2; // 0 or 1\n    interpolation = float( gl_VertexID - pad_phase) / edge_count;\n    float angle = float( gl_VertexID - pad_phase) * step_angle;\n    vec3 position;\n    if ( pad_phase == 0 ) {\n        position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, big_radius, angle);\n    } else {\n        position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, small_radius, angle);\n    }\n    gl_Position = cartesian3DToGLPosition(position);\n\n    gl_PointSize = 5.0;\n}");
-var fragmentShaderSource = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\nuniform float opacity;\nin vec4 v_color;\nin float interpolation;\nin vec2 v_limp;\nout vec4 color;\nvoid main() {\n    color = v_color;\n    color.a *= opacity;\n}\n");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const INITIAL_EDGE_COUNT = 720;
+const vertexShaderSource = `#version 300 es
+precision highp float;
+${CameraUniformBlockString}
+${cartesian3DToGLPosition}
+${circleLimpFromLongLatRadCenterCartesian3D_accurate}
+
+
+in vec3 center_position3d;
+in float big_radius;
+in float small_radius;
+in vec4 color;
+
+uniform float edge_count;
+uniform float step_angle;
+uniform int z_alpha_on;
+
+out float interpolation;
+out vec4 v_color;
+void main() {
+    if( !is3D) {
+        return;
+    }
+    v_color = color;
+    if ( z_alpha_on == 1 ){
+        float z_alpha = pow(z_level * 0.75, 3.0) * distance(big_radius, small_radius) / (R * 2.0);
+        if ( z_alpha < 0.1 ) { return; }
+        v_color.a *= z_alpha;
+    }
+    int pad_phase =  gl_VertexID % 2; // 0 or 1
+    interpolation = float( gl_VertexID - pad_phase) / edge_count;
+    float angle = float( gl_VertexID - pad_phase) * step_angle;
+    vec3 position;
+    if ( pad_phase == 0 ) {
+        position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, big_radius, angle);
+    } else {
+        position = circleLimpFromLongLatRadCenterCartesian3D_accurate(center_position3d, small_radius, angle);
+    }
+    gl_Position = cartesian3DToGLPosition(position);
+
+    gl_PointSize = 5.0;
+}`;
+const fragmentShaderSource = `#version 300 es
+${POLE}
+precision highp float;
+uniform float opacity;
+in vec4 v_color;
+in float interpolation;
+in vec2 v_limp;
+out vec4 color;
+void main() {
+    color = v_color;
+    color.a *= opacity;
+}
+`;
+class Logic {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this._lastOpacity = 1.0;
         this._lastEdgeCount = INITIAL_EDGE_COUNT;
         this._lastStepAngle = 720 / INITIAL_EDGE_COUNT;
-        this._lastZAlphaMode = util_1.Z_ALPHA_MODE.ON;
-        this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
-        var _a = this, gl = _a.gl, program = _a.program;
+        this._lastZAlphaMode = Z_ALPHA_MODE.ON;
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+        const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
             edgeCount: gl.getUniformLocation(program, "edge_count"),
@@ -36,12 +85,12 @@ var Logic = /** @class */ (function () {
             zAlphaMode: gl.getUniformLocation(program, "z_alpha_on")
         };
         { // 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.uniform1f(program.uniforms.edgeCount, INITIAL_EDGE_COUNT * 2);
             gl.uniform1f(program.uniforms.stepAngle, this._lastStepAngle * Math.PI / 360);
-            gl.uniform1i(program.uniforms.zAlphaMode, util_1.Z_ALPHA_MODE.ON);
+            gl.uniform1i(program.uniforms.zAlphaMode, Z_ALPHA_MODE.ON);
             gl.useProgram(currentProgram);
         }
         { // assign attribute locations
@@ -51,25 +100,24 @@ var Logic = /** @class */ (function () {
             gl.bindAttribLocation(program, 3, "color");
         }
         this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-        var cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
-    Logic.prototype.createVAO = function (center3dObj, bigRadiusObj, smallRadiusObj, colorObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    createVAO(center3dObj, bigRadiusObj, smallRadiusObj, colorObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
         gl.bindVertexArray(vao);
-        (0, attribute_loader_1.attributeLoader)(gl, center3dObj, 0, 3, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, bigRadiusObj, 1, 1, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, smallRadiusObj, 2, 1, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 3, 4, { divisor: divisor });
+        attributeLoader(gl, center3dObj, 0, 3, { divisor });
+        attributeLoader(gl, bigRadiusObj, 1, 1, { divisor });
+        attributeLoader(gl, smallRadiusObj, 2, 1, { divisor });
+        attributeLoader(gl, colorObj, 3, 4, { divisor });
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, length, edgeCount, stepAngle, opacity, zAlphaMode) {
-        if (zAlphaMode === void 0) { zAlphaMode = util_1.Z_ALPHA_MODE.ON; }
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem, cameraBindingPoint = _a.cameraBindingPoint;
+    }
+    draw(vao, length, edgeCount, stepAngle, opacity, zAlphaMode = Z_ALPHA_MODE.ON) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
         gl.useProgram(program);
         if (this._lastOpacity !== opacity) {
             gl.uniform1f(program.uniforms.opacity, opacity);
@@ -93,17 +141,16 @@ var Logic = /** @class */ (function () {
         // gl.drawArraysInstanced(gl.POINTS, 0, edgeCount, length);
         cameraBlockTotem.unbind(cameraBindingPoint);
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
-        camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
+        CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
-    };
-    return Logic;
-}());
-exports.CirclePadding3DCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    }
+}
+export const CirclePadding3DCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });

package/programs/line-on-globe/lines-color-instanced-flat.js

@@ -1,29 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Z_ALPHA_MODE = exports.LinesColorInstancedFlatCache = void 0;
-var totems_1 = require("../totems");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var programcache_1 = require("../programcache");
-var util_1 = require("../../util");
-var util_2 = require("./util");
-Object.defineProperty(exports, "Z_ALPHA_MODE", { enumerable: true, get: function () { return util_2.Z_ALPHA_MODE; } });
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, POLE } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { createProgram } from "../../util";
+import { Z_ALPHA_MODE } from "./util";
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
 /**
  * This program draws line between points provided from the first and second buffer.
  * draw method gl.drawArraysInstanced( gl.POINTS, 0,2, lineCount);
  * */
 // TODO: find better way to eleminate edge case distance(posA, posB) > 37000000.0
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n".concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\nuniform float opacity;\nuniform int z_alpha_on;\n\nin vec2 posA;\nin vec2 posB;\nin vec4 color;\n\nout vec2 v_frame;\nout vec4 v_color;\nvoid main() {\n    \n    if ( is3D ) {\n        return;\n    }\n    float gap = max( distance(posA.x, posB.x), distance(posA.y,posB.y)); // \n    if ( gap > 37000000.0) { return; }\n    float z_alpha;\n    if ( z_alpha_on == 1 ){ \n        z_alpha =  pow(2.0,z_level+1.0) /  ( 10000000.0 / gap);\n        z_alpha = smoothstep(0.1,0.9, z_alpha);\n        if( z_alpha < 0.01) {return;}\n    } else {\n        z_alpha = 1.0;\n    }\n        vec2 pos;\n    if ( gl_VertexID == 0 ) {\n        pos = posA;\n        } else {\n            pos = posB;\n    }\n    v_frame = pos;\n    gl_Position = mercatorXYToGLPosition( pos );\n    v_color = color;\n    v_color.a *= z_alpha * opacity;\n    gl_PointSize = 4.0;\n}");
-var fragmentShaderSource = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\nin vec4 v_color;\nin vec2 v_frame;\nout vec4 outColor;\nvoid main() {\n    if ( v_frame.x < -POLE || v_frame.x > POLE || v_frame.y < -POLE || v_frame.y > POLE ){ discard; }\n    outColor = v_color;\n}");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const vertexShaderSource = `#version 300 es
+precision highp float;
+${CameraUniformBlockString}
+${mercatorXYToGLPosition}
+uniform float opacity;
+uniform int z_alpha_on;
+
+in vec2 posA;
+in vec2 posB;
+in vec4 color;
+
+out vec2 v_frame;
+out vec4 v_color;
+void main() {
+    
+    if ( is3D ) {
+        return;
+    }
+    float gap = max( distance(posA.x, posB.x), distance(posA.y,posB.y)); // 
+    if ( gap > 37000000.0) { return; }
+    float z_alpha;
+    if ( z_alpha_on == 1 ){ 
+        z_alpha =  pow(2.0,z_level+1.0) /  ( 10000000.0 / gap);
+        z_alpha = smoothstep(0.1,0.9, z_alpha);
+        if( z_alpha < 0.01) {return;}
+    } else {
+        z_alpha = 1.0;
+    }
+        vec2 pos;
+    if ( gl_VertexID == 0 ) {
+        pos = posA;
+        } else {
+            pos = posB;
+    }
+    v_frame = pos;
+    gl_Position = mercatorXYToGLPosition( pos );
+    v_color = color;
+    v_color.a *= z_alpha * opacity;
+    gl_PointSize = 4.0;
+}`;
+const fragmentShaderSource = `#version 300 es
+${POLE}
+precision highp float;
+in vec4 v_color;
+in vec2 v_frame;
+out vec4 outColor;
+void main() {
+    if ( v_frame.x < -POLE || v_frame.x > POLE || v_frame.y < -POLE || v_frame.y > POLE ){ discard; }
+    outColor = v_color;
+}`;
+class Logic {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
-        this.program = (0, util_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
         this._lastOpicity = 1.0;
-        this._lastZAlphaOn = util_2.Z_ALPHA_MODE.OFF;
-        var _a = this, gl = _a.gl, program = _a.program;
-        var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        this._lastZAlphaOn = Z_ALPHA_MODE.OFF;
+        const { gl, program } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
         { // assign attribute locations
             gl.bindAttribLocation(program, 0, 'posA');
@@ -37,28 +81,26 @@ var Logic = /** @class */ (function () {
             gl.uniform1f(this._opacityLocation, this._lastOpicity);
         }
         { // uniform block
-            this._cameraUniformBlock = totems_1.CameraUniformBlockTotemCache.get(globe);
+            this._cameraUniformBlock = CameraUniformBlockTotemCache.get(globe);
             this._cameraBindingPoint = 0;
-            var cameraBlockBindingIndex = gl.getUniformBlockIndex(program, 'CameraUniformBlock');
+            const cameraBlockBindingIndex = gl.getUniformBlockIndex(program, 'CameraUniformBlock');
             gl.uniformBlockBinding(program, cameraBlockBindingIndex, this._cameraBindingPoint);
         }
         gl.useProgram(currentProgram);
     }
-    Logic.prototype.createVAO = function (posAObj, posBObj, colorObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    createVAO(posAObj, posBObj, colorObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
         gl.bindVertexArray(vao);
-        (0, attribute_loader_1.attributeLoader)(gl, posAObj, 0, 2, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, posBObj, 1, 2, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 2, 4, { divisor: divisor });
+        attributeLoader(gl, posAObj, 0, 2, { divisor });
+        attributeLoader(gl, posBObj, 1, 2, { divisor });
+        attributeLoader(gl, colorObj, 2, 4, { divisor });
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, lineCount, opacity, zAlphaOn) {
-        if (opacity === void 0) { opacity = 1.0; }
-        if (zAlphaOn === void 0) { zAlphaOn = util_2.Z_ALPHA_MODE.ON; }
-        var _a = this, gl = _a.gl, program = _a.program, _cameraBindingPoint = _a._cameraBindingPoint, _cameraUniformBlock = _a._cameraUniformBlock;
+    }
+    draw(vao, lineCount, opacity = 1.0, zAlphaOn = Z_ALPHA_MODE.ON) {
+        const { gl, program, _cameraBindingPoint, _cameraUniformBlock } = this;
         gl.useProgram(program);
         _cameraUniformBlock.bind(_cameraBindingPoint);
         gl.bindVertexArray(vao);
@@ -73,19 +115,18 @@ var Logic = /** @class */ (function () {
         gl.drawArraysInstanced(gl.LINES, 0, 2, lineCount);
         _cameraUniformBlock.unbind(_cameraBindingPoint);
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
-        var _a = this, gl = _a.gl, program = _a.program, globe = _a.globe;
-        totems_1.CameraUniformBlockTotemCache.release(globe);
+        const { gl, program, globe } = this;
+        CameraUniformBlockTotemCache.release(globe);
         gl.deleteProgram(program);
         this.isFreed = true;
-    };
-    return Logic;
-}());
-var LinesColorInstancedFlatCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    }
+}
+const LinesColorInstancedFlatCache = Object.freeze({
+    get: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    release: (globe) => { noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });
-exports.LinesColorInstancedFlatCache = LinesColorInstancedFlatCache;
+export { LinesColorInstancedFlatCache, Z_ALPHA_MODE };