@pirireis/webglobeplugins 0.9.11 → 0.9.12

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

@@ -1,37 +1,111 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LineOnGlobeCache = void 0;
-var totems_1 = require("../totems");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var util_1 = require("../../util");
-var programcache_1 = require("../programcache");
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
-var manager_1 = require("../../util/gl-util/uniform-block/manager");
+const totems_1 = require("../totems");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const util_1 = require("../../util");
+const programcache_1 = require("../programcache");
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const manager_1 = require("../../util/gl-util/uniform-block/manager");
 require("../../util/gl-util/draw-options/types");
-var methods_1 = require("../../util/gl-util/draw-options/methods");
-var GLOBE_MIDPOINT_COUNT = 30;
-var escapeValue = -1.0;
-var uniformBindingPoints = {
+const methods_1 = require("../../util/gl-util/draw-options/methods");
+const GLOBE_MIDPOINT_COUNT = 30;
+const escapeValue = -1.0;
+const uniformBindingPoints = {
     camera: 0,
     flexible: 1
 };
-var uniformBlockManager = new manager_1.UniformBlockManager('FlexibleAttibutes', [
+const uniformBlockManager = new manager_1.UniformBlockManager('FlexibleAttibutes', [
     { name: 'u_color', type: 'vec4' },
     { name: 'u_dash_ratio', type: 'float' },
     { name: 'u_dash_opacity', type: 'float' }
 ], uniformBindingPoints.flexible);
-var vertexShader = "#version 300 es\nprecision highp float;\n\n".concat(geometrytransformations_1.R_3D, "\n").concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.slerp, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n\n").concat(uniformBlockManager.glslCode(), "\n\nin vec2 start_position;\nin vec3 start_position3d;\nin vec2 end_position;\nin vec3 end_position3d;\n\nin float dash_ratio;\nin float dash_opacity;\nin vec4 color;\n\nout float v_dash_ratio;\nout float v_dash_opacity;\nout vec4 v_color;\n\nout vec2 v_limp;\nout float interpolation;\n\nvoid main() {\n    vec2 longLat;\n\n    v_color = (color.r == -1.0) ? u_color: color;\n    v_dash_ratio = (dash_ratio == -1.0) ? u_dash_ratio : dash_ratio;\n    v_dash_opacity = (dash_opacity == -1.0) ? u_dash_opacity : dash_opacity;\n\n    if (is3D) {\n        interpolation = float(gl_VertexID) / ").concat(GLOBE_MIDPOINT_COUNT - 1, ".0;\n        vec3 cartesian = slerp(start_position3d, end_position3d, interpolation);\n        gl_Position = cartesian3DToGLPosition(cartesian);\n        v_limp = vec2(0.0, 0.0);\n    } else {\n        if ( distance( start_position, end_position) > 30000000.0) { return; }\n        interpolation = float(gl_VertexID);\n        if (gl_VertexID % 2 == 0) {\n            longLat = start_position;\n        } else {\n            longLat = end_position;\n        }\n        v_limp = longLat;\n        gl_Position = mercatorXYToGLPosition(longLat);\n    }\n}\n");
-var fragmentShader = "#version 300 es\n".concat(geometrytransformations_1.POLE, "\nprecision highp float;\n\nuniform float opacity;\n\nin float interpolation;\nin vec2 v_limp;\nin vec4 v_color;\nin float v_dash_ratio;\nin float v_dash_opacity;\n\nout vec4 color;\n\nvoid main() {\n    if (v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE) { discard; }\n    color = v_color;\n    color.a *= opacity;\n    if ( v_dash_ratio >= 1.0 ) { return; }\n    if (interpolation > 0.95) { return; }\n    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a *= v_dash_opacity; }\n\n}\n");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
-        this.vaosPublished = [];
-        this.isFreed = false;
+const vertexShader = `#version 300 es
+precision highp float;
+
+${geometrytransformations_1.R_3D}
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.slerp}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.cartesian3DToGLPosition}
+
+${uniformBlockManager.glslCode()}
+
+in vec2 start_position;
+in vec3 start_position3d;
+in vec2 end_position;
+in vec3 end_position3d;
+
+in float dash_ratio;
+in float dash_opacity;
+in vec4 color;
+
+out float v_dash_ratio;
+out float v_dash_opacity;
+out vec4 v_color;
+
+out vec2 v_limp;
+out float interpolation;
+
+void main() {
+    vec2 longLat;
+
+    v_color = (color.r == -1.0) ? u_color: color;
+    v_dash_ratio = (dash_ratio == -1.0) ? u_dash_ratio : dash_ratio;
+    v_dash_opacity = (dash_opacity == -1.0) ? u_dash_opacity : dash_opacity;
+
+    if (is3D) {
+        interpolation = float(gl_VertexID) / ${GLOBE_MIDPOINT_COUNT - 1}.0;
+        vec3 cartesian = slerp(start_position3d, end_position3d, interpolation);
+        gl_Position = cartesian3DToGLPosition(cartesian);
+        v_limp = vec2(0.0, 0.0);
+    } else {
+        if ( distance( start_position, end_position) > 30000000.0) { return; }
+        interpolation = float(gl_VertexID);
+        if (gl_VertexID % 2 == 0) {
+            longLat = start_position;
+        } else {
+            longLat = end_position;
+        }
+        v_limp = longLat;
+        gl_Position = mercatorXYToGLPosition(longLat);
+    }
+}
+`;
+const fragmentShader = `#version 300 es
+${geometrytransformations_1.POLE}
+precision highp float;
+
+uniform float opacity;
+
+in float interpolation;
+in vec2 v_limp;
+in vec4 v_color;
+in float v_dash_ratio;
+in float v_dash_opacity;
+
+out vec4 color;
+
+void main() {
+    if (v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE) { discard; }
+    color = v_color;
+    color.a *= opacity;
+    if ( v_dash_ratio >= 1.0 ) { return; }
+    if (interpolation > 0.95) { return; }
+    if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a *= v_dash_opacity; }
+
+}
+`;
+class Logic {
+    vaosPublished = [];
+    isFreed = false;
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this.program = (0, util_1.createProgram)(this.gl, vertexShader, fragmentShader);
         this._lastOpacity = 1.0;
-        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, "start_position");
@@ -60,9 +134,8 @@ var Logic = /** @class */ (function () {
      * @param {number} flexibleOptions.dash_opacity
      * @param {number} flexibleOptions.dash_ratio
      */
-    Logic.prototype.draw = function (vao, drawOptions, opacity, flexibleUBO) {
-        if (flexibleUBO === void 0) { flexibleUBO = null; }
-        var _a = this, gl = _a.gl, program = _a.program, globe = _a.globe, cameraBlockTotem = _a.cameraBlockTotem, _defaultFlexibleUBO = _a._defaultFlexibleUBO;
+    draw(vao, drawOptions, opacity, flexibleUBO = null) {
+        const { gl, program, globe, cameraBlockTotem, _defaultFlexibleUBO } = this;
         gl.useProgram(program);
         cameraBlockTotem.bind(uniformBindingPoints.camera);
         gl.bindVertexArray(vao);
@@ -71,17 +144,16 @@ var Logic = /** @class */ (function () {
             this._lastOpacity = opacity;
         }
         // this._setFlexibleUniforms(flexibleOptions);
-        var vertexCount = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
-        var ubo = flexibleUBO || _defaultFlexibleUBO;
+        const vertexCount = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
+        const ubo = flexibleUBO || _defaultFlexibleUBO;
         ubo.bind();
         (0, methods_1.drawInstanced)(gl, gl.LINE_STRIP, drawOptions, vertexCount);
         ubo.unbind();
         gl.bindVertexArray(null);
         cameraBlockTotem.unbind(uniformBindingPoints.camera);
-    };
-    Logic.prototype.createUBO = function (bufferReadType) {
-        if (bufferReadType === void 0) { bufferReadType = "STATIC_DRAW"; }
-        var ubo = uniformBlockManager.createUBO(this.gl, bufferReadType);
+    }
+    createUBO(bufferReadType = "STATIC_DRAW") {
+        const ubo = uniformBlockManager.createUBO(this.gl, bufferReadType);
         this._ubosPublished.push(ubo);
         ubo.update(new Map([
             ["u_color", [1, 1, 1, 1]],
@@ -89,37 +161,35 @@ var Logic = /** @class */ (function () {
             ["u_dash_opacity", [1]]
         ]));
         return ubo;
-    };
-    Logic.prototype.createVAO = function (startPotision2DBufferObj, startPotision3DBufferObj, endPosition2DBufferObj, endPosition3DBufferObj, dashRatioBufferObj, dashOpacityBufferObj, colorBufferObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    }
+    createVAO(startPotision2DBufferObj, startPotision3DBufferObj, endPosition2DBufferObj, endPosition3DBufferObj, dashRatioBufferObj, dashOpacityBufferObj, colorBufferObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
-        var divisor = 1;
-        (0, attribute_loader_1.attributeLoader)(gl, startPotision2DBufferObj, 0, 2, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, startPotision3DBufferObj, 1, 3, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, endPosition2DBufferObj, 2, 2, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, endPosition3DBufferObj, 3, 3, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, dashRatioBufferObj, 4, 1, { divisor: divisor, escapeValues: [escapeValue] });
-        (0, attribute_loader_1.attributeLoader)(gl, dashOpacityBufferObj, 5, 1, { divisor: divisor, escapeValues: [escapeValue] });
-        (0, attribute_loader_1.attributeLoader)(gl, colorBufferObj, 6, 4, { divisor: divisor, escapeValues: [escapeValue, escapeValue, escapeValue, escapeValue] });
+        const divisor = 1;
+        (0, attribute_loader_1.attributeLoader)(gl, startPotision2DBufferObj, 0, 2, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, startPotision3DBufferObj, 1, 3, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, endPosition2DBufferObj, 2, 2, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, endPosition3DBufferObj, 3, 3, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, dashRatioBufferObj, 4, 1, { divisor, escapeValues: [escapeValue] });
+        (0, attribute_loader_1.attributeLoader)(gl, dashOpacityBufferObj, 5, 1, { divisor, escapeValues: [escapeValue] });
+        (0, attribute_loader_1.attributeLoader)(gl, colorBufferObj, 6, 4, { divisor, escapeValues: [escapeValue, escapeValue, escapeValue, escapeValue] });
         gl.bindVertexArray(null);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.vaosPublished.push(vao);
         return vao;
-    };
-    Logic.prototype.free = function () {
-        var _this = this;
+    }
+    free() {
         if (this.isFreed)
             return;
         totems_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
-        this.vaosPublished.forEach(function (vao) { return _this.gl.deleteVertexArray(vao); });
-        this._ubosPublished.forEach(function (ubo) { return ubo.free(); });
+        this.vaosPublished.forEach(vao => this.gl.deleteVertexArray(vao));
+        this._ubosPublished.forEach(ubo => ubo.free());
         this.isFreed = true;
-    };
-    return Logic;
-}());
+    }
+}
 exports.LineOnGlobeCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    get: (globe) => { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    release: (globe) => { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });

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

@@ -1,20 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var util_1 = require("./util");
-var totems_1 = require("../totems");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var programcache_1 = require("../programcache");
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const util_1 = require("./util");
+const totems_1 = require("../totems");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const programcache_1 = require("../programcache");
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
 require("../draw-options/types");
-var methods_1 = require("../draw-options/methods");
-var vs = "#version 300 es\n".concat(geometrytransformations_1.R_3D, "\n").concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\nin vec3 pos3D\nin vec4 color;\nout float ratio;\nout flat vec4 vColor;\nvoid main(){\n if ( gl_VertexID  == 0) {\n  gl_Position = cartesian3DToGLPosition(pos3D);\n  ratio =0.0;\n } else {\n  vec3 sea_level_pos3D = norm(pos3D) * R_3D;\n  gl_Position = cartesian3DToGLPosition(pos3D);\n  ratio = 1.0;\n }\n vColor = color;   \n}");
-var fs = "#version 300 es\nuniform float opacity;\nuniform float phase;\nuniform float fadeOpacity;\nin flat vec4 vColor;\nin float ratio;\nout vec4 fragColor;\nvoid main(){\n fragColor = vec4( vColor.rgb, vColor.a * opacity);\n if (fadeOpacity < 1.0) {\n  float alpha= mix( fadeOpacity, vColor.a, fract( ratio + phase ));\n  fragColor.a *= alpha;\n } \n}";
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const methods_1 = require("../draw-options/methods");
+const vs = `#version 300 es
+${geometrytransformations_1.R_3D}
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.cartesian3DToGLPosition}
+in vec3 pos3D
+in vec4 color;
+out float ratio;
+out flat vec4 vColor;
+void main(){
+ if ( gl_VertexID  == 0) {
+  gl_Position = cartesian3DToGLPosition(pos3D);
+  ratio =0.0;
+ } else {
+  vec3 sea_level_pos3D = norm(pos3D) * R_3D;
+  gl_Position = cartesian3DToGLPosition(pos3D);
+  ratio = 1.0;
+ }
+ vColor = color;   
+}`;
+const fs = `#version 300 es
+uniform float opacity;
+uniform float phase;
+uniform float fadeOpacity;
+in flat vec4 vColor;
+in float ratio;
+out vec4 fragColor;
+void main(){
+ fragColor = vec4( vColor.rgb, vColor.a * opacity);
+ if (fadeOpacity < 1.0) {
+  float alpha= mix( fadeOpacity, vColor.a, fract( ratio + phase ));
+  fragColor.a *= alpha;
+ } 
+}`;
+class Logic {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this.program = (0, util_1.createProgram)(this.gl, vs, fs);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this._opacity = {
             lastValue: 1.0,
             location: gl.getUniformLocation(program, 'opacity')
@@ -27,37 +58,36 @@ var Logic = /** @class */ (function () {
             lastValue: 1.0,
             location: gl.getUniformBlockLocation(program, 'fadeOpacity')
         };
-        var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
-        [this._opacity, this._phase, this._fadeOpacity].forEach(function (wrapper) { return gl.uniform1f(wrapper.location, wrapper.lastValue); });
+        [this._opacity, this._phase, this._fadeOpacity].forEach((wrapper) => gl.uniform1f(wrapper.location, wrapper.lastValue));
         gl.useProgram(currentProgram);
         gl.useProgram(program);
         gl.bindAttribLocation(program, 0, 'pos3D');
         gl.bindAttribLocation(program, 1, 'color');
         this.cameraUniformBlockTotem = new totems_1.CameraUniformBlockTotemCache.get(globe);
         this.cameraBlockBindingPoint = 0;
-        var cameraBlockIndex = gl.getUniformBlockLocation(program, 'CameraUniformBlock');
+        const cameraBlockIndex = gl.getUniformBlockLocation(program, 'CameraUniformBlock');
         gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
     }
-    Logic.prototype.createVao = function (pos3DObj, colorObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    createVao(pos3DObj, colorObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
         gl.bindVertexArray(vao);
-        (0, attribute_loader_1.attributeLoader)(gl, pos3DObj, 0, 3, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 1, 4, { divisor: divisor, escapeValue: [-1, -1, -1, -1] });
+        (0, attribute_loader_1.attributeLoader)(gl, pos3DObj, 0, 3, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 1, 4, { divisor, escapeValue: [-1, -1, -1, -1] });
         gl.bindVertexArray(null);
         this._vaoCache.push(vao);
         return vao;
-    };
+    }
     /**
      *
      * @param {WebGL2RenderingContext.vertexArrayObject} vao
      * @param {Render} drawOptions
      */
-    Logic.prototype.draw = function (vao, drawOptions, _a) {
-        var _b = _a.opacity, opacity = _b === void 0 ? 1.0 : _b, _c = _a.fadeOpacity, fadeOpacity = _c === void 0 ? 1.0 : _c;
-        var _d = this, globe = _d.globe, gl = _d.gl, program = _d.program, _opacity = _d._opacity, _fadeOpacity = _d._fadeOpacity;
+    draw(vao, drawOptions, { opacity = 1.0, fadeOpacity = 1.0, }) {
+        const { globe, gl, program, _opacity, _fadeOpacity } = this;
         gl.useProgram(program);
         gl.bindVertexArray(vao);
         if (fadeOpacity < 1.0) {
@@ -73,10 +103,9 @@ var Logic = /** @class */ (function () {
             gl.uniform1f(_opacity.location, opacity);
         }
         (0, methods_1.drawInstanced)(gl, gl.TRIANGLE_FAN, drawOptions);
-    };
-    Logic.prototype._updatePhase = function () {
+    }
+    _updatePhase() {
         this._phase.lastValue = (Date.now() / 3.0) % 1000;
         gl.uniform1f(_phase.location, _phase.lastValue);
-    };
-    return Logic;
-}());
+    }
+}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Z_ALPHA_MODE = void 0;
-var Z_ALPHA_MODE = Object.freeze({
+const Z_ALPHA_MODE = Object.freeze({
     ON: 1,
     OFF: 0
 });

package/programs/picking/pickable-renderer.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickableRendererProgramCache = void 0;
-var util_1 = require("../../util");
-var totems_1 = require("../totems");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var programcache_1 = require("../programcache");
+const util_1 = require("../../util");
+const totems_1 = require("../totems");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const programcache_1 = require("../programcache");
 require("../../util/gl-util/draw-options/types");
-var methods_1 = require("../../util/gl-util/draw-options/methods");
-var attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
-var manager_1 = require("../../util/gl-util/uniform-block/manager");
-var uniformBindingPoints = {
+const methods_1 = require("../../util/gl-util/draw-options/methods");
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const manager_1 = require("../../util/gl-util/uniform-block/manager");
+const uniformBindingPoints = {
     camera: 0,
     flexible: 1
 };
-var uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
+const uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
     { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
     { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
     { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
@@ -25,15 +25,101 @@ var uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
     { name: "u_dash_opacity_multiplier", type: "float", value: new Float32Array([1.0]) },
     { name: "u_dash_phase", type: "float", value: new Float32Array([0.0]) },
 ], uniformBindingPoints.flexible);
-var vs = "#version 300 es\n".concat(geometrytransformations_1.R, "\n").concat(geometrytransformations_1.R_3D, "\n").concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n\n").concat(uniformBlockManager.glslCode(), "\n\nprecision highp float;\nprecision highp int;\n\nin vec3 pos3D;\nin vec2 pos2D;\nin vec4 rgba;\nin float size;\n\n\nflat out highp int vVertexID;\n\nout vec4 v_rgba;\n\nout float v_length;\n\nvoid main() {\n    \n    v_rgba =  (rgba.r == -1.0) ? u_rgba : rgba;\n    v_rgba.a *= u_opacity;\n    gl_PointSize = max(((size == -1.0) ? u_size : size) * u_size_multiplier, u_minimum_size);\n    \n    float size_fixer; \n    if(is3D){\n        gl_Position = cartesian3DToGLPosition(pos3D);\n        size_fixer = smoothstep(0.15, 1.0, 0.5 * R_3D / gl_Position.w) ;\n    } else {\n        gl_Position = mercatorXYToGLPosition(pos2D);\n        size_fixer = smoothstep(2.0, 5.2, z_level);\n    }\n    gl_PointSize *= size_fixer;\n    switch (u_draw_mode) {\n        case 0:\n            vVertexID = gl_VertexID;\n            break;\n        case 1:\n            v_length = float(gl_VertexID % 2);\n            vVertexID = (gl_VertexID - gl_VertexID % 2) / 2; // a line takes two points\n            break;\n        default:\n            break;\n    }\n}");
-var fs = "#version 300 es\nprecision highp float;\nprecision highp int;\n\n".concat(uniformBlockManager.glslCode(), "\n\nflat in highp int vVertexID;\n\nin vec4 v_rgba;\nin float v_length;\n\nlayout(location = 0) out vec4 fragColor;\nlayout(location = 1) out int vertexID;\n\nvoid main() {\n    vertexID = vVertexID; \n    fragColor = v_rgba;\n\n    switch (u_draw_mode) {\n        case 0:\n            float d = distance(gl_PointCoord, vec2(0.5, 0.5));\n            if (u_is_circle) {\n                if (d > 0.5) discard;\n                fragColor.a *= smoothstep(0.5, 0.45, d);\n            }\n            if (u_dash_opacity_multiplier < 1.0) {\n                float dash = sin(d * 3.14159 * 2.0 * u_dash_count + u_dash_phase) * (1.0 - u_dash_opacity_multiplier) + u_dash_opacity_multiplier;\n                fragColor.a *= dash;\n            }\n            break;\n        case 1:\n            if (u_dash_opacity_multiplier < 1.0 && fract((v_length + u_dash_phase) * u_dash_count) < 0.5) {\n                fragColor.a *= u_dash_opacity_multiplier;\n            }\n            break;\n    }\n}");
-var PointOnGlobeProgram = /** @class */ (function () {
-    function PointOnGlobeProgram(globe) {
+const vs = `#version 300 es
+${geometrytransformations_1.R}
+${geometrytransformations_1.R_3D}
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.cartesian3DToGLPosition}
+
+${uniformBlockManager.glslCode()}
+
+precision highp float;
+precision highp int;
+
+in vec3 pos3D;
+in vec2 pos2D;
+in vec4 rgba;
+in float size;
+
+
+flat out highp int vVertexID;
+
+out vec4 v_rgba;
+
+out float v_length;
+
+void main() {
+    
+    v_rgba =  (rgba.r == -1.0) ? u_rgba : rgba;
+    v_rgba.a *= u_opacity;
+    gl_PointSize = max(((size == -1.0) ? u_size : size) * u_size_multiplier, u_minimum_size);
+    
+    float size_fixer; 
+    if(is3D){
+        gl_Position = cartesian3DToGLPosition(pos3D);
+        size_fixer = smoothstep(0.15, 1.0, 0.5 * R_3D / gl_Position.w) ;
+    } else {
+        gl_Position = mercatorXYToGLPosition(pos2D);
+        size_fixer = smoothstep(2.0, 5.2, z_level);
+    }
+    gl_PointSize *= size_fixer;
+    switch (u_draw_mode) {
+        case 0:
+            vVertexID = gl_VertexID;
+            break;
+        case 1:
+            v_length = float(gl_VertexID % 2);
+            vVertexID = (gl_VertexID - gl_VertexID % 2) / 2; // a line takes two points
+            break;
+        default:
+            break;
+    }
+}`;
+const fs = `#version 300 es
+precision highp float;
+precision highp int;
+
+${uniformBlockManager.glslCode()}
+
+flat in highp int vVertexID;
+
+in vec4 v_rgba;
+in float v_length;
+
+layout(location = 0) out vec4 fragColor;
+layout(location = 1) out int vertexID;
+
+void main() {
+    vertexID = vVertexID; 
+    fragColor = v_rgba;
+
+    switch (u_draw_mode) {
+        case 0:
+            float d = distance(gl_PointCoord, vec2(0.5, 0.5));
+            if (u_is_circle) {
+                if (d > 0.5) discard;
+                fragColor.a *= smoothstep(0.5, 0.45, d);
+            }
+            if (u_dash_opacity_multiplier < 1.0) {
+                float dash = sin(d * 3.14159 * 2.0 * u_dash_count + u_dash_phase) * (1.0 - u_dash_opacity_multiplier) + u_dash_opacity_multiplier;
+                fragColor.a *= dash;
+            }
+            break;
+        case 1:
+            if (u_dash_opacity_multiplier < 1.0 && fract((v_length + u_dash_phase) * u_dash_count) < 0.5) {
+                fragColor.a *= u_dash_opacity_multiplier;
+            }
+            break;
+    }
+}`;
+class PointOnGlobeProgram {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this._isFreed = false;
         this.program = (0, util_1.createProgram)(this.gl, vs, fs);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         // assign opacity
         // assign attribute locations
         gl.bindAttribLocation(program, 0, "pos3D");
@@ -53,13 +139,13 @@ var PointOnGlobeProgram = /** @class */ (function () {
             ["u_is_circle", [1.0]],
         ]));
     }
-    PointOnGlobeProgram.prototype.createUBO = function () {
-        var ubo = uniformBlockManager.createUBO(this.gl);
+    createUBO() {
+        const ubo = uniformBlockManager.createUBO(this.gl);
         return ubo;
-    };
-    PointOnGlobeProgram.prototype.createVAO = function (pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    }
+    createVAO(pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         (0, attribute_loader_1.attributeLoader)(gl, pos3DBufferObj, 0, 3);
         (0, attribute_loader_1.attributeLoader)(gl, pos2DBufferObj, 1, 2);
@@ -68,15 +154,14 @@ var PointOnGlobeProgram = /** @class */ (function () {
         gl.bindVertexArray(null);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         return vao;
-    };
+    }
     /**
      *
      * @param {vertexArrayObject} vao
      * @param {DrawRangeIndexParams} drawOptions
      */
-    PointOnGlobeProgram.prototype.draw = function (vao, drawOptions, ubo) {
-        if (ubo === void 0) { ubo = null; }
-        var _a = this, gl = _a.gl, program = _a.program;
+    draw(vao, drawOptions, ubo = null) {
+        const { gl, program } = this;
         gl.useProgram(program);
         gl.bindVertexArray(vao);
         this.cameraBlockTotem.bind(uniformBindingPoints.camera);
@@ -86,19 +171,18 @@ var PointOnGlobeProgram = /** @class */ (function () {
         ubo.unbind();
         this.cameraBlockTotem.unbind(uniformBindingPoints.camera);
         gl.bindVertexArray(null);
-    };
-    PointOnGlobeProgram.prototype.free = function () {
+    }
+    free() {
         if (this._isFreed)
             return;
-        var _a = this, gl = _a.gl, globe = _a.globe;
+        const { gl, globe } = this;
         totems_1.CameraUniformBlockTotemCache.release(globe);
         gl.deleteProgram(this.program);
         this._isFreed = true;
-    };
-    return PointOnGlobeProgram;
-}());
-var PickableRendererProgramCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram); }
+    }
+}
+const PickableRendererProgramCache = Object.freeze({
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
 });
 exports.PickableRendererProgramCache = PickableRendererProgramCache;