@pirireis/webglobeplugins 0.9.11 → 0.9.13

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

@@ -1,18 +1,66 @@
-"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) {
+import { createProgram } from "../../util";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
+const vs = `#version 300 es
+${CameraUniformBlockString}
+${mercatorXYToGLPosition}
+${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;
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
         this.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
             hovered_vertexID: gl.getUniformLocation(program, "hovered_vertexID"),
@@ -25,7 +73,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);
@@ -42,14 +90,14 @@ var PointOnGlobeProgram = /** @class */ (function () {
         // eslint-disable-next-line
         { // arrange camera uniform block
             this.cameraBlockBingingPoint = 0;
-            this.cameraBlockTotem = totems_1.CameraUniformBlockTotemCache.get(globe);
-            var cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+            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 +120,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 +154,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;
-        totems_1.CameraUniformBlockTotemCache.release(globe);
+        const { gl, globe } = this;
+        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) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
 });
-exports.PointOnGlobeProgramCache = PointOnGlobeProgramCache;
+export { PointOnGlobeProgramCache };

package/programs/programcache.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @module programcache
  * @description This module provides a cache for programs. It is used to avoid creating the same program multiple times.
@@ -12,10 +11,8 @@
  * The programs created by are lightweight absraction of program logic with `constructer(gl)`.
  * These programs are generally wrapped by another class with more functionality.
  */
-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 +23,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 +46,12 @@ 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 +83,12 @@ 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 +119,8 @@ var noRegisterGlobeProgramCache = (function () {
         }
     }
     return Object.freeze({
-        getProgram: getProgram,
-        releaseProgram: releaseProgram
+        getProgram,
+        releaseProgram
     });
 })();
-exports.noRegisterGlobeProgramCache = noRegisterGlobeProgramCache;
+export { globeProgramCache, glProgramCache, noRegisterGlobeProgramCache };

package/programs/rings/distancering/circleflatprogram.js

@@ -1,61 +1,68 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.programCache = void 0;
-var util_1 = require("../../../util");
-var camerauniformblock_1 = __importStar(require("../../totems/camerauniformblock"));
-var programcache_1 = require("../../programcache");
-var CIRCLE_EDGE_COUNT = 360;
-var vertexShader = "#version 300 es " +
-    util_1.shaderfunctions.PI +
-    util_1.shaderfunctions.R +
-    util_1.shaderfunctions.POLE +
-    camerauniformblock_1.CameraUniformBlockString +
-    util_1.shaderfunctions.mercatorXYToGLPosition +
-    util_1.shaderfunctions.longLatRadToMercator +
-    util_1.shaderfunctions.longLatRadToCartesian3D +
-    util_1.shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
-    util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
-    util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + "\n\nuniform int compass;\nuniform float circle_edge_count;\n\nuniform float opacity;\n\nin vec2 center;\nin float radius;\nin vec4 color;\nin float flag;\nout vec4 v_color;\nout vec2 v_limp;\n\nvoid main() {\n    if( flag == 1.0 || radius == 0.0) return; // flag 1.0 is hide\n    v_color = vec4(color.rgb, color.a * opacity);\n    if ( gl_VertexID == 270 ) v_color.rgb += 0.2;\n    float angle = 3.1415926535897932384626433832795 * 2.0 * (float(gl_VertexID) /  circle_edge_count);\n    if ( is3D ){\n            gl_Position = projection * view * vec4(\n            circleLimpFromLongLatRadCenterCartesian3D( center, radius, angle) - translate, 1.0);\n        v_limp = vec2(0.0, 0.0);\n        return;\n    }\n    vec2 limp;\n    if ( compass == 1 ){\n        limp = circleLimpFromLongLatRadCenterMercatorCompass(center, radius, angle);\n    } else {\n        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius, angle);\n    }   \n    v_limp = limp;\n    gl_Position = mercatorXYToGLPosition(limp);\n    \n}";
-var fragmentShader = "#version 300 es\nprecision highp float;" +
-    util_1.shaderfunctions.POLE + "\n\nin vec4 v_color;\nin vec2 v_limp;\nout vec4 outColor;\nvoid main() {\n    if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ discard; }\n    outColor = v_color;\n}";
-var Logic = /** @class */ (function () {
-    function Logic(globe) {
+import { createProgram, shaderfunctions } from "../../../util";
+import CameraUniformBlockTotem, { CameraUniformBlockString } from "../../totems/camerauniformblock";
+import { noRegisterGlobeProgramCache, globeProgramCache } from "../../programcache";
+const CIRCLE_EDGE_COUNT = 360;
+const vertexShader = `#version 300 es ` +
+    shaderfunctions.PI +
+    shaderfunctions.R +
+    shaderfunctions.POLE +
+    CameraUniformBlockString +
+    shaderfunctions.mercatorXYToGLPosition +
+    shaderfunctions.longLatRadToMercator +
+    shaderfunctions.longLatRadToCartesian3D +
+    shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
+    shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
+    shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
+
+uniform int compass;
+uniform float circle_edge_count;
+
+uniform float opacity;
+
+in vec2 center;
+in float radius;
+in vec4 color;
+in float flag;
+out vec4 v_color;
+out vec2 v_limp;
+
+void main() {
+    if( flag == 1.0 || radius == 0.0) return; // flag 1.0 is hide
+    v_color = vec4(color.rgb, color.a * opacity);
+    if ( gl_VertexID == 270 ) v_color.rgb += 0.2;
+    float angle = 3.1415926535897932384626433832795 * 2.0 * (float(gl_VertexID) /  circle_edge_count);
+    if ( is3D ){
+            gl_Position = projection * view * vec4(
+            circleLimpFromLongLatRadCenterCartesian3D( center, radius, angle) - translate, 1.0);
+        v_limp = vec2(0.0, 0.0);
+        return;
+    }
+    vec2 limp;
+    if ( compass == 1 ){
+        limp = circleLimpFromLongLatRadCenterMercatorCompass(center, radius, angle);
+    } else {
+        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius, angle);
+    }   
+    v_limp = limp;
+    gl_Position = mercatorXYToGLPosition(limp);
+    
+}`;
+const fragmentShader = `#version 300 es
+precision highp float;` +
+    shaderfunctions.POLE + `
+
+in vec4 v_color;
+in vec2 v_limp;
+out vec4 outColor;
+void main() {
+    if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.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, vertexShader, fragmentShader);
+        this.program = createProgram(this.gl, vertexShader, fragmentShader);
         { // bind positions so bufferManager can use them
             this.gl.bindAttribLocation(this.program, 0, "center");
             this.gl.bindAttribLocation(this.program, 1, "radius");
@@ -63,8 +70,8 @@ var Logic = /** @class */ (function () {
             this.gl.bindAttribLocation(this.program, 3, "flag");
         }
         this.cameraBlockBindingPoint = 0;
-        this.cameraBlockTotem = programcache_1.globeProgramCache.getProgram(globe, camerauniformblock_1.default);
-        var cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
+        this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
+        const cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
         this.gl.uniformBlockBinding(this.program, cameraBlockIndex, this.cameraBlockBindingPoint);
         this._opacityLocation = this.gl.getUniformLocation(this.program, "opacity");
         this._compassLocation = this.gl.getUniformLocation(this.program, "compass");
@@ -73,7 +80,7 @@ var Logic = /** @class */ (function () {
         this._compassmode = 1;
         this._opacity = 1.0;
         {
-            var currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
+            const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
             this.gl.useProgram(this.program);
             this.gl.uniform1i(this._compassLocation, 1);
             this.gl.uniform1f(this._circleEdgeCountLocation, CIRCLE_EDGE_COUNT);
@@ -81,8 +88,8 @@ var Logic = /** @class */ (function () {
             this.gl.useProgram(currentProgram);
         }
     }
-    Logic.prototype.draw = function (attrBufferManager, compass, circleEdgeCount, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, cameraBlockTotem = _a.cameraBlockTotem, cameraBlockBindingPoint = _a.cameraBlockBindingPoint;
+    draw(attrBufferManager, compass, circleEdgeCount, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this;
         gl.useProgram(program);
         cameraBlockTotem.bind(cameraBlockBindingPoint);
         attrBufferManager.bindCircleVAO();
@@ -101,14 +108,13 @@ var Logic = /** @class */ (function () {
         gl.drawArraysInstanced(gl.LINE_LOOP, 0, circleEdgeCount, attrBufferManager.length);
         gl.bindVertexArray(null);
         cameraBlockTotem.unbind(cameraBlockBindingPoint);
-    };
-    Logic.prototype.free = function () {
+    }
+    free() {
         this.gl.deleteProgram(this.program);
-        programcache_1.globeProgramCache.releaseProgram(this.globe, camerauniformblock_1.default);
-    };
-    return Logic;
-}());
-exports.programCache = Object.freeze({
-    getProgram: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    releaseProgram: function (globe) { programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+        globeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
+    }
+}
+export const programCache = Object.freeze({
+    getProgram: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    releaseProgram: (globe) => { noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });