@pirireis/webglobeplugins 0.9.12 → 0.9.14

package/programs/float2legendwithratio/object.js

@@ -1,15 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logic_1 = __importDefault(require("./logic"));
-const programcache_1 = require("../programcache");
+import Float2LegentWithRatioProgram from './logic';
+import { glProgramCache } from '../programcache';
 // Uniform Buffer Objects use this 
-class DataObject {
+export default class DataObject {
     constructor(gl, { width = 1, height = 1, texture0 = null, texture1 = null, colorRampTexture = null, colorRampRange = null, escapeValue = 99999, blendRatio = 0.0, minMaxEdges = null, } = {}) {
         this.gl = gl;
-        this.programlogic = programcache_1.glProgramCache.getProgram(gl, logic_1.default);
+        this.programlogic = glProgramCache.getProgram(gl, Float2LegentWithRatioProgram);
         this.heatParametersBlockManager = this.programlogic.getUniformBlockManager();
         this.width = width;
         this.height = height;
@@ -103,8 +98,7 @@ class DataObject {
         gl.deleteTexture(texture0);
         gl.deleteTexture(texture1);
         gl.deleteTexture(colorRampTexture);
-        programcache_1.glProgramCache.releaseProgram(this.gl, logic_1.default);
+        glProgramCache.releaseProgram(this.gl, Float2LegentWithRatioProgram);
         this.heatParametersBlockManager.free();
     }
 }
-exports.default = DataObject;

package/programs/globe-util/is-globe-moved.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const programcache_1 = require("../programcache");
+import { noRegisterGlobeProgramCache } from "../programcache";
 class IsGlobeMoved {
     constructor(globe) {
         this.globe = globe;
@@ -16,6 +14,6 @@ class IsGlobeMoved {
     }
 }
 const IsGlobeMovedCache = Object.freeze({
-    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, IsGlobeMoved),
-    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, IsGlobeMoved)
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, IsGlobeMoved),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, IsGlobeMoved)
 });

package/programs/globeshell/index.js

@@ -1,8 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobeShellWiggle = void 0;
-const wiggle_1 = __importDefault(require("./globeshell/wiggle"));
-exports.GlobeShellWiggle = wiggle_1.default;
+import GlobeShellWiggle from "./globeshell/wiggle";
+export { GlobeShellWiggle };

package/programs/globeshell/wiggle/index.js

@@ -1,8 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobeShellWiggle = void 0;
-const object_1 = __importDefault(require("./object"));
-exports.GlobeShellWiggle = object_1.default;
+import GlobeShellWiggle from './object';
+export { GlobeShellWiggle };

package/programs/globeshell/wiggle/logic.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../../../util");
-class Logic {
+import { createProgram } from '../../../util';
+export default class Logic {
     constructor() {
         this.id = "GlobeShellProgram";
         this.description = "This program implements flyweight pattern for globe." +
@@ -121,7 +119,7 @@ class Logic {
            outColor.a *= v_opacity;
         }`;
         const gl = this.gl;
-        const program = (0, util_1.createProgram)(gl, vertexShader, fragmentShader);
+        const program = createProgram(gl, vertexShader, fragmentShader);
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(program);
         this.shellBlockBindingPoint = 0;
@@ -288,7 +286,6 @@ class Logic {
         return { _vao };
     }
 }
-exports.default = Logic;
 class ShellBlockManager {
     constructor(gl) {
         this.gl = gl;

package/programs/globeshell/wiggle/object.js

@@ -1,17 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const programcache_1 = require("../../programcache");
-const logic_1 = __importDefault(require("./logic"));
-class GlobeShell {
+import { globeProgramCache } from '../../programcache';
+import GlobeShellProgram from './logic';
+export default class GlobeShell {
     constructor(gl, globe, { minLon = -180, maxLon = 180, minLat = -90, maxLat = 90, height = 0, u_opacity = 1, wiggleInKM = 0, wiggleSpeed = 0,
     // eastWestTied, Not implemented yet
      } = {}) {
         this.gl = gl;
         this.globe = globe;
-        this.program = programcache_1.globeProgramCache.getProgram(globe, logic_1.default);
+        this.program = globeProgramCache.getProgram(globe, GlobeShellProgram);
         this.shellBlockManager = this.program.getShellBlockBufferManager();
         this.update = this.shellBlockManager.update.bind(this.shellBlockManager);
         this.innerTime = 0;
@@ -65,8 +60,7 @@ class GlobeShell {
         }
     }
     free() {
-        programcache_1.globeProgramCache.releaseProgram(this.globe, logic_1.default);
+        globeProgramCache.releaseProgram(this.globe, GlobeShellProgram);
         this.shellBlockManager.free();
     }
 }
-exports.default = GlobeShell;

package/programs/helpers/blender/program.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../util");
+import { createProgram } from "../util";
 /**
  * Blends two float32textures with given ratio.
  */
@@ -24,14 +22,14 @@ void main() {
     outColor = mix(color0, color1, u_ratio);
 }
 `;
-class BlenderProgram {
+export default class BlenderProgram {
     constructor(gl) {
         this.gl = gl;
         this.programWrapper = this._createProgramWrapper();
     }
     _craeteProgramWrapper() {
         const gl = this.gl;
-        const program = (0, util_1.createProgram)(gl, vertexShader, fragmentShader);
+        const program = createProgram(gl, vertexShader, fragmentShader);
         this.vao = gl.createVertexArray();
         gl.bindVertexArray(this.vao);
         this._buffer = gl.createBuffer();
@@ -76,4 +74,3 @@ class BlenderProgram {
         return texture;
     }
 }
-exports.default = BlenderProgram;

package/programs/helpers/fadeaway/index.js

@@ -1,7 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const object_1 = __importDefault(require("./object"));
-exports.default = object_1.default;
+import FadeAway from './object';
+export default FadeAway;

package/programs/helpers/fadeaway/logic.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../../../util");
+import { createProgram } from "../../../util";
 const vertexShaderSource = `#version 300 es
 precision highp float; 
 in vec2 a_position;
@@ -26,10 +24,10 @@ void main() {
     outColor = vec4(color.rgb, color.a * opacity);
 }
 `;
-class FadeAwayProgram {
+export default class FadeAwayProgram {
     constructor(gl) {
         this.gl = gl;
-        this.program = (0, util_1.createProgram)(gl, vertexShaderSource, fragmentShaderSource);
+        this.program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
         this.vao = gl.createVertexArray();
         gl.bindVertexArray(this.vao);
         this._buffer = gl.createBuffer();
@@ -69,4 +67,3 @@ class FadeAwayProgram {
         gl.deleteBuffer(_buffer);
     }
 }
-exports.default = FadeAwayProgram;

package/programs/helpers/fadeaway/object.js

@@ -1,20 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const programcache_1 = require("../../programcache");
-const logic_1 = __importDefault(require("./logic"));
-class FadeAway {
+import { glProgramCache } from "../../programcache";
+import FadeAwayProgram from "./logic";
+export default class FadeAway {
     constructor(gl) {
         this.gl = gl;
-        this.program = programcache_1.glProgramCache.getProgram(gl, logic_1.default);
+        this.program = glProgramCache.getProgram(gl, FadeAwayProgram);
     }
     draw(sourceTexture, opacity) {
         this.program.draw(sourceTexture, opacity);
     }
     free() {
-        programcache_1.glProgramCache.releaseProgram(logic_1.default);
+        glProgramCache.releaseProgram(FadeAwayProgram);
     }
 }
-exports.default = FadeAway;

package/programs/helpers/index.js

@@ -1,8 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FadeAway = void 0;
-const fadeaway_1 = __importDefault(require("./fadeaway"));
-exports.FadeAway = fadeaway_1.default;
+import FadeAway from './fadeaway';
+export { FadeAway };

package/programs/index.js

@@ -1,58 +1,9 @@
-"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;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rings = exports.FadeAway = exports.vectorfield = exports.noRegisterGlobeProgramCache = exports.globeProgramCache = exports.glProgramCache = exports.CameraUniformBlockString = exports.CameraUniformBlockTotem = exports.ArrowField = exports.GlobeShellWiggle = exports.Float2LegendWithRatio = void 0;
-const float2legendwithratio_1 = require("./float2legendwithratio");
-Object.defineProperty(exports, "Float2LegendWithRatio", { enumerable: true, get: function () { return float2legendwithratio_1.Float2LegendWithRatio; } });
-const wiggle_1 = require("./globeshell/wiggle");
-Object.defineProperty(exports, "GlobeShellWiggle", { enumerable: true, get: function () { return wiggle_1.GlobeShellWiggle; } });
-const index_1 = require("./totems/index");
-Object.defineProperty(exports, "CameraUniformBlockTotem", { enumerable: true, get: function () { return index_1.CameraUniformBlockTotem; } });
-Object.defineProperty(exports, "CameraUniformBlockString", { enumerable: true, get: function () { return index_1.CameraUniformBlockString; } });
-const arrowfield_1 = __importDefault(require("./arrowfield"));
-exports.ArrowField = arrowfield_1.default;
-const programcache_1 = require("./programcache");
-Object.defineProperty(exports, "glProgramCache", { enumerable: true, get: function () { return programcache_1.glProgramCache; } });
-Object.defineProperty(exports, "globeProgramCache", { enumerable: true, get: function () { return programcache_1.globeProgramCache; } });
-Object.defineProperty(exports, "noRegisterGlobeProgramCache", { enumerable: true, get: function () { return programcache_1.noRegisterGlobeProgramCache; } });
-const vectorfield = __importStar(require("./vectorfields"));
-exports.vectorfield = vectorfield;
-const helpers_1 = require("./helpers");
-Object.defineProperty(exports, "FadeAway", { enumerable: true, get: function () { return helpers_1.FadeAway; } });
-const rings = __importStar(require("./rings"));
-exports.rings = rings;
+import { Float2LegendWithRatio } from "./float2legendwithratio";
+import { GlobeShellWiggle } from "./globeshell/wiggle";
+import { CameraUniformBlockTotem, CameraUniformBlockString } from "./totems/index";
+import ArrowField from "./arrowfield";
+import { glProgramCache, globeProgramCache, noRegisterGlobeProgramCache } from "./programcache";
+import * as vectorfield from "./vectorfields";
+import { FadeAway } from "./helpers";
+import * as rings from "./rings";
+export { Float2LegendWithRatio, GlobeShellWiggle, ArrowField, CameraUniformBlockTotem, CameraUniformBlockString, glProgramCache, globeProgramCache, noRegisterGlobeProgramCache, vectorfield, FadeAway, rings };

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

@@ -1,23 +1,20 @@
-"use strict";
 // angle radius, rgba, dashRatio, rgbaMode
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AngledLineProgramCache = void 0;
-const util_1 = require("../../util");
-const totems_1 = require("../totems");
-const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
-const programcache_1 = require("../programcache");
+import { createProgram } from "../../util";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { longLatRadToMercator, longLatRadToCartesian3D, cartesian3DToGLPosition, mercatorXYToGLPosition, circleLimpFromLongLatRadCenterCartesian3D, circleLimpFromLongLatRadCenterMercatorCompass, circleLimpFromLongLatRadCenterMercatorRealDistance, POLE } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
 const EDGE_COUNT_ON_SPHERE = 50;
 const vertexShaderSource = `#version 300 es
 precision highp float;
 
-${totems_1.CameraUniformBlockString}
-${geometrytransformations_1.longLatRadToMercator}
-${geometrytransformations_1.longLatRadToCartesian3D}
-${geometrytransformations_1.cartesian3DToGLPosition}
-${geometrytransformations_1.mercatorXYToGLPosition}
-${geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D}
-${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass}
-${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorRealDistance}
+${CameraUniformBlockString}
+${longLatRadToMercator}
+${longLatRadToCartesian3D}
+${cartesian3DToGLPosition}
+${mercatorXYToGLPosition}
+${circleLimpFromLongLatRadCenterCartesian3D}
+${circleLimpFromLongLatRadCenterMercatorCompass}
+${circleLimpFromLongLatRadCenterMercatorRealDistance}
 
 in vec2 center_point;
 in float angle;
@@ -51,7 +48,7 @@ void main() {
     v_dash_ratio = dash_ratio;
 }`;
 const fragmentShaderSource = `#version 300 es
-${geometrytransformations_1.POLE}
+${POLE}
 precision highp float;
 
 uniform float opacity;
@@ -73,7 +70,7 @@ class Logic {
     constructor(globe) {
         this.globe = globe;
         this.gl = globe.gl;
-        this.program = (0, util_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
         this._lastOpacity = 1;
         const { gl, program } = this;
         { // assign attribute locations
@@ -93,7 +90,7 @@ class Logic {
         }
         this.cameraBlockBindingPoint = 0;
         const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        this.cameraBlockTotem = totems_1.CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
         gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
     }
     draw(vao, length, opacity) {
@@ -164,13 +161,13 @@ class Logic {
     free() {
         if (this.isFreed)
             return;
-        totems_1.CameraUniformBlockTotemCache.release(this.globe);
+        CameraUniformBlockTotemCache.release(this.globe);
         this.cameraBlockTotem = null;
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
     }
 }
-exports.AngledLineProgramCache = Object.freeze({
-    get: (globe) => { return programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic); },
-    release: (globe) => { return programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
+export const AngledLineProgramCache = Object.freeze({
+    get: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic); },
+    release: (globe) => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
 });

package/programs/line-on-globe/circle-accurate-3d.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CircleCache = void 0;
-const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-const camerauniformblock_1 = require("../totems/camerauniformblock");
-const programcache_1 = require("../programcache");
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
+import { noRegisterGlobeProgramCache } from "../programcache";
 // import { vaoAttributeLoader } from "../../util/account/util";
-const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
-const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { cartesian3DToGLPosition, circleLimpFromLongLatRadCenterCartesian3D_accurate, circleOnSphere, POLE, PI } from "../../util/shaderfunctions/geometrytransformations";
 /**
  * TODO:
  * 1. integrate geometry functions for radius angle and center
@@ -19,10 +16,10 @@ const EDGE_COUNT_ON_SPHERE = 360;
 //${circleLimpFromLongLatRadCenterCartesian3D_accurate}
 const vertexShaderSource = `#version 300 es
 precision highp float;
-${geometrytransformations_1.PI}
-${camerauniformblock_1.CameraUniformBlockString}
-${geometrytransformations_1.cartesian3DToGLPosition}
-${geometrytransformations_1.circleOnSphere}
+${PI}
+${CameraUniformBlockString}
+${cartesian3DToGLPosition}
+${circleOnSphere}
 
 uniform float edge_count;
 
@@ -52,7 +49,7 @@ void main() {
     gl_PointSize = 3.0;
 }`;
 const fragmentShaderSource = `#version 300 es
-${geometrytransformations_1.POLE}
+${POLE}
 precision highp float;
 uniform float opacity;
 in vec4 v_color;
@@ -75,7 +72,7 @@ class Logic {
         this.globe = globe;
         this.gl = globe.gl;
         this._lastOpacity = 1.0;
-        this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
         const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity")
@@ -94,7 +91,7 @@ class Logic {
             gl.bindAttribLocation(program, 4, "dash_opacity");
         }
         this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
         const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
@@ -103,12 +100,12 @@ class Logic {
         const vao = gl.createVertexArray();
         const divisor = 1;
         gl.bindVertexArray(vao);
-        (0, attribute_loader_1.attributeLoader)(gl, center3dObj, 0, 3, { divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, target3dObj, 1, 3, { divisor });
+        attributeLoader(gl, center3dObj, 0, 3, { divisor });
+        attributeLoader(gl, target3dObj, 1, 3, { divisor });
         // attributeLoader(gl, radiusObj, 1, 1, { divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, colorObj, 2, 4, { divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, dashRatioObj, 3, 1, { divisor });
-        (0, attribute_loader_1.attributeLoader)(gl, dashOpacityObj, 4, 1, { divisor });
+        attributeLoader(gl, colorObj, 2, 4, { divisor });
+        attributeLoader(gl, dashRatioObj, 3, 1, { divisor });
+        attributeLoader(gl, dashOpacityObj, 4, 1, { divisor });
         gl.bindVertexArray(null);
         gl.bindVertexArray(null);
         return vao;
@@ -130,12 +127,12 @@ class Logic {
     free() {
         if (this.isFreed)
             return;
-        camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
+        CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
     }
 }
-exports.CircleCache = Object.freeze({
-    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+export const CircleCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });

package/programs/line-on-globe/circle-accurate-flat.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EDGE_COUNT = exports.CircleCache = void 0;
-exports.centerCoords2dflatDataCreator = centerCoords2dflatDataCreator;
-exports.centerCoords2dflatDataCreatorWithRadius = centerCoords2dflatDataCreatorWithRadius;
-const webglobjectbuilders_1 = require("../../util/webglobjectbuilders");
-const camerauniformblock_1 = require("../totems/camerauniformblock");
-const programcache_1 = require("../programcache");
-const util_1 = require("../../util/account/util");
-const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { vaoAttributeLoader } from "../../util/account/util";
+import { mercatorXYToGLPosition, POLE } from "../../util/shaderfunctions/geometrytransformations";
 const Pole = 20037508.34;
 /**
 * Warning:
@@ -17,15 +12,14 @@ const Pole = 20037508.34;
  * Plus 1 for returning to the start point. 1 for cutting the circle into pieces.
  */
 const EDGE_COUNT = 62;
-exports.EDGE_COUNT = EDGE_COUNT;
 const ESCAPE_VALUE = 200000000;
 const vertexShaderSource = `#version 300 es
 precision highp float;
 
 # define escape_value ${ESCAPE_VALUE}.0
 
-${camerauniformblock_1.CameraUniformBlockString}
-${geometrytransformations_1.mercatorXYToGLPosition}
+${CameraUniformBlockString}
+${mercatorXYToGLPosition}
 
 uniform int edge_count;
 
@@ -60,7 +54,7 @@ void main() {
 
 }`;
 const fragmentShaderSource = `#version 300 es
-${geometrytransformations_1.POLE}
+${POLE}
 precision highp float;
 uniform float opacity;
 in vec4 v_color;
@@ -89,7 +83,7 @@ class Logic {
         this._lastOpacity = 1.0;
         this._lastMercatorMode = 0;
         this._lastEdgeCount = EDGE_COUNT;
-        this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
         const { gl, program } = this;
         this.program.uniforms = {
             opacity: gl.getUniformLocation(program, "opacity"),
@@ -109,7 +103,7 @@ class Logic {
         gl.bindAttribLocation(program, 2, "dash_ratio");
         gl.bindAttribLocation(program, 3, "dash_opacity");
         this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
         const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
     }
@@ -119,19 +113,19 @@ class Logic {
         gl.bindVertexArray(vao);
         { // make this a function end import from account module. 
             const { buffer, stride = 0, offset = 0 } = centerObj;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 0, 2, stride, offset, null);
+            vaoAttributeLoader(gl, buffer, 0, 2, stride, offset, null);
         }
         {
             const { buffer, stride = 0, offset = 0 } = colorObj;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 1, 4, stride, offset, null);
+            vaoAttributeLoader(gl, buffer, 1, 4, stride, offset, null);
         }
         {
             const { buffer, stride = 0, offset = 0 } = dashRatioObj;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 2, 1, stride, offset, null);
+            vaoAttributeLoader(gl, buffer, 2, 1, stride, offset, null);
         }
         {
             const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
-            (0, util_1.vaoAttributeLoader)(gl, buffer, 3, 1, stride, offset, null);
+            vaoAttributeLoader(gl, buffer, 3, 1, stride, offset, null);
         }
         gl.bindVertexArray(null);
         gl.bindVertexArray(null);
@@ -158,16 +152,15 @@ class Logic {
     free() {
         if (this.isFreed)
             return;
-        camerauniformblock_1.CameraUniformBlockTotemCache.release(this.globe);
+        CameraUniformBlockTotemCache.release(this.globe);
         this.gl.deleteProgram(this.program);
         this.isFreed = true;
     }
 }
 const CircleCache = Object.freeze({
-    get: (globe) => programcache_1.noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => programcache_1.noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
 });
-exports.CircleCache = CircleCache;
 function centerCoords2dflatDataCreator(globe, centerLong, centerLat, targetLong, targetLat, { startAngleOfCircle = null, edgeCount = EDGE_COUNT, radiusOffset = 0 } = {}) {
     const centerCoords2dflat = new Float32Array(edgeCount * 2);
     const radius2d = globe.Math.GetDist2D(centerLong, centerLat, targetLong, targetLat) + radiusOffset;
@@ -214,3 +207,4 @@ function centerCoords2dflatDataCreatorWithRadius(globe, centerLong, centerLat, r
 function manhattanDistance(x1, y1, x2, y2) {
     return Math.max(Math.abs(x1 - x2), Math.abs(y1 - y2));
 }
+export { CircleCache, EDGE_COUNT, centerCoords2dflatDataCreator, centerCoords2dflatDataCreatorWithRadius };