@pirireis/webglobeplugins 0.9.11 → 0.9.12

package/programs/point-on-globe/element-globe-surface-glow.js

@@ -8,27 +8,72 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementGlobeSufaceGlowCache = 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 methods_1 = require("../../util/gl-util/draw-options/methods");
-var manager_1 = require("../../util/gl-util/uniform-block/manager");
-var uboBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
+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 methods_1 = require("../../util/gl-util/draw-options/methods");
+const manager_1 = require("../../util/gl-util/uniform-block/manager");
+const uboBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
     { name: "u_color", type: "vec4" },
     { name: "u_radius", type: "float" }
 ], 1);
-var vs = "#version 300 es\n".concat(geometrytransformations_1.PI, "\n").concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n").concat(geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D_accurate, "\n\nuniform float edge_count;\n\nin vec3 pos3D;\nin float radius;\nin vec4 color;\n\n").concat(uboBlockManager.glslCode(), "\n\nout vec4 vColor;\n\nvoid main() {\n\n    float radius_ = ( radius == -1.0 ) ? u_radius : radius;\n    vec4 color = ( color.r == -1.0 ) ? u_color : color;\n\n    if ( gl_VertexID == 0 ) {\n        gl_Position = cartesian3DToGLPosition(pos3D);\n        vColor = vColor;\n    } else {\n        float angle = PI * 2.0 * float( gl_VertexID - 1 ) / edge_count;\n        vec3 position = circleLimpFromLongLatRadCenterCartesian3D_accurate(pos3D, radius, angle);\n        gl_Position = cartesian3DToGLPosition(position);\n        float distance = distance(position, pos3D);\n\n        \n\n        vColor = vec4(color.rgb, color.a * (1.0 - distance / radius));\n    }\n}");
-var fs = "#version 300 es\nprecision highp float;\n\nuniform float opacity;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main() {\n    fragColor = vColor;\n    fragColor.a *= opacity;\n}";
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const vs = `#version 300 es
+${geometrytransformations_1.PI}
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D_accurate}
+
+uniform float edge_count;
+
+in vec3 pos3D;
+in float radius;
+in vec4 color;
+
+${uboBlockManager.glslCode()}
+
+out vec4 vColor;
+
+void main() {
+
+    float radius_ = ( radius == -1.0 ) ? u_radius : radius;
+    vec4 color = ( color.r == -1.0 ) ? u_color : color;
+
+    if ( gl_VertexID == 0 ) {
+        gl_Position = cartesian3DToGLPosition(pos3D);
+        vColor = vColor;
+    } else {
+        float angle = PI * 2.0 * float( gl_VertexID - 1 ) / edge_count;
+        vec3 position = circleLimpFromLongLatRadCenterCartesian3D_accurate(pos3D, radius, angle);
+        gl_Position = cartesian3DToGLPosition(position);
+        float distance = distance(position, pos3D);
+
+        
+
+        vColor = vec4(color.rgb, color.a * (1.0 - distance / radius));
+    }
+}`;
+const fs = `#version 300 es
+precision highp float;
+
+uniform float opacity;
+in vec4 vColor;
+
+out vec4 fragColor;
+
+void main() {
+    fragColor = vColor;
+    fragColor.a *= opacity;
+}`;
+class Logic {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this._vaoCache = [];
         this.program = (0, util_1.createProgram)(this.gl, vs, fs);
-        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);
         // set uniform locations
         this._uniforms = {
@@ -48,28 +93,26 @@ var Logic = /** @class */ (function () {
         // camera uniform block
         this.cameraUniformBlockTotem = totems_1.CameraUniformBlockTotemCache.get(globe);
         this.cameraBlockBindingPoint = 0;
-        var cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
         uboBlockManager.assignBindingPoint(this.gl, this.program);
         this._defaultUBO = uboBlockManager.createUBO(this.gl);
     }
-    Logic.prototype.createVAO = function (pos3DObj, radiusObj, colorObj) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
-        var divisor = 1;
+    createVAO(pos3DObj, radiusObj, colorObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
         gl.bindVertexArray(vao);
         // TODO constants to escape values
-        (0, attribute_loader_1.attributeLoader)(gl, pos3DObj, 0, 3, { divisor: divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, radiusObj, 1, 1, { divisor: divisor, escapeValues: [-1] });
-        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 2, 4, { divisor: divisor, escapeValues: [-1, -1, -1, -1] });
+        (0, attribute_loader_1.attributeLoader)(gl, pos3DObj, 0, 3, { divisor });
+        (0, attribute_loader_1.attributeLoader)(gl, radiusObj, 1, 1, { divisor, escapeValues: [-1] });
+        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 2, 4, { divisor, escapeValues: [-1, -1, -1, -1] });
         gl.bindVertexArray(null);
         this._vaoCache.push(vao);
         return vao;
-    };
-    Logic.prototype.draw = function (vao, drawOptions, opacity, ubo) {
-        if (opacity === void 0) { opacity = 1.0; }
-        if (ubo === void 0) { ubo = null; }
-        var _a = this, gl = _a.gl, program = _a.program;
+    }
+    draw(vao, drawOptions, opacity = 1.0, ubo = null) {
+        const { gl, program } = this;
         gl.useProgram(program);
         gl.bindVertexArray(vao);
         if (opacity !== this._uniforms.opacity) {
@@ -81,22 +124,19 @@ var Logic = /** @class */ (function () {
         (0, methods_1.drawInstanced)(gl, gl.TRIANGLE_FAN, drawOptions);
         ubo.unbind();
         gl.bindVertexArray(null);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         if (this._isFreed)
             return;
         totems_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
-        for (var _i = 0, _a = this._vaoCache; _i < _a.length; _i++) {
-            var vao = _a[_i];
+        for (const vao of this._vaoCache)
             this.gl.deleteVertexArray(vao);
-        }
         this._isFreed = true;
-    };
-    return Logic;
-}());
-var ElementGlobeSufaceGlowCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe); }
+    }
+}
+const ElementGlobeSufaceGlowCache = Object.freeze({
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe)
 });
 exports.ElementGlobeSufaceGlowCache = ElementGlobeSufaceGlowCache;

