@pirireis/webglobeplugins 0.9.11 → 0.9.12

package/programs/rings/distancering/circlepaddysharedbuffer.js

@@ -6,51 +6,6 @@
  *  Buffer is initialized with ring capacity and buffer is created with that capacity. It might be called buffer orphaning.
  *
  * */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * TODO
@@ -58,16 +13,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  *
  */
-var RING_SIZE = 9;
-var default_1 = /** @class */ (function () {
+const RING_SIZE = 9;
+class default_1 {
     /**
      * @param {WebGL2RenderingContext} gl
      * @param {Object} options
      * @param {Number} options.initialRingCapacity
      * @param {String} options.bufferType - "static" or "dynamic"
      * */
-    function default_1(gl, globe, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.initialRingCapacity, initialRingCapacity = _c === void 0 ? 20 : _c, _d = _b.bufferType, bufferType = _d === void 0 ? "STATIC_DRAW" : _d, _e = _b.implicitExtentionRate, implicitExtentionRate = _e === void 0 ? 1.2 : _e;
+    constructor(gl, globe, { initialRingCapacity = 20, bufferType = "STATIC_DRAW", implicitExtentionRate = 1.2 } = {}) {
         this.gl = gl;
         this.globe = globe;
         this._capacity = initialRingCapacity;
@@ -131,103 +85,86 @@ var default_1 = /** @class */ (function () {
      * @param {Number} options.x
      * @param {Number} options.y
      * */
-    default_1.prototype.registerCenter = function (centerID, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.x, x = _c === void 0 ? 0 : _c, _d = _b.y, y = _d === void 0 ? 0 : _d;
+    registerCenter(centerID, { x = 0, y = 0 } = {}) {
         this._centerMap.set(centerID, new Map([
             ["x", x],
             ["y", y],
             ["rings", []] // ring keys
         ]));
-    };
+    }
     /**
      *
      * @param {null | number} newCapacity if null, vacuum defragmentation is applied -> capacity is set to the current ring count
      */
-    default_1.prototype.defrag = function (newCapacity) {
-        if (newCapacity === void 0) { newCapacity = null; }
-        var _a = this, _removedRingsOffsetStack = _a._removedRingsOffsetStack, _ringOffsets = _a._ringOffsets;
+    defrag(newCapacity = null) {
+        const { _removedRingsOffsetStack, _ringOffsets } = this;
         _removedRingsOffsetStack.sort();
         this._capacity = newCapacity || this._ringCounter;
-        var arrayToLoad = new Float32Array(this._capacity * RING_SIZE);
-        var bufferData = this._getBufferData();
-        var arrayOffset = 0;
-        var newRingOffsets = new Map();
-        for (var _i = 0, _ringOffsets_1 = _ringOffsets; _i < _ringOffsets_1.length; _i++) {
-            var _b = _ringOffsets_1[_i], key = _b[0], offset = _b[1];
-            var ringOffset = offset / 4;
-            var ringData = bufferData.slice(ringOffset, ringOffset + RING_SIZE);
+        const arrayToLoad = new Float32Array(this._capacity * RING_SIZE);
+        const bufferData = this._getBufferData();
+        let arrayOffset = 0;
+        const newRingOffsets = new Map();
+        for (const [key, offset] of _ringOffsets) {
+            const ringOffset = offset / 4;
+            const ringData = bufferData.slice(ringOffset, ringOffset + RING_SIZE);
             arrayToLoad.set(ringData, arrayOffset);
             newRingOffsets.set(key, arrayOffset * 4);
             arrayOffset += RING_SIZE;
         }
-        var _c = this, gl = _c.gl, buffer = _c.buffer;
+        const { gl, buffer } = this;
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         gl.bufferData(gl.ARRAY_BUFFER, arrayToLoad, this._bufferType);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this._ringOffsets = newRingOffsets;
         this._removedRingsOffsetStack = [];
         this._length = this._ringCounter;
-    };
-    default_1.prototype.extendBuffer = function (newCapacity) {
+    }
+    extendBuffer(newCapacity) {
         if (this._capacity >= newCapacity) {
             console.warn("New capacity is smaller than the current capacity");
             return;
         }
         this._capacity = newCapacity;
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
-        var bufferData = this._getBufferData();
+        const { gl, buffer } = this;
+        const bufferData = this._getBufferData();
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         gl.bufferData(gl.ARRAY_BUFFER, newCapacity * RING_SIZE * 4, this._bufferType);
         gl.bufferSubData(gl.ARRAY_BUFFER, 0, bufferData);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
-    };
-    default_1.prototype.checkCapacity = function (sizeLeft) {
-        if (sizeLeft === void 0) { sizeLeft = 1; }
+    }
+    checkCapacity(sizeLeft = 1) {
         return sizeLeft <= this._capacity - this._ringCounter;
-    };
-    default_1.prototype.capacityLeft = function () {
+    }
+    capacityLeft() {
         return this._capacity - this._ringCounter;
-    };
-    Object.defineProperty(default_1.prototype, "capacity", {
-        get: function () {
-            return this._capacity;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(default_1.prototype, "length", {
-        get: function () {
-            return this._length;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(default_1.prototype, "ringCount", {
-        get: function () {
-            return this._ringCounter;
-        },
-        enumerable: false,
-        configurable: true
-    });
+    }
+    get capacity() {
+        return this._capacity;
+    }
+    get length() {
+        return this._length;
+    }
+    get ringCount() {
+        return this._ringCounter;
+    }
     /**
      * @param {Array<string>} centerIDs
      * */
-    default_1.prototype.removeCenters = function (centerIDs) {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
-        var zero = new Float32Array([0]);
+    removeCenters(centerIDs) {
+        const { gl, buffer } = this;
+        const zero = new Float32Array([0]);
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (var _i = 0, centerIDs_1 = centerIDs; _i < centerIDs_1.length; _i++) {
-            var centerID = centerIDs_1[_i];
+        for (let centerID of centerIDs) {
             if (!this._centerMap.has(centerID)) {
                 // console.warn("Center is not registered yet");
                 // return;
                 continue;
             }
-            var center = this._centerMap.get(centerID);
-            var rings = center.get("rings");
-            for (var i = 0; i < rings.length; i++) {
+            const center = this._centerMap.get(centerID);
+            const rings = center.get("rings");
+            for (let i = 0; i < rings.length; i++) {
                 // set range to 0, 3rd index of float32array
-                var offset = this._ringOffsets.get(rings[i]);
+                const offset = this._ringOffsets.get(rings[i]);
                 gl.bufferSubData(gl.ARRAY_BUFFER, offset + 8, zero);
                 this._removedRingsOffsetStack.push(offset);
                 this._ringOffsets.delete(rings[i]);
@@ -237,7 +174,7 @@ var default_1 = /** @class */ (function () {
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
-    };
+    }
     /**
      *
      * @property {String} centerID
@@ -245,46 +182,43 @@ var default_1 = /** @class */ (function () {
      * @property {Number} y radians y
      * @param {*} centerIDxyList
      */
-    default_1.prototype.updateCentersXY = function (centerIDxyList) {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
+    updateCentersXY(centerIDxyList) {
+        const { gl, buffer } = this;
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (var _i = 0, centerIDxyList_1 = centerIDxyList; _i < centerIDxyList_1.length; _i++) {
-            var _b = centerIDxyList_1[_i], centerID = _b.centerID, x = _b.x, y = _b.y;
-            var center = this._centerMap.get(centerID);
+        for (let { centerID, x, y } of centerIDxyList) {
+            const center = this._centerMap.get(centerID);
             center.set("x", x);
             center.set("y", y);
-            var xyBlock = new Float32Array([x, y]);
-            var rings = center.get("rings");
-            for (var i = 0; i < rings.length; i++) {
-                var offset = this._ringOffsets.get(rings[i]);
+            const xyBlock = new Float32Array([x, y]);
+            const rings = center.get("rings");
+            for (let i = 0; i < rings.length; i++) {
+                const offset = this._ringOffsets.get(rings[i]);
                 gl.bufferSubData(gl.ARRAY_BUFFER, offset, xyBlock);
             }
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
-    };
-    default_1.prototype.updateCentersHide = function (data) {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
+    }
+    updateCentersHide(data) {
+        const { gl, buffer } = this;
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
-            var _b = data_1[_i], centerID = _b.centerID, _c = _b.hide, hide = _c === void 0 ? null : _c;
+        for (let { centerID, hide = null } of data) {
             if (hide === null)
                 continue;
-            var rings = this._centerMap.get(centerID).get("rings");
-            for (var i = 0; i < rings.length; i++) {
-                var offset = this._ringOffsets.get(rings[i]);
+            const rings = this._centerMap.get(centerID).get("rings");
+            for (let i = 0; i < rings.length; i++) {
+                const offset = this._ringOffsets.get(rings[i]);
                 gl.bufferSubData(gl.ARRAY_BUFFER, offset + 32, new Float32Array([hide]));
             }
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
-    };
-    default_1.prototype.insertBulk = function (rangeRingDatas) {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
+    }
+    insertBulk(rangeRingDatas) {
+        const { gl, buffer } = this;
         { // remove existring centers
-            var existingCenterIDs = [];
-            for (var _i = 0, rangeRingDatas_1 = rangeRingDatas; _i < rangeRingDatas_1.length; _i++) {
-                var centerID = rangeRingDatas_1[_i].centerID;
+            const existingCenterIDs = [];
+            for (let { centerID } of rangeRingDatas) {
                 if (this._centerMap.has(centerID)) {
                     existingCenterIDs.push(centerID);
                 }
@@ -292,9 +226,8 @@ var default_1 = /** @class */ (function () {
             this.removeCenters(existingCenterIDs);
         }
         { // capacity check
-            var incomingRingSize = 0;
-            for (var _b = 0, rangeRingDatas_2 = rangeRingDatas; _b < rangeRingDatas_2.length; _b++) {
-                var rings = rangeRingDatas_2[_b].rings;
+            let incomingRingSize = 0;
+            for (let { rings } of rangeRingDatas) {
                 incomingRingSize += rings.length;
                 // It should check if ring is already registered but for now it is not implemented. 
                 // Reasons: increase in complexity and performance
@@ -302,14 +235,12 @@ var default_1 = /** @class */ (function () {
             this._implicitExtendBufferInNeed(incomingRingSize);
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (var _c = 0, rangeRingDatas_3 = rangeRingDatas; _c < rangeRingDatas_3.length; _c++) {
-            var _d = rangeRingDatas_3[_c], centerID = _d.centerID, x = _d.x, y = _d.y, rings = _d.rings, _e = _d.hide, hide = _e === void 0 ? 0 : _e;
-            this.registerCenter(centerID, { x: x, y: y });
-            for (var _f = 0, rings_1 = rings; _f < rings_1.length; _f++) {
-                var _g = rings_1[_f], ringID = _g.ringID, radius = _g.radius, padding = _g.padding, rgba = _g.rgba;
-                var key = this._ringKey(centerID, ringID);
-                var bufferData = new Float32Array(__spreadArray(__spreadArray([x, y, radius, padding], rgba, true), [hide], false));
-                var offset = this._nextBufferOffset();
+        for (const { centerID, x, y, rings, hide = 0 } of rangeRingDatas) {
+            this.registerCenter(centerID, { x, y });
+            for (const { ringID, radius, padding, rgba } of rings) {
+                const key = this._ringKey(centerID, ringID);
+                const bufferData = new Float32Array([x, y, radius, padding, ...rgba, hide]);
+                const offset = this._nextBufferOffset();
                 gl.bufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
                 this._ringOffsets.set(key, offset);
                 this._centerMap.get(centerID).get("rings").push(key);
@@ -317,61 +248,60 @@ var default_1 = /** @class */ (function () {
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
-    };
+    }
     /**
      *
      * @param {Array<{centerID, rgba}} centersColors
      */
-    default_1.prototype.updateCentersColor = function (centersColors) {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
+    updateCentersColor(centersColors) {
+        const { gl, buffer } = this;
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (var _i = 0, centersColors_1 = centersColors; _i < centersColors_1.length; _i++) {
-            var _b = centersColors_1[_i], centerID = _b.centerID, rgba = _b.rgba;
+        for (let { centerID, rgba } of centersColors) {
             if (!this._centerMap.has(centerID)) {
                 console.warn("Center is not registered yet");
                 continue;
             }
-            var rings = this._centerMap.get(centerID).get("rings");
-            var block = new Float32Array(rgba);
-            for (var i = 0; i < rings.length; i++) {
-                var offset = this._ringOffsets.get(rings[i]);
+            const rings = this._centerMap.get(centerID).get("rings");
+            const block = new Float32Array(rgba);
+            for (let i = 0; i < rings.length; i++) {
+                const offset = this._ringOffsets.get(rings[i]);
                 gl.bufferSubData(gl.ARRAY_BUFFER, offset + 16, block);
             }
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         this.globe.DrawRender();
-    };
+    }
     // ----------------- INTERNAL METHODS ----------------- //
-    default_1.prototype.bindCircleVAO = function () {
+    bindCircleVAO() {
         this.gl.bindVertexArray(this._circleVAO);
-    };
-    default_1.prototype.bindPaddingVAO = function () {
+    }
+    bindPaddingVAO() {
         this.gl.bindVertexArray(this._paddingVAO);
-    };
-    default_1.prototype.free = function () {
+    }
+    free() {
         this.gl.deleteBuffer(this.buffer);
         this.gl.deleteVertexArray(this._circleVAO);
         this.gl.deleteVertexArray(this._paddingVAO);
-    };
+    }
     // ----------------- PRIVATE METHODS ----------------- //
-    default_1.prototype._getBufferData = function () {
-        var _a = this, gl = _a.gl, buffer = _a.buffer;
-        var size = new Float32Array(this._length * RING_SIZE);
-        var bufferData = new Float32Array(size);
+    _getBufferData() {
+        const { gl, buffer } = this;
+        const size = new Float32Array(this._length * RING_SIZE);
+        const bufferData = new Float32Array(size);
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         gl.getBufferSubData(gl.ARRAY_BUFFER, 0, bufferData);
         gl.bindBuffer(gl.ARRAY_BUFFER, null);
         return bufferData;
-    };
-    default_1.prototype._ringKey = function (centerID, ringID) {
-        return "C=".concat(centerID, ",R=").concat(ringID);
-    };
-    default_1.prototype._nextBufferOffset = function () {
+    }
+    _ringKey(centerID, ringID) {
+        return `C=${centerID},R=${ringID}`;
+    }
+    _nextBufferOffset() {
         if (!this.checkCapacity()) {
             throw new Error("Buffer is full");
             return;
         }
-        var offset;
+        let offset;
         if (this._removedRingsOffsetStack.length > 0) {
             offset = this._removedRingsOffsetStack.pop();
         }
@@ -381,41 +311,35 @@ var default_1 = /** @class */ (function () {
         }
         this._ringCounter++;
         return offset;
-    };
-    default_1.prototype._implicitExtendBufferInNeed = function (incomingRingSize) {
-        var overCapacity = incomingRingSize - this.capacityLeft();
+    }
+    _implicitExtendBufferInNeed(incomingRingSize) {
+        const overCapacity = incomingRingSize - this.capacityLeft();
         if (overCapacity <= 0)
             return;
-        var newCapacity = Math.ceil((this._capacity + overCapacity) * this.implicitExtentionRate);
+        const newCapacity = Math.ceil((this._capacity + overCapacity) * this.implicitExtentionRate);
         this.extendBuffer(newCapacity);
-    };
-    default_1.prototype.readRing = function (centerID, ringID) {
-        return __awaiter(this, void 0, void 0, function () {
-            var key, offset, _a, gl, buffer, bufferData;
-            return __generator(this, function (_b) {
-                key = this._ringKey(centerID, ringID);
-                if (!this._ringOffsets.has(key)) {
-                    console.warn("Ring is not registered yet");
-                    return [2 /*return*/];
-                }
-                offset = this._ringOffsets.get(key);
-                _a = this, gl = _a.gl, buffer = _a.buffer;
-                gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-                bufferData = new Float32Array(9);
-                gl.getBufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
-                return [2 /*return*/, {
-                        centerX: bufferData[0],
-                        centerY: bufferData[1],
-                        range: bufferData[2],
-                        padding: bufferData[3],
-                        rgba: [bufferData[4], bufferData[5], bufferData[6], bufferData[7]],
-                        hide: bufferData[8]
-                    }];
-            });
-        });
-    };
-    return default_1;
-}());
+    }
+    async readRing(centerID, ringID) {
+        const key = this._ringKey(centerID, ringID);
+        if (!this._ringOffsets.has(key)) {
+            console.warn("Ring is not registered yet");
+            return;
+        }
+        const offset = this._ringOffsets.get(key);
+        const { gl, buffer } = this;
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        const bufferData = new Float32Array(9);
+        gl.getBufferSubData(gl.ARRAY_BUFFER, offset, bufferData);
+        return {
+            centerX: bufferData[0],
+            centerY: bufferData[1],
+            range: bufferData[2],
+            padding: bufferData[3],
+            rgba: [bufferData[4], bufferData[5], bufferData[6], bufferData[7]],
+            hide: bufferData[8]
+        };
+    }
+}
 exports.default = default_1;
 /**
  * Documentation

package/programs/rings/distancering/index.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaddingFreeAngleCache = exports.CirclePaddySharedBuffer = exports.PaddingProgramCache = exports.circleProgramCache = void 0;
-var circleflatprogram_1 = require("./circleflatprogram");
+const circleflatprogram_1 = require("./circleflatprogram");
 Object.defineProperty(exports, "circleProgramCache", { enumerable: true, get: function () { return circleflatprogram_1.programCache; } });
-var paddyflatprogram_1 = require("./paddyflatprogram");
+const paddyflatprogram_1 = require("./paddyflatprogram");
 Object.defineProperty(exports, "PaddingProgramCache", { enumerable: true, get: function () { return paddyflatprogram_1.PaddingProgramCache; } });
-var circlepaddysharedbuffer_1 = __importDefault(require("./circlepaddysharedbuffer"));
+const circlepaddysharedbuffer_1 = __importDefault(require("./circlepaddysharedbuffer"));
 exports.CirclePaddySharedBuffer = circlepaddysharedbuffer_1.default;
-var circlepaddingfreeangleprogram_1 = require("./circlepaddingfreeangleprogram");
+const circlepaddingfreeangleprogram_1 = require("./circlepaddingfreeangleprogram");
 Object.defineProperty(exports, "PaddingFreeAngleCache", { enumerable: true, get: function () { return circlepaddingfreeangleprogram_1.PaddingFreeAngleCache; } });

package/programs/rings/distancering/paddyflatprogram.js

@@ -34,10 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaddingProgramCache = void 0;
-var util_1 = require("../../../util");
-var camerauniformblock_1 = __importStar(require("../../totems/camerauniformblock"));
-var programcache_1 = require("../../programcache");
-var vertexShader = "#version 300 es " +
+const util_1 = require("../../../util");
+const camerauniformblock_1 = __importStar(require("../../totems/camerauniformblock"));
+const programcache_1 = require("../../programcache");
+const vertexShader = `#version 300 es ` +
     util_1.shaderfunctions.PI +
     util_1.shaderfunctions.R +
     util_1.shaderfunctions.POLE +
@@ -48,11 +48,65 @@ var vertexShader = "#version 300 es " +
     util_1.shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
     util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
     util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistancePadding +
-    util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + "\n\nin vec2 center;\nin float radius;\nin float pad_range;\nin vec4 color;\nin float flag;\n\nuniform int compass;\nuniform float pad_count;\n\nuniform float opacity;\n\n\nout vec2 v_limp;\nout vec4 v_color;\n\n\nvoid main() {   \n\n    float alpha_padding =  z_level * z_level / (pad_range/ 100.0 );\n    if( flag == 2.0 || flag == 1.0 || radius == 0.0 || alpha_padding < 0.1 || z_level < 3.0 ) return; // 1.0 is hide \n    v_color = vec4(color.rgb, color.a * alpha_padding * opacity);\n\n    gl_PointSize = 2.0;\n\n    float odd = mod(float(gl_VertexID), 2.0);\n    float index = (float(gl_VertexID)- odd ) / 2.0;\n    float angle = 3.1415926535897932384626433832795 * 2.0 * (index / pad_count );\n    float radius_ = radius - (pad_range * odd);\n\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 = circleLimpFromLongLatRadCenterMercatorRealDistancePadding(center, radius_, angle);\n        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);\n    }\n    v_limp = limp;\n    gl_Position = mercatorXYToGLPosition(limp);\n}";
-var fragmentShader = "#version 300 es\nprecision highp float; " +
-    util_1.shaderfunctions.POLE + "\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) {
+    util_1.shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
+
+in vec2 center;
+in float radius;
+in float pad_range;
+in vec4 color;
+in float flag;
+
+uniform int compass;
+uniform float pad_count;
+
+uniform float opacity;
+
+
+out vec2 v_limp;
+out vec4 v_color;
+
+
+void main() {   
+
+    float alpha_padding =  z_level * z_level / (pad_range/ 100.0 );
+    if( flag == 2.0 || flag == 1.0 || radius == 0.0 || alpha_padding < 0.1 || z_level < 3.0 ) return; // 1.0 is hide 
+    v_color = vec4(color.rgb, color.a * alpha_padding * opacity);
+
+    gl_PointSize = 2.0;
+
+    float odd = mod(float(gl_VertexID), 2.0);
+    float index = (float(gl_VertexID)- odd ) / 2.0;
+    float angle = 3.1415926535897932384626433832795 * 2.0 * (index / pad_count );
+    float radius_ = radius - (pad_range * odd);
+
+    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 = circleLimpFromLongLatRadCenterMercatorRealDistancePadding(center, radius_, angle);
+        limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius_, angle);
+    }
+    v_limp = limp;
+    gl_Position = mercatorXYToGLPosition(limp);
+}`;
+const fragmentShader = `#version 300 es
+precision highp float; ` +
+    util_1.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);
@@ -64,7 +118,7 @@ var Logic = /** @class */ (function () {
             this.gl.bindAttribLocation(this.program, 4, "flag");
         }
         this.cameraBlockBindingPoint = 0;
-        var cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
+        const cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
         this.gl.uniformBlockBinding(this.program, cameraBlockIndex, this.cameraBlockBindingPoint);
         this.cameraBlockTotem = programcache_1.globeProgramCache.getProgram(globe, camerauniformblock_1.default);
         this._padCountLocation = this.gl.getUniformLocation(this.program, "pad_count");
@@ -74,7 +128,7 @@ var Logic = /** @class */ (function () {
         this._opacity = 1.0;
         this._padCount = 360;
         {
-            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._opacityLocation, 1.0);
@@ -82,8 +136,8 @@ var Logic = /** @class */ (function () {
             this.gl.useProgram(currentProgram);
         }
     }
-    Logic.prototype.draw = function (attrBufferManager, padCount, compass, opacity) {
-        var _a = this, gl = _a.gl, program = _a.program, _padCountLocation = _a._padCountLocation, cameraBlockBindingPoint = _a.cameraBlockBindingPoint, cameraBlockTotem = _a.cameraBlockTotem, _compassLocation = _a._compassLocation;
+    draw(attrBufferManager, padCount, compass, opacity) {
+        const { gl, program, _padCountLocation, cameraBlockBindingPoint, cameraBlockTotem, _compassLocation } = this;
         gl.useProgram(program);
         attrBufferManager.bindPaddingVAO();
         cameraBlockTotem.bind(cameraBlockBindingPoint);
@@ -106,14 +160,13 @@ var Logic = /** @class */ (function () {
         gl.drawArraysInstanced(gl.LINES, 0, padCount * 2, 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.PaddingProgramCache = Object.freeze({
-    getProgram: function (globe) { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    releaseProgram: function (globe) { programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+    getProgram: (globe) => { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    releaseProgram: (globe) => { programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });