@pirireis/webglobeplugins 0.9.11 → 0.9.12

package/programs/arrowfield/logic.js

@@ -1,12 +1,125 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var util_1 = require("../../util");
-var programcache_1 = require("../programcache");
-var totems_1 = require("../totems");
-var arrowVertexShader = "#version 300 es\n#define R 6378.137\n#define PI 3.1415926535897932384626433832795\n#define POLE 20037508.34\n#define POLE_BY_PI 6366198.2\n#define HALF_PI 1.5707963267948966192313216916398\n\nuniform sampler2D rotation; // rotation of arrow\n\nout vec4 v_color;\n\nlayout(std140) uniform CameraBlock {\n    mat4 u_view;\n    mat4 u_projection;\n    vec3 u_translate;\n    bool u_is3D;\n    vec2 u_mapWH;\n    vec2 u_scrWH;\n    float u_zlevel;\n};\n\nlayout(std140) uniform ArrowBlock {\n    vec4 u_color;\n    vec2 u_bbox_offset_rad;\n    vec2 u_bbox_size_rad;\n    vec2 u_resolution;\n    float u_length_ratio;\n    float u_width_ratio;\n    float u_height;\n    float u_no_data_value;\n};\n\nvec2 f_texCoord(){\n    float fID = float(gl_InstanceID);\n    float x = mod( fID, u_resolution.x ) / ( u_resolution.x - 1.0);\n    float y = 1.0 - floor( fID / u_resolution.x ) / ( u_resolution.y - 1.0);\n    return vec2(x, y);\n}\n\nvec2 f_radCoord(vec2 texCoord){\n    float x = (texCoord.x * u_bbox_size_rad.x ) + u_bbox_offset_rad.x;\n    float y = (texCoord.y * u_bbox_size_rad.y ) + u_bbox_offset_rad.y;\n    return vec2(x, y);\n}\n\nvec3 f_onSphere(vec2 radCoord){\n    float x = sin(radCoord.y) * cos(radCoord.x);\n    float y = sin(radCoord.y) * sin(radCoord.x);\n    float z = cos(radCoord.y);\n    return vec3(x, y, z) * (R + u_height);\n}\n\n\nvec2 f_onFlat(vec2 radCoord){\n    float mercX = radCoord.x * POLE_BY_PI;\n    float mercY = log(tan(HALF_PI - radCoord.y * 0.5)) * POLE_BY_PI;\n    float normX = ( mercX - u_translate.x ) / u_mapWH.x;\n    float normY = ( mercY - u_translate.y ) / u_mapWH.y;\n    return vec2(normX, normY);\n}\n\nvoid main() {\n    // escape if no data\n    vec2 texCoord = f_texCoord();\n    vec2 geoCoord = vec2( texCoord.x , 1.0 - texCoord.y );\n\n\n    float angle = texture(rotation, texCoord).r;\n\n    if ( angle == u_no_data_value ) {\n        gl_Position = vec4(-2.0, -2.0, 0.0, 1.0);\n        return;\n    }\n    vec2 arrowLimb;\n    if (0.0 == mod(float(gl_VertexID), 2.0)) {\n        arrowLimb = vec2(0.0, 0.0);\n    } else if (gl_VertexID == 1) {\n        // tail\n        arrowLimb = vec2( cos(angle), sin(angle)) * u_length_ratio / (170.0 );\n    } else if (gl_VertexID == 3) {\n        // right wing\n        arrowLimb = vec2( cos(angle + 0.45), sin(angle + 0.45)) * u_width_ratio / (170.0 );\n    } else if (gl_VertexID == 5) {\n        // left wing\n        arrowLimb = vec2( cos(angle - 0.45), sin(angle - 0.45)) * u_width_ratio / (170.0 );\n    }\n\n\n    vec2 radCoord = f_radCoord(geoCoord + arrowLimb);\n    if ( u_is3D ) {\n        vec3 spherePos = f_onSphere(radCoord);\n        gl_Position = u_projection * u_view * vec4(spherePos - u_translate, 1.0);\n    } else {\n        vec2 flatPos = f_onFlat(radCoord);\n        gl_Position = u_projection * vec4(\n            flatPos.x * u_scrWH.x, \n            (1.0 - flatPos.y) * u_scrWH.y,\n            0.0, 1.0\n        );\n    }\n\n\n    v_color = u_color;\n    gl_PointSize = 4.0;\n}\n";
-var arrowFragmentShader = "#version 300 es\nprecision highp float;\nin vec4 v_color;\nout vec4 outColor;\n\nvoid main() {\n    outColor = v_color;\n}\n";
-var ArrowFieldLogic = /** @class */ (function () {
-    function ArrowFieldLogic() {
+const util_1 = require("../../util");
+const programcache_1 = require("../programcache");
+const totems_1 = require("../totems");
+const arrowVertexShader = `#version 300 es
+#define R 6378.137
+#define PI 3.1415926535897932384626433832795
+#define POLE 20037508.34
+#define POLE_BY_PI 6366198.2
+#define HALF_PI 1.5707963267948966192313216916398
+
+uniform sampler2D rotation; // rotation of arrow
+
+out vec4 v_color;
+
+layout(std140) uniform CameraBlock {
+    mat4 u_view;
+    mat4 u_projection;
+    vec3 u_translate;
+    bool u_is3D;
+    vec2 u_mapWH;
+    vec2 u_scrWH;
+    float u_zlevel;
+};
+
+layout(std140) uniform ArrowBlock {
+    vec4 u_color;
+    vec2 u_bbox_offset_rad;
+    vec2 u_bbox_size_rad;
+    vec2 u_resolution;
+    float u_length_ratio;
+    float u_width_ratio;
+    float u_height;
+    float u_no_data_value;
+};
+
+vec2 f_texCoord(){
+    float fID = float(gl_InstanceID);
+    float x = mod( fID, u_resolution.x ) / ( u_resolution.x - 1.0);
+    float y = 1.0 - floor( fID / u_resolution.x ) / ( u_resolution.y - 1.0);
+    return vec2(x, y);
+}
+
+vec2 f_radCoord(vec2 texCoord){
+    float x = (texCoord.x * u_bbox_size_rad.x ) + u_bbox_offset_rad.x;
+    float y = (texCoord.y * u_bbox_size_rad.y ) + u_bbox_offset_rad.y;
+    return vec2(x, y);
+}
+
+vec3 f_onSphere(vec2 radCoord){
+    float x = sin(radCoord.y) * cos(radCoord.x);
+    float y = sin(radCoord.y) * sin(radCoord.x);
+    float z = cos(radCoord.y);
+    return vec3(x, y, z) * (R + u_height);
+}
+
+
+vec2 f_onFlat(vec2 radCoord){
+    float mercX = radCoord.x * POLE_BY_PI;
+    float mercY = log(tan(HALF_PI - radCoord.y * 0.5)) * POLE_BY_PI;
+    float normX = ( mercX - u_translate.x ) / u_mapWH.x;
+    float normY = ( mercY - u_translate.y ) / u_mapWH.y;
+    return vec2(normX, normY);
+}
+
+void main() {
+    // escape if no data
+    vec2 texCoord = f_texCoord();
+    vec2 geoCoord = vec2( texCoord.x , 1.0 - texCoord.y );
+
+
+    float angle = texture(rotation, texCoord).r;
+
+    if ( angle == u_no_data_value ) {
+        gl_Position = vec4(-2.0, -2.0, 0.0, 1.0);
+        return;
+    }
+    vec2 arrowLimb;
+    if (0.0 == mod(float(gl_VertexID), 2.0)) {
+        arrowLimb = vec2(0.0, 0.0);
+    } else if (gl_VertexID == 1) {
+        // tail
+        arrowLimb = vec2( cos(angle), sin(angle)) * u_length_ratio / (170.0 );
+    } else if (gl_VertexID == 3) {
+        // right wing
+        arrowLimb = vec2( cos(angle + 0.45), sin(angle + 0.45)) * u_width_ratio / (170.0 );
+    } else if (gl_VertexID == 5) {
+        // left wing
+        arrowLimb = vec2( cos(angle - 0.45), sin(angle - 0.45)) * u_width_ratio / (170.0 );
+    }
+
+
+    vec2 radCoord = f_radCoord(geoCoord + arrowLimb);
+    if ( u_is3D ) {
+        vec3 spherePos = f_onSphere(radCoord);
+        gl_Position = u_projection * u_view * vec4(spherePos - u_translate, 1.0);
+    } else {
+        vec2 flatPos = f_onFlat(radCoord);
+        gl_Position = u_projection * vec4(
+            flatPos.x * u_scrWH.x, 
+            (1.0 - flatPos.y) * u_scrWH.y,
+            0.0, 1.0
+        );
+    }
+
+
+    v_color = u_color;
+    gl_PointSize = 4.0;
+}
+`;
+const arrowFragmentShader = `#version 300 es
+precision highp float;
+in vec4 v_color;
+out vec4 outColor;
+
+void main() {
+    outColor = v_color;
+}
+`;
+class ArrowFieldLogic {
+    constructor() {
         this.gl = null;
         this.globe = null;
         this.cameraUniformBlockTotem = null;
@@ -14,34 +127,34 @@ var ArrowFieldLogic = /** @class */ (function () {
         this.cameraBlockBindingPoint = 0;
         this.arrayBlockBindingPoint = 1;
     }
-    ArrowFieldLogic.prototype.init = function (globe, gl) {
+    init(globe, gl) {
         this.gl = gl;
         this.globe = globe;
         this.cameraUniformBlockTotem = programcache_1.globeProgramCache.getProgram(globe, totems_1.CameraUniformBlockTotem);
         this.program = this._createProgram();
-    };
-    ArrowFieldLogic.prototype._createProgram = function () {
-        var gl = this.gl;
-        var program = (0, util_1.createProgram)(gl, arrowVertexShader, arrowFragmentShader);
-        var cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraBlock");
+    }
+    _createProgram() {
+        const gl = this.gl;
+        const program = (0, util_1.createProgram)(gl, arrowVertexShader, arrowFragmentShader);
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraBlock");
         gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-        var arrowBlockIndex = gl.getUniformBlockIndex(program, "ArrowBlock");
+        const arrowBlockIndex = gl.getUniformBlockIndex(program, "ArrowBlock");
         gl.uniformBlockBinding(program, arrowBlockIndex, this.arrayBlockBindingPoint);
         this.textureLocations = {
             rotationLocation: gl.getUniformLocation(program, "rotation"),
         };
         return program;
-    };
-    ArrowFieldLogic.prototype.getArrowBlockBufferManager = function () {
+    }
+    getArrowBlockBufferManager() {
         return new ArrowBlockBufferManager(this.gl, this.arrayBlockBindingPoint);
-    };
+    }
     // initial load type is static. 
     // after that, it is dynamic.
-    ArrowFieldLogic.prototype.getTextureManager = function (width, height) {
+    getTextureManager(width, height) {
         return new TextureManager(this.gl, width, height, this.textureLocations);
-    };
-    ArrowFieldLogic.prototype.draw = function (arrowBlockManager, textureManager, instanceCount) {
-        var _a = this, gl = _a.gl, cameraBlockBindingPoint = _a.cameraBlockBindingPoint, cameraUniformBlockTotem = _a.cameraUniformBlockTotem;
+    }
+    draw(arrowBlockManager, textureManager, instanceCount) {
+        const { gl, cameraBlockBindingPoint, cameraUniformBlockTotem } = this;
         gl.useProgram(this.program);
         arrowBlockManager.bind();
         textureManager.activate();
@@ -50,17 +163,16 @@ var ArrowFieldLogic = /** @class */ (function () {
         // gl.drawArraysInstanced(gl.POINTS, 0, 4, instanceCount);
         cameraUniformBlockTotem.unbind(cameraBlockBindingPoint);
         arrowBlockManager.unbind();
-    };
-    ArrowFieldLogic.prototype.free = function () {
-        var _a = this, gl = _a.gl, program = _a.program;
+    }
+    free() {
+        const { gl, program } = this;
         gl.deleteProgram(program);
         programcache_1.globeProgramCache.releaseProgram(this.globe, totems_1.CameraUniformBlockTotem);
-    };
-    return ArrowFieldLogic;
-}());
+    }
+}
 exports.default = ArrowFieldLogic;
-var ArrowBlockBufferManager = /** @class */ (function () {
-    function ArrowBlockBufferManager(gl, bindingPoint) {
+class ArrowBlockBufferManager {
+    constructor(gl, bindingPoint) {
         this.gl = gl;
         this.bindingPoint = bindingPoint;
         this.ubo = gl.createBuffer();
@@ -69,9 +181,8 @@ var ArrowBlockBufferManager = /** @class */ (function () {
         gl.bufferData(gl.UNIFORM_BUFFER, 56, gl.DYNAMIC_DRAW);
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
     }
-    ArrowBlockBufferManager.prototype.update = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.color, color = _c === void 0 ? null : _c, _d = _b.bboxOffsetRad, bboxOffsetRad = _d === void 0 ? null : _d, _e = _b.bboxSizeRad, bboxSizeRad = _e === void 0 ? null : _e, _f = _b.resolution, resolution = _f === void 0 ? null : _f, _g = _b.tailLengthRatio, tailLengthRatio = _g === void 0 ? null : _g, _h = _b.wingLengthRatio, wingLengthRatio = _h === void 0 ? null : _h, _j = _b.height, height = _j === void 0 ? null : _j, _k = _b.opacity, opacity = _k === void 0 ? null : _k, _l = _b.noDataValue, noDataValue = _l === void 0 ? null : _l;
-        var _m = this, gl = _m.gl, ubo = _m.ubo;
+    update({ color = null, bboxOffsetRad = null, bboxSizeRad = null, resolution = null, tailLengthRatio = null, wingLengthRatio = null, height = null, opacity = null, noDataValue = null, } = {}) {
+        const { gl, ubo } = this;
         gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
         if (color !== null)
             gl.bufferSubData(gl.UNIFORM_BUFFER, 0, new Float32Array(color));
@@ -92,58 +203,55 @@ var ArrowBlockBufferManager = /** @class */ (function () {
         if (noDataValue !== null)
             gl.bufferSubData(gl.UNIFORM_BUFFER, 52, new Float32Array([noDataValue]));
         gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-    };
-    ArrowBlockBufferManager.prototype.bind = function () {
-        var _a = this, gl = _a.gl, ubo = _a.ubo, bindingPoint = _a.bindingPoint;
+    }
+    bind() {
+        const { gl, ubo, bindingPoint } = this;
         gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
-    };
-    ArrowBlockBufferManager.prototype.unbind = function () {
-        var _a = this, gl = _a.gl, bindingPoint = _a.bindingPoint;
+    }
+    unbind() {
+        const { gl, bindingPoint } = this;
         gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
-    };
-    ArrowBlockBufferManager.prototype.free = function () {
-        var _a = this, gl = _a.gl, ubo = _a.ubo;
+    }
+    free() {
+        const { gl, ubo } = this;
         gl.deleteBuffer(ubo);
-    };
-    return ArrowBlockBufferManager;
-}());
-var TextureManager = /** @class */ (function () {
-    function TextureManager(gl, width, height, _a) {
-        var rotationLocation = _a.rotationLocation;
+    }
+}
+class TextureManager {
+    constructor(gl, width, height, { rotationLocation }) {
         this.gl = gl;
         this.width = width;
         this.height = height;
         this.rotationLocation = rotationLocation;
         this.rotationTexture = this._createFloatTexture();
     }
-    TextureManager.prototype._createFloatTexture = function () {
-        var _a = this, gl = _a.gl, width = _a.width, height = _a.height;
-        var texture = gl.createTexture();
+    _createFloatTexture() {
+        const { gl, width, height } = this;
+        const texture = gl.createTexture();
         gl.bindTexture(gl.TEXTURE_2D, texture);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, width, height, 0, gl.RED, gl.FLOAT, null);
         gl.bindTexture(gl.TEXTURE_2D, null);
         return texture;
-    };
-    TextureManager.prototype.setData = function (rotation) {
-        var _a = this, gl = _a.gl, rotationTexture = _a.rotationTexture, width = _a.width, height = _a.height;
+    }
+    setData(rotation) {
+        const { gl, rotationTexture, width, height } = this;
         // gl flip y axis
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
         gl.bindTexture(gl.TEXTURE_2D, rotationTexture);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, width, height, 0, gl.RED, gl.FLOAT, rotation);
         gl.bindTexture(gl.TEXTURE_2D, null);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
-    };
-    TextureManager.prototype.activate = function () {
-        var _a = this, gl = _a.gl, rotationTexture = _a.rotationTexture;
+    }
+    activate() {
+        const { gl, rotationTexture } = this;
         gl.activeTexture(gl.TEXTURE0);
         gl.bindTexture(gl.TEXTURE_2D, rotationTexture);
         gl.uniform1i(this.rotationLocation, 0);
-    };
-    TextureManager.prototype.free = function () {
-        var _a = this, gl = _a.gl, rotationTexture = _a.rotationTexture;
+    }
+    free() {
+        const { gl, rotationTexture } = this;
         gl.deleteTexture(rotationTexture);
-    };
-    return TextureManager;
-}());
+    }
+}

package/programs/arrowfield/object.js

@@ -6,12 +6,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var logic_1 = __importDefault(require("./logic"));
-var programcache_1 = require("../programcache");
-var util_1 = require("../util");
-var ArrowField = /** @class */ (function () {
-    function ArrowField(gl, globe, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.minLon, minLon = _c === void 0 ? -180 : _c, _d = _b.maxLon, maxLon = _d === void 0 ? 180 : _d, _e = _b.minLat, minLat = _e === void 0 ? -90 : _e, _f = _b.maxLat, maxLat = _f === void 0 ? 90 : _f, _g = _b.height, height = _g === void 0 ? 0 : _g, _h = _b.opacity, opacity = _h === void 0 ? 1 : _h, _j = _b.color, color = _j === void 0 ? [0.04, 0.2, 0.8] : _j, _k = _b.targetWidth, targetWidth = _k === void 0 ? 100 : _k, _l = _b.targetHeight, targetHeight = _l === void 0 ? 100 : _l, _m = _b.dataWidth, dataWidth = _m === void 0 ? null : _m, _o = _b.dataHeight, dataHeight = _o === void 0 ? null : _o, _p = _b.tailLengthRatio, tailLengthRatio = _p === void 0 ? 1 : _p, _q = _b.wingLengthRatio, wingLengthRatio = _q === void 0 ? 0.5 : _q, _r = _b.noDataValue, noDataValue = _r === void 0 ? null : _r;
+const logic_1 = __importDefault(require("./logic"));
+const programcache_1 = require("../programcache");
+const util_1 = require("../util");
+class ArrowField {
+    constructor(gl, globe, { minLon = -180, maxLon = 180, minLat = -90, maxLat = 90, height = 0, opacity = 1, color = [0.04, 0.2, 0.8], targetWidth = 100, targetHeight = 100, dataWidth = null, dataHeight = null, tailLengthRatio = 1, wingLengthRatio = 0.5, noDataValue = null,
+    // maxMagnitude = null
+     } = {}) {
         this.gl = gl;
         this.globe = globe;
         this.program = programcache_1.globeProgramCache.getProgram(globe, logic_1.default);
@@ -19,50 +20,47 @@ var ArrowField = /** @class */ (function () {
         this.instanceCount = targetWidth * targetHeight;
         this.arrowBlockManager.update({ resolution: [targetWidth, targetHeight] });
         this.textureManager = this.program.getTextureManager(dataWidth, dataHeight);
-        this.setBBox({ minLon: minLon, maxLon: maxLon, minLat: minLat, maxLat: maxLat });
-        this.update({ height: height, opacity: opacity, color: color, tailLengthRatio: tailLengthRatio, wingLengthRatio: wingLengthRatio, noDataValue: noDataValue });
+        this.setBBox({ minLon, maxLon, minLat, maxLat });
+        this.update({ height, opacity, color, tailLengthRatio, wingLengthRatio, noDataValue });
     }
-    ArrowField.prototype.setBBox = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.minLon, minLon = _c === void 0 ? -180 : _c, _d = _b.maxLon, maxLon = _d === void 0 ? 180 : _d, _e = _b.minLat, minLat = _e === void 0 ? -90 : _e, _f = _b.maxLat, maxLat = _f === void 0 ? 90 : _f;
-        this.bbox = { minLon: minLon, maxLon: maxLon, minLat: minLat, maxLat: maxLat };
-        var _g = (0, util_1.longlatbbox2normalbbox)(this.bbox), bboxSizeRad = _g.bboxSizeRad, bboxOffsetRad = _g.bboxOffsetRad;
-        this.arrowBlockManager.update({ bboxSizeRad: bboxSizeRad, bboxOffsetRad: bboxOffsetRad });
+    setBBox({ minLon = -180, maxLon = 180, minLat = -90, maxLat = 90 } = {}) {
+        this.bbox = { minLon, maxLon, minLat, maxLat };
+        const { bboxSizeRad, bboxOffsetRad } = (0, util_1.longlatbbox2normalbbox)(this.bbox);
+        this.arrowBlockManager.update({ bboxSizeRad, bboxOffsetRad });
         this.globe.DrawRender();
-    };
-    ArrowField.prototype.update = function (_a) {
-        var _b = _a === void 0 ? {} : _a, height = _b.height, opacity = _b.opacity, color = _b.color, resolution = _b.resolution, tailLengthRatio = _b.tailLengthRatio, wingLengthRatio = _b.wingLengthRatio, noDataValue = _b.noDataValue;
+    }
+    update({ height, opacity, color, resolution, tailLengthRatio, wingLengthRatio, noDataValue } = {}) {
         if (resolution) {
             this.instanceCount = resolution[0] * resolution[1];
         }
         this.arrowBlockManager.update({
-            color: color,
-            resolution: resolution,
-            height: height,
-            opacity: opacity,
-            tailLengthRatio: tailLengthRatio,
-            wingLengthRatio: wingLengthRatio,
-            noDataValue: noDataValue,
+            color,
+            resolution,
+            height,
+            opacity,
+            tailLengthRatio,
+            wingLengthRatio,
+            noDataValue,
         });
         this.globe.DrawRender();
-    };
-    ArrowField.prototype.setTargetResolution = function (width, height) {
+    }
+    setTargetResolution(width, height) {
         this.instanceCount = width * height;
         this.arrowBlockManager.update({ resolution: [width, height] });
         this.globe.DrawRender();
-    };
-    ArrowField.prototype.draw = function () {
-        var _a = this, program = _a.program, arrowBlockManager = _a.arrowBlockManager, textureManager = _a.textureManager, instanceCount = _a.instanceCount;
+    }
+    draw() {
+        const { program, arrowBlockManager, textureManager, instanceCount } = this;
         program.draw(arrowBlockManager, textureManager, instanceCount);
-    };
-    ArrowField.prototype.setData = function (rotation) {
+    }
+    setData(rotation) {
         this.textureManager.setData(rotation);
         this.globe.DrawRender();
-    };
-    ArrowField.prototype.free = function () {
+    }
+    free() {
         this.arrowBlockManager.free();
         this.textureManager.free();
         programcache_1.globeProgramCache.releaseProgram(this.gl, logic_1.default);
-    };
-    return ArrowField;
-}());
+    }
+}
 exports.default = ArrowField;

package/programs/data2legend/density-to-legend.js

@@ -1,16 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.densityToLegendProgramCache = void 0;
-var util_1 = require("../../util/");
-var programcache_1 = require("../programcache");
-var vs = "#version 300 es\nprecision highp float;\n\nuniform sampler2D u_density_texture;\nin vec2 a_position;\n\nout vec2 v_texcoord;\n\nvoid main() {\n    gl_Position = vec4(a_position, 0.0, 1.0);\n    v_texcoord = a_position * 0.5 + 0.5;\n}";
-var fs = "#version 300 es\nprecision highp float;\n\nuniform sampler2D u_legend_texture;\nuniform sampler2D u_density_texture;\n\nuniform float u_opacity;\nin vec2 v_texcoord;\nout vec4 fragColor;\n\nvoid main() {\n    float density = texture(u_density_texture, v_texcoord).r;\n    fragColor = texture(u_legend_texture, vec2(density, 0.5));\n    fragColor.a *= u_opacity * sqrt(density);\n}";
-var DensityToLegendProgram = /** @class */ (function () {
-    function DensityToLegendProgram(globe) {
+const util_1 = require("../../util/");
+const programcache_1 = require("../programcache");
+const vs = `#version 300 es
+precision highp float;
+
+uniform sampler2D u_density_texture;
+in vec2 a_position;
+
+out vec2 v_texcoord;
+
+void main() {
+    gl_Position = vec4(a_position, 0.0, 1.0);
+    v_texcoord = a_position * 0.5 + 0.5;
+}`;
+const fs = `#version 300 es
+precision highp float;
+
+uniform sampler2D u_legend_texture;
+uniform sampler2D u_density_texture;
+
+uniform float u_opacity;
+in vec2 v_texcoord;
+out vec4 fragColor;
+
+void main() {
+    float density = texture(u_density_texture, v_texcoord).r;
+    fragColor = texture(u_legend_texture, vec2(density, 0.5));
+    fragColor.a *= u_opacity * sqrt(density);
+}`;
+class DensityToLegendProgram {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this.program = (0, util_1.createProgram)(globe.gl, vs, fs);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this.uniforms = {
             densityTexture: gl.getUniformLocation(program, "u_density_texture"),
             legendTexture: gl.getUniformLocation(program, "u_legend_texture"),
@@ -21,9 +46,9 @@ var DensityToLegendProgram = /** @class */ (function () {
         }
         {
             this.vao = gl.createVertexArray();
-            var a_positionLocation = gl.getAttribLocation(program, "a_position");
+            const a_positionLocation = gl.getAttribLocation(program, "a_position");
             gl.bindVertexArray(this.vao);
-            var buffer = gl.createBuffer();
+            const buffer = gl.createBuffer();
             gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
             gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
                 -1, -1,
@@ -39,14 +64,14 @@ var DensityToLegendProgram = /** @class */ (function () {
         }
         {
             this._lastOpacity = 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.useProgram(currentProgram);
         }
     }
-    DensityToLegendProgram.prototype.draw = function (densityTexture, legendTexture, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, uniforms = _a.uniforms;
+    draw(densityTexture, legendTexture, opacity) {
+        const { gl, program, uniforms } = this;
         gl.useProgram(program);
         gl.bindVertexArray(this.vao);
         gl.activeTexture(gl.TEXTURE1);
@@ -61,17 +86,16 @@ var DensityToLegendProgram = /** @class */ (function () {
         }
         gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
         gl.bindVertexArray(null);
-    };
-    DensityToLegendProgram.prototype.free = function () {
-        var gl = this.gl;
+    }
+    free() {
+        const gl = this.gl;
         gl.deleteVertexArray(this.vao);
         gl.deleteBuffer(this._buffer);
         gl.deleteProgram(this.program);
-    };
-    return DensityToLegendProgram;
-}());
-var densityToLegendProgramCache = {
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, DensityToLegendProgram); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, DensityToLegendProgram); }
+    }
+}
+const densityToLegendProgramCache = {
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, DensityToLegendProgram),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, DensityToLegendProgram)
 };
 exports.densityToLegendProgramCache = densityToLegendProgramCache;

package/programs/data2legend/point-to-density-texture.js

@@ -1,19 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pointToDensityTextureCache = void 0;
-var util_1 = require("../../util/");
-var programcache_1 = require("../programcache");
-var camerauniformblock_1 = require("../totems/camerauniformblock");
-var geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-var vs = "#version 300 es\nprecision highp float;\n\n".concat(camerauniformblock_1.CameraUniformBlockString, "\n").concat(geometrytransformations_1.mercatorXYToGLPosition, "\n").concat(geometrytransformations_1.cartesian3DToGLPosition, "\n\nin vec3 position;\nuniform float pointSize;\n\nvoid main() {\n    if (is3D) {\n        gl_Position = cartesian3DToGLPosition(position);\n    } else {\n        gl_Position = mercatorXYToGLPosition(position.xy);\n    }\n    gl_PointSize = pointSize;\n}\n");
-var fs = "#version 300 es\nprecision highp float;\nout vec4 fragColor;\n\nvoid main() {\n    float r = length(gl_PointCoord - 0.5) * 2.0;\n    if (r > 1.0) discard;\n    // float density = smoothstep(0.1, 1.0, 1.0 - r);\n    fragColor = vec4((15.0/16.0)*sqrt(1.0-sqrt(r)));\n}";
-var PointHeatmapProgram = /** @class */ (function () {
-    function PointHeatmapProgram(globe) {
+const util_1 = require("../../util/");
+const programcache_1 = require("../programcache");
+const camerauniformblock_1 = require("../totems/camerauniformblock");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+const vs = `#version 300 es
+precision highp float;
+
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.cartesian3DToGLPosition}
+
+in vec3 position;
+uniform float pointSize;
+
+void main() {
+    if (is3D) {
+        gl_Position = cartesian3DToGLPosition(position);
+    } else {
+        gl_Position = mercatorXYToGLPosition(position.xy);
+    }
+    gl_PointSize = pointSize;
+}
+`;
+const fs = `#version 300 es
+precision highp float;
+out vec4 fragColor;
+
+void main() {
+    float r = length(gl_PointCoord - 0.5) * 2.0;
+    if (r > 1.0) discard;
+    // float density = smoothstep(0.1, 1.0, 1.0 - r);
+    fragColor = vec4((15.0/16.0)*sqrt(1.0-sqrt(r)));
+}`;
+class PointHeatmapProgram {
+    constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
         this._isFreed = false;
         this.program = (0, util_1.createProgram)(globe.gl, vs, fs);
-        var _a = this, gl = _a.gl, program = _a.program;
+        const { gl, program } = this;
         this.uniforms = {
             pointSize: gl.getUniformLocation(this.program, "pointSize"),
         };
@@ -23,30 +50,29 @@ var PointHeatmapProgram = /** @class */ (function () {
         { // arrange camera uniform block
             this.cameraBlockBingingPoint = 0;
             this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
-            var cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
             gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
         }
         { // last values
             this._lastPointSize = 0;
-            var currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
             gl.useProgram(program);
             gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
             gl.useProgram(currentProgram);
         }
     }
-    PointHeatmapProgram.prototype.createVAO = function (positionBuffer, vectorSize) {
-        var gl = this.gl;
-        var vao = gl.createVertexArray();
+    createVAO(positionBuffer, vectorSize) {
+        const gl = this.gl;
+        const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
         gl.enableVertexAttribArray(0);
         gl.vertexAttribPointer(0, vectorSize, gl.FLOAT, false, 0, 0);
         gl.bindVertexArray(null);
         return vao;
-    };
-    PointHeatmapProgram.prototype.draw = function (vao, length, pointSize) {
-        if (pointSize === void 0) { pointSize = 5.0; }
-        var gl = this.gl;
+    }
+    draw(vao, length, pointSize = 5.0) {
+        const gl = this.gl;
         gl.useProgram(this.program);
         if (pointSize !== this._lastPointSize) {
             gl.uniform1f(this.uniforms.pointSize, pointSize);
@@ -57,19 +83,18 @@ var PointHeatmapProgram = /** @class */ (function () {
         gl.drawArrays(gl.POINTS, 0, length);
         this.cameraBlockTotem.unbind(this.cameraBlockBingingPoint);
         gl.bindVertexArray(null);
-    };
-    PointHeatmapProgram.prototype.free = function () {
+    }
+    free() {
         if (this._isFreed)
             return;
-        var _a = this, gl = _a.gl, globe = _a.globe;
+        const { gl, globe } = this;
         camerauniformblock_1.CameraUniformBlockTotemCache.release(globe);
         gl.deleteProgram(this.program);
         this._isFreed = true;
-    };
-    return PointHeatmapProgram;
-}());
-var pointToDensityTextureCache = {
-    get: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointHeatmapProgram); },
-    release: function (globe) { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointHeatmapProgram); }
+    }
+}
+const pointToDensityTextureCache = {
+    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, PointHeatmapProgram),
+    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, PointHeatmapProgram)
 };
 exports.pointToDensityTextureCache = pointToDensityTextureCache;

package/programs/float2legendwithratio/index.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Float2LegendWithRatio = void 0;
-var object_1 = __importDefault(require("./object"));
+const object_1 = __importDefault(require("./object"));
 exports.Float2LegendWithRatio = object_1.default;