@pirireis/webglobeplugins 0.9.11 → 0.9.12

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

@@ -1,13 +1,13 @@
 "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");
+const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
+const camerauniformblock_1 = require("../totems/camerauniformblock");
+const programcache_1 = require("../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");
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const util_1 = require("./util");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -16,11 +16,63 @@ 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;
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.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
+${geometrytransformations_1.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;
@@ -28,7 +80,7 @@ var Logic = /** @class */ (function () {
         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;
+        const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
             edgeCount: gl.getUniformLocation(program, "edge_count"),
@@ -36,7 +88,7 @@ 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);
@@ -52,24 +104,23 @@ 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 (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 });
+        (0, attribute_loader_1.attributeLoader)(gl, center3dObj, 0, 3, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, bigRadiusObj, 1, 1, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, smallRadiusObj, 2, 1, { divisor });
+        (0, attribute_loader_1.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 = util_1.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 +144,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);
         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); }
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });

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

@@ -1,29 +1,77 @@
 "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");
+const totems_1 = require("../totems");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const programcache_1 = require("../programcache");
+const util_1 = require("../../util");
+const 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");
+const attribute_loader_1 = require("../../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;
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.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
+${geometrytransformations_1.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._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);
+        const { gl, program } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
         { // assign attribute locations
             gl.bindAttribLocation(program, 0, 'posA');
@@ -39,26 +87,24 @@ var Logic = /** @class */ (function () {
         { // uniform block
             this._cameraUniformBlock = totems_1.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 });
+        (0, attribute_loader_1.attributeLoader)(gl, posAObj, 0, 2, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, posBObj, 1, 2, { divisor });
+        (0, attribute_loader_1.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 = util_2.Z_ALPHA_MODE.ON) {
+        const { gl, program, _cameraBindingPoint, _cameraUniformBlock } = this;
         gl.useProgram(program);
         _cameraUniformBlock.bind(_cameraBindingPoint);
         gl.bindVertexArray(vao);
@@ -73,19 +119,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;
+        const { gl, program, globe } = this;
         totems_1.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 programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    release: (globe) => { programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });
 exports.LinesColorInstancedFlatCache = LinesColorInstancedFlatCache;

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

@@ -1,46 +1,117 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LineStripProgramCache = void 0;
-var webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
+const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
 require("../interface");
-var totems_1 = require("../totems");
-var geometrytransformations_js_1 = require("../../util/shaderfunctions/geometrytransformations.js");
-var programcache_1 = require("../programcache");
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const totems_1 = require("../totems");
+const geometrytransformations_js_1 = require("../../util/shaderfunctions/geometrytransformations.js");
+const programcache_1 = require("../programcache");
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
 require("../../util/gl-util/buffer/attribute-loader");
-var manager_1 = require("../../util/gl-util/uniform-block/manager");
+const manager_1 = require("../../util/gl-util/uniform-block/manager");
 require("../../util/gl-util/uniform-block/types");
-var methods_1 = require("../../util/gl-util/draw-options/methods");
+const methods_1 = require("../../util/gl-util/draw-options/methods");
 require("../../util/gl-util/draw-options/types");
-var ESCAPE_VALUE = -1;
-var uniformBindingPoints = {
+const ESCAPE_VALUE = -1;
+const uniformBindingPoints = {
     camera: 0,
     flexible: 1,
 };
-var one = new Float32Array([1]);
-var flexibleBlockManager = new manager_1.UniformBlockManager('FlexibleAttributes', [
+const one = new Float32Array([1]);
+const flexibleBlockManager = new manager_1.UniformBlockManager('FlexibleAttributes', [
     { name: "u_color", type: "vec4", value: new Float32Array([0.12, 1, 0.1, 1]) },
     { name: "u_dash_opacity", type: "float", value: one },
     { name: "u_dash_length", type: "float", value: one },
 ], uniformBindingPoints.flexible);
-var vertexShaderSource = "#version 300 es\nprecision highp float;\n\n".concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_js_1.cartesian3DToGLPosition, "\n").concat(geometrytransformations_js_1.mercatorXYToGLPosition, "\n\n").concat(flexibleBlockManager.glslCode(), "\n\nin vec3 position3d;\nin vec2 position2d;\nin vec4 color; \nin float dash_length;\nin float dash_opacity;\n\nout float v_dash_length;\nout float v_dash_opacity;\nout vec4 v_color;\n\nflat out vec3 v_flat_position;\nout vec3 v_position;\n\nvoid main() {\n\n    v_color = ( color.r == -1.0 ) ? u_color : color;\n    v_dash_length = ( dash_length == -1.0 ) ? u_dash_length : dash_length;\n    v_dash_opacity = ( dash_opacity == -1.0 ) ? u_dash_opacity : dash_opacity;\n\n    if ( is3D ) {\n        gl_Position = cartesian3DToGLPosition( position3d );\n        v_position = position3d;\n        v_flat_position = position3d;\n    } else {\n        gl_Position = mercatorXYToGLPosition( position2d );\n        v_position = vec3( position2d, 0.0 );\n        v_flat_position = vec3( position2d, 0.0 );\n    }\n    gl_PointSize = 4.0;\n}");
-var fragmentShaderSource = "#version 300 es\nprecision highp float;\n\nuniform float opacity;\n\nin vec4 v_color;\nin float v_dash_length;\nin float v_dash_opacity;\n\nflat in vec3 v_flat_position;\nin vec3 v_position;\n\n\nout vec4 outColor;\n\nvoid main() {\n    outColor = v_color;\n    return;\n    float dash_length = v_dash_length;\n    float dash_opacity = v_dash_opacity;\n\n    if ( dash_length == 0.0 ) {\n        outColor = vec4( v_color.rgb, v_color.a * v_dash_opacity );\n    } else {\n        float dist = distance( v_flat_position, v_position );\n        // float alpha = mod( dist , v_dash_length * 2.0 ) / v_dash_length < 1.0 ? 1.0 : v_dash_opacity;\n        outColor = vec4( v_color.rgb,  v_color.a * opacity );\n    }\n}";
+const vertexShaderSource = `#version 300 es
+precision highp float;
+
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_js_1.cartesian3DToGLPosition}
+${geometrytransformations_js_1.mercatorXYToGLPosition}
+
+${flexibleBlockManager.glslCode()}
+
+in vec3 position3d;
+in vec2 position2d;
+in vec4 color; 
+in float dash_length;
+in float dash_opacity;
+
+out float v_dash_length;
+out float v_dash_opacity;
+out vec4 v_color;
+
+flat out vec3 v_flat_position;
+out vec3 v_position;
+
+void main() {
+
+    v_color = ( color.r == -1.0 ) ? u_color : color;
+    v_dash_length = ( dash_length == -1.0 ) ? u_dash_length : dash_length;
+    v_dash_opacity = ( dash_opacity == -1.0 ) ? u_dash_opacity : dash_opacity;
+
+    if ( is3D ) {
+        gl_Position = cartesian3DToGLPosition( position3d );
+        v_position = position3d;
+        v_flat_position = position3d;
+    } else {
+        gl_Position = mercatorXYToGLPosition( position2d );
+        v_position = vec3( position2d, 0.0 );
+        v_flat_position = vec3( position2d, 0.0 );
+    }
+    gl_PointSize = 4.0;
+}`;
+const fragmentShaderSource = `#version 300 es
+precision highp float;
+
+uniform float opacity;
+
+in vec4 v_color;
+in float v_dash_length;
+in float v_dash_opacity;
+
+flat in vec3 v_flat_position;
+in vec3 v_position;
+
+
+out vec4 outColor;
+
+void main() {
+    outColor = v_color;
+    return;
+    float dash_length = v_dash_length;
+    float dash_opacity = v_dash_opacity;
+
+    if ( dash_length == 0.0 ) {
+        outColor = vec4( v_color.rgb, v_color.a * v_dash_opacity );
+    } else {
+        float dist = distance( v_flat_position, v_position );
+        // float alpha = mod( dist , v_dash_length * 2.0 ) / v_dash_length < 1.0 ? 1.0 : v_dash_opacity;
+        outColor = vec4( v_color.rgb,  v_color.a * opacity );
+    }
+}`;
 console.log("LineStripProgram");
 console.log(vertexShaderSource);
 console.log(fragmentShaderSource);
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
-        this._vaosPublished = [];
-        this._ubosPublished = [];
-        this._opacity = {
-            value: 1,
-            location: null
-        };
+class Logic {
+    _vaosPublished = [];
+    _ubosPublished = [];
+    program;
+    gl;
+    globe;
+    cameraBlockTotem;
+    _defaultFlexibleUBO;
+    _opacity = {
+        value: 1,
+        location: null
+    };
+    constructor(globe) {
         console.log("LineStripProgram globe", globe);
         this.gl = globe.gl;
         this.globe = globe;
         this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
-        var currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
+        const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
         this.gl.useProgram(this.program);
         this._opacity.location = this.gl.getUniformLocation(this.program, "opacity");
         this.gl.uniform1f(this._opacity.location, this._opacity.value);
@@ -56,15 +127,14 @@ var Logic = /** @class */ (function () {
         this._defaultFlexibleUBO = flexibleBlockManager.createUBO(this.gl);
         this.gl.useProgram(currentProgram);
     }
-    Logic.prototype.createUBO = function (bufferReadType) {
-        if (bufferReadType === void 0) { bufferReadType = "STATIC_DRAW"; }
-        var ubo = flexibleBlockManager.createUBO(this.gl, bufferReadType);
+    createUBO(bufferReadType = "STATIC_DRAW") {
+        const ubo = flexibleBlockManager.createUBO(this.gl, bufferReadType);
         this._ubosPublished.push(ubo);
         return ubo;
-    };
-    Logic.prototype.createVAO = function (position3D, position2D, color, dashLength, dashOpacity) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    }
+    createVAO(position3D, position2D, color, dashLength, dashOpacity) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         (0, attribute_loader_1.attributeLoader)(gl, position3D, 0, 3);
         (0, attribute_loader_1.attributeLoader)(gl, position2D, 1, 2);
@@ -73,17 +143,15 @@ var Logic = /** @class */ (function () {
         (0, attribute_loader_1.attributeLoader)(gl, dashOpacity, 4, 1, { escapeValues: [ESCAPE_VALUE] });
         gl.bindVertexArray(null);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, drawOptions, opacity, flexibleUBO) {
-        if (opacity === void 0) { opacity = 1; }
-        if (flexibleUBO === void 0) { flexibleUBO = null; }
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem;
+    }
+    draw(vao, drawOptions, opacity = 1, flexibleUBO = null) {
+        const { gl, program, cameraBlockTotem } = this;
         gl.useProgram(program);
         if (opacity !== this._opacity.value) {
             this._opacity.value = opacity;
             this.gl.uniform1f(this._opacity.location, this._opacity.value);
         }
-        var ubo = flexibleUBO || this._defaultFlexibleUBO;
+        const ubo = flexibleUBO || this._defaultFlexibleUBO;
         cameraBlockTotem.bind(uniformBindingPoints.camera);
         ubo.bind();
         gl.bindVertexArray(vao);
@@ -92,19 +160,17 @@ var Logic = /** @class */ (function () {
         gl.bindVertexArray(null);
         ubo.unbind();
         cameraBlockTotem.unbind(uniformBindingPoints.camera);
-    };
-    Logic.prototype.free = function () {
-        var _this = this;
-        this._vaosPublished.forEach(function (vao) { return _this.gl.deleteVertexArray(vao); });
-        this._ubosPublished.forEach(function (ubo) { return ubo.free(); });
+    }
+    free() {
+        this._vaosPublished.forEach((vao) => this.gl.deleteVertexArray(vao));
+        this._ubosPublished.forEach((ubo) => ubo.free());
         this.gl.deleteProgram(this.program);
         this._defaultFlexibleUBO.free();
         totems_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
-    };
-    return Logic;
-}());
+    }
+}
 exports.LineStripProgramCache = 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),
 });