package/programs/point-on-globe/element-point-glow.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementPointGlowProgramCache = void 0;
-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");
-var methods_1 = require("../../util/gl-util/draw-options/methods");
-var manager_1 = require("../../util/gl-util/uniform-block/manager");
-var singularity_1 = require("../../shaders/fragment-toy/singularity");
-var firework_1 = require("../../shaders/fragment-toy/firework");
-var cameraBlockBindingPoint = 0;
-var flexibleBlockBindingPoint = 1;
-var uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
+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");
+const methods_1 = require("../../util/gl-util/draw-options/methods");
+const manager_1 = require("../../util/gl-util/uniform-block/manager");
+const singularity_1 = require("../../shaders/fragment-toy/singularity");
+const firework_1 = require("../../shaders/fragment-toy/firework");
+const cameraBlockBindingPoint = 0;
+const flexibleBlockBindingPoint = 1;
+const uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
     { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
     { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
     { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
@@ -20,14 +20,84 @@ var uniformBlockManager = new manager_1.UniformBlockManager("FlexibleBlock", [
     { name: "u_minimumSize", type: "float", value: new Float32Array([25.0]) },
     { name: "u_phase", type: "float", value: new Float32Array([1.0]) },
 ], flexibleBlockBindingPoint);
-var vs = "#version 300 es\nprecision highp float;\n\n".concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n\n").concat(uniformBlockManager.glslCode(), "\n\n\nin vec3 pos3D;\nin vec2 pos2D;\nin vec4 color;\nin float size;\n\nout vec4 vColor;\nflat out float v_size;\n\n\n\nvoid main() {\n\n    if(is3D){\n        gl_Position = cartesian3DToGLPosition(pos3D);\n    }\n    else {\n        gl_Position = mercatorXYToGLPosition(pos2D);\n    }\n\n    gl_PointSize = max(\n        ((size == -1.0) ? u_size  : size ) * u_size_multiplier,\n        u_minimumSize);\n    v_size = gl_PointSize;\n    vColor = (color.r == -1.0) ? u_rgba : color;\n    vColor.a *= u_opacity;\n\n}");
-var fs = "#version 300 es\nprecision highp float;\n\n".concat(uniformBlockManager.glslCode(), "\n\nin vec4 vColor;\nout vec4 fragColor;\n\nflat in float v_size;\n\n").concat(firework_1.firework, "\n").concat(singularity_1.singularity, " \n\nvoid main() {\n    fragColor = vColor;\n\n    float dist = distance(gl_PointCoord, vec2(0.5, 0.5)) * 2.0;\n    if ( dist > 1.0) discard;\n\n    // center glow\n    float center_alpha = smoothstep(0.5, 0.0, dist) * 0.3;\n    // center_alpha = smoothstep(0.0, 1.0, center_alpha);\n\n    // circle pattern\n    float threshold = fract(( - dist + u_phase - 0.5));\n    float circle_alpha = sin( threshold * 1.57 );\n    circle_alpha = smoothstep((v_size / (v_size + .5)), 1.0, circle_alpha);\n\n    float outer_circle_alpha = sin(dist * 1.57 );\n    outer_circle_alpha = smoothstep((v_size / (v_size + .5)), 1.0, outer_circle_alpha);\n\n    // fragColor = singularity(gl_PointCoord, u_phase);\n\n    fragColor.a *= smoothstep(0.0, 1.1, ( 0.4 * u_opacity + center_alpha +  circle_alpha+ outer_circle_alpha)); \n}");
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+const vs = `#version 300 es
+precision highp float;
+
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.cartesian3DToGLPosition}
+
+${uniformBlockManager.glslCode()}
+
+
+in vec3 pos3D;
+in vec2 pos2D;
+in vec4 color;
+in float size;
+
+out vec4 vColor;
+flat out float v_size;
+
+
+
+void main() {
+
+    if(is3D){
+        gl_Position = cartesian3DToGLPosition(pos3D);
+    }
+    else {
+        gl_Position = mercatorXYToGLPosition(pos2D);
+    }
+
+    gl_PointSize = max(
+        ((size == -1.0) ? u_size  : size ) * u_size_multiplier,
+        u_minimumSize);
+    v_size = gl_PointSize;
+    vColor = (color.r == -1.0) ? u_rgba : color;
+    vColor.a *= u_opacity;
+
+}`;
+const fs = `#version 300 es
+precision highp float;
+
+${uniformBlockManager.glslCode()}
+
+in vec4 vColor;
+out vec4 fragColor;
+
+flat in float v_size;
+
+${firework_1.firework}
+${singularity_1.singularity} 
+
+void main() {
+    fragColor = vColor;
+
+    float dist = distance(gl_PointCoord, vec2(0.5, 0.5)) * 2.0;
+    if ( dist > 1.0) discard;
+
+    // center glow
+    float center_alpha = smoothstep(0.5, 0.0, dist) * 0.3;
+    // center_alpha = smoothstep(0.0, 1.0, center_alpha);
+
+    // circle pattern
+    float threshold = fract(( - dist + u_phase - 0.5));
+    float circle_alpha = sin( threshold * 1.57 );
+    circle_alpha = smoothstep((v_size / (v_size + .5)), 1.0, circle_alpha);
+
+    float outer_circle_alpha = sin(dist * 1.57 );
+    outer_circle_alpha = smoothstep((v_size / (v_size + .5)), 1.0, outer_circle_alpha);
+
+    // fragColor = singularity(gl_PointCoord, u_phase);
+
+    fragColor.a *= smoothstep(0.0, 1.1, ( 0.4 * u_opacity + center_alpha +  circle_alpha+ outer_circle_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;
         gl.bindAttribLocation(program, 0, "pos3D");
         gl.bindAttribLocation(program, 1, "pos2D");
         gl.bindAttribLocation(program, 2, "color");
@@ -38,9 +108,9 @@ var Logic = /** @class */ (function () {
         uniformBlockManager.assignBindingPoint(this.gl, this.program);
         this._defaultUBO = uniformBlockManager.createUBO(this.gl);
     }
-    Logic.prototype.createVAO = function (pos3DBuffer, pos2DBuffer, colorBuffer, sizeBuffer) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    createVAO(pos3DBuffer, pos2DBuffer, colorBuffer, sizeBuffer) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         (0, attribute_loader_1.attributeLoader)(gl, pos3DBuffer, 0, 3);
         (0, attribute_loader_1.attributeLoader)(gl, pos2DBuffer, 1, 2);
@@ -49,14 +119,13 @@ var Logic = /** @class */ (function () {
         gl.bindVertexArray(null);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         return vao;
-    };
-    Logic.prototype.createUBO = function () {
-        var ubo = uniformBlockManager.createUBO(this.gl);
+    }
+    createUBO() {
+        const ubo = uniformBlockManager.createUBO(this.gl);
         return ubo;
-    };
-    Logic.prototype.draw = function (vao, drawOptions, ubo) {
-        if (ubo === void 0) { ubo = null; }
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem;
+    }
+    draw(vao, drawOptions, ubo = null) {
+        const { gl, program, cameraBlockTotem } = this;
         gl.useProgram(program);
         gl.bindVertexArray(vao);
         cameraBlockTotem.bind(cameraBlockBindingPoint);
@@ -67,19 +136,18 @@ var Logic = /** @class */ (function () {
         gl.bindVertexArray(null);
         cameraBlockTotem.unbind(cameraBlockBindingPoint);
         this.globe.DrawRender();
-    };
+    }
     // for singleton cache interation
-    Logic.prototype.free = function () {
+    free() {
         if (this._isFreed)
             return;
         totems_1.CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this._isFreed = true;
-    };
-    return Logic;
-}());
-var ElementPointGlowProgramCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    }
+}
+const ElementPointGlowProgramCache = Object.freeze({
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: globe => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });
 exports.ElementPointGlowProgramCache = ElementPointGlowProgramCache;

package/programs/point-on-globe/square-pixel-point.js

@@ -1,18 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PointOnGlobeProgramCache = void 0;
-var util_1 = require("../../util");
-var totems_1 = require("../totems");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var programcache_1 = require("../programcache");
-var vs = "#version 300 es\n".concat(totems_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\nprecision highp float;\nprecision highp int;\n\nuniform int hovered_vertexID; // can be removed\n\nin vec3 pos3D;\nin vec2 pos2D;\nin vec4 rgba;\n\nuniform float pointSize;\nuniform float hoveredPointSize;\n\nflat out highp int vVertexID;\n\n\nout vec4 v_rgba;\n\nvoid main() {\n\n    if(is3D){\n        gl_Position = cartesian3DToGLPosition(pos3D);\n    }\n    else{\n        gl_Position = mercatorXYToGLPosition(pos2D);\n    }\n    if (hovered_vertexID == gl_VertexID) {\n        gl_PointSize = hoveredPointSize;\n    } else {\n        gl_PointSize = pointSize;\n    }\n    v_rgba = rgba;\n    vVertexID = gl_VertexID;\n}");
-var fs = "#version 300 es\nprecision highp float;\n\nuniform float opacity;\n\nflat in highp int vVertexID;\nin vec4 v_rgba;\n\nlayout(location = 0) out vec4 fragColor;\nlayout(location = 1) out int vertexID;\n\nvoid main() {\n    vertexID = vVertexID; \n    fragColor = v_rgba;\n    fragColor.a *= opacity;\n}";
-var PointOnGlobeProgram = /** @class */ (function () {
-    function PointOnGlobeProgram(globe) {
+const util_1 = require("../../util");
+const totems_1 = require("../totems");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const programcache_1 = require("../programcache");
+const vs = `#version 300 es
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.cartesian3DToGLPosition}
+precision highp float;
+precision highp int;
+
+uniform int hovered_vertexID; // can be removed
+
+in vec3 pos3D;
+in vec2 pos2D;
+in vec4 rgba;
+
+uniform float pointSize;
+uniform float hoveredPointSize;
+
+flat out highp int vVertexID;
+
+
+out vec4 v_rgba;
+
+void main() {
+
+    if(is3D){
+        gl_Position = cartesian3DToGLPosition(pos3D);
+    }
+    else{
+        gl_Position = mercatorXYToGLPosition(pos2D);
+    }
+    if (hovered_vertexID == gl_VertexID) {
+        gl_PointSize = hoveredPointSize;
+    } else {
+        gl_PointSize = pointSize;
+    }
+    v_rgba = rgba;
+    vVertexID = gl_VertexID;
+}`;
+const fs = `#version 300 es
+precision highp float;
+
+uniform float opacity;
+
+flat in highp int vVertexID;
+in vec4 v_rgba;
+
+layout(location = 0) out vec4 fragColor;
+layout(location = 1) out int vertexID;
+
+void main() {
+    vertexID = vVertexID; 
+    fragColor = v_rgba;
+    fragColor.a *= opacity;
+}`;
+class PointOnGlobeProgram {
+    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.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
             hovered_vertexID: gl.getUniformLocation(program, "hovered_vertexID"),
@@ -25,7 +76,7 @@ var PointOnGlobeProgram = /** @class */ (function () {
             this._lastPointSize = 2.0;
             this._lastHoveredPointSize = 4.0;
             this._lastHoveredID = -1;
-            var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
             gl.useProgram(program);
             gl.uniform1f(this.uniforms.opacity, this._lastOpacity);
             gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
@@ -43,13 +94,13 @@ var PointOnGlobeProgram = /** @class */ (function () {
         { // arrange camera uniform block
             this.cameraBlockBingingPoint = 0;
             this.cameraBlockTotem = totems_1.CameraUniformBlockTotemCache.get(globe);
-            var cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
             gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
         }
     }
-    PointOnGlobeProgram.prototype.createVAO = function (pos3DBuffer, pos2DBuffer, rgbaBuffer) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    createVAO(pos3DBuffer, pos2DBuffer, rgbaBuffer) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         // eslint-disable-next-line
         {
@@ -72,12 +123,11 @@ var PointOnGlobeProgram = /** @class */ (function () {
         gl.bindVertexArray(null);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         return vao;
-    };
-    PointOnGlobeProgram.prototype.draw = function (vao, length, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.opacity, opacity = _c === void 0 ? 1.0 : _c, _d = _b.hoveredID, hoveredID = _d === void 0 ? -1 : _d, _e = _b.pointSize, pointSize = _e === void 0 ? 2.0 : _e, _f = _b.hoveredPointSize, hoveredPointSize = _f === void 0 ? 4.0 : _f, _g = _b.elementBuffer, elementBuffer = _g === void 0 ? null : _g;
+    }
+    draw(vao, length, { opacity = 1.0, hoveredID = -1, pointSize = 2.0, hoveredPointSize = 4.0, elementBuffer = null } = {}) {
         if (length === 0 || opacity === 0)
             return;
-        var _h = this, gl = _h.gl, program = _h.program, uniforms = _h.uniforms;
+        const { gl, program, uniforms } = this;
         gl.useProgram(program);
         if (this._lastOpacity !== opacity) {
             gl.uniform1f(uniforms.opacity, opacity);
@@ -107,19 +157,18 @@ var PointOnGlobeProgram = /** @class */ (function () {
         }
         this.cameraBlockTotem.unbind(this.cameraBlockBingingPoint);
         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 PointOnGlobeProgramCache = Object.freeze({
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram); }
+    }
+}
+const PointOnGlobeProgramCache = Object.freeze({
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
 });
 exports.PointOnGlobeProgramCache = PointOnGlobeProgramCache;

package/programs/programcache.js

@@ -14,8 +14,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.noRegisterGlobeProgramCache = exports.glProgramCache = exports.globeProgramCache = void 0;
-var globeProgramCache = (function () {
-    var cache = new Map();
+const globeProgramCache = (function () {
+    const cache = new Map();
     function getProgram(globe, ProgramClass) {
         if (!cache.has(globe)) {
             cache.set(globe, new Map());
@@ -26,7 +26,7 @@ var globeProgramCache = (function () {
                 program: new ProgramClass(),
                 count: 1
             });
-            var firstObject = globe.DrawOrder.GetObj(0);
+            const firstObject = globe.DrawOrder.GetObj(0);
             globe.api_RegisterPlugin(cache.get(globe).get(ProgramClass).program, firstObject);
         }
         else {
@@ -49,13 +49,13 @@ var globeProgramCache = (function () {
     }
     ;
     return Object.freeze({
-        getProgram: getProgram,
-        releaseProgram: releaseProgram
+        getProgram,
+        releaseProgram
     });
 })();
 exports.globeProgramCache = globeProgramCache;
-var glProgramCache = (function () {
-    var cache = new Map();
+const glProgramCache = (function () {
+    const cache = new Map();
     function getProgram(gl, ProgramClass) {
         if (!cache.has(gl)) {
             cache.set(gl, new Map());
@@ -87,13 +87,13 @@ var glProgramCache = (function () {
     }
     ;
     return Object.freeze({
-        getProgram: getProgram,
-        releaseProgram: releaseProgram
+        getProgram,
+        releaseProgram
     });
 })();
 exports.glProgramCache = glProgramCache;
-var noRegisterGlobeProgramCache = (function () {
-    var cache = new Map();
+const noRegisterGlobeProgramCache = (function () {
+    const cache = new Map();
     function getProgram(globe, ProgramClass) {
         if (!cache.has(globe)) {
             cache.set(globe, new Map());
@@ -124,8 +124,8 @@ var noRegisterGlobeProgramCache = (function () {
         }
     }
     return Object.freeze({
-        getProgram: getProgram,
-        releaseProgram: releaseProgram
+        getProgram,
+        releaseProgram
     });
 })();
 exports.noRegisterGlobeProgramCache = noRegisterGlobeProgramCache;