@pirireis/webglobeplugins 0.9.6 → 0.9.8

package/{programs → dist/programs}/line-on-globe/angled-line.js

@@ -1,31 +1,23 @@
-// angle radius, rgba, dashRatio, rgbaMode
-
-
-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;
-
+"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");
+const EDGE_COUNT_ON_SPHERE = 50;
 const vertexShaderSource = `#version 300 es
 precision highp float;
 
-${CameraUniformBlockString}
-${longLatRadToMercator}
-${longLatRadToCartesian3D}
-${cartesian3DToGLPosition}
-${mercatorXYToGLPosition}
-${circleLimpFromLongLatRadCenterCartesian3D}
-${circleLimpFromLongLatRadCenterMercatorCompass}
-${circleLimpFromLongLatRadCenterMercatorRealDistance}
+${totems_1.CameraUniformBlockString}
+${geometrytransformations_1.longLatRadToMercator}
+${geometrytransformations_1.longLatRadToCartesian3D}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.mercatorXYToGLPosition}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterCartesian3D}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorCompass}
+${geometrytransformations_1.circleLimpFromLongLatRadCenterMercatorRealDistance}
 
 in vec2 center_point;
 in float angle;
@@ -57,12 +49,9 @@ void main() {
     v_dash_opacity = dash_opacity;
     v_color = rgba;
     v_dash_ratio = dash_ratio;
-}`;
-
-
-
+}`;
 const fragmentShaderSource = `#version 300 es
-${POLE}
+${geometrytransformations_1.POLE}
 precision highp float;
 
 uniform float opacity;
@@ -79,128 +68,109 @@ void main() {
     if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5 ) {
         color.a *= v_dash_opacity;
     }   
-}`;
-
-
-class Logic {
-
-    constructor(globe) {
-
-        this.globe = globe;
-        this.gl = globe.gl;
-        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
-        this._lastOpacity = 1;
-
-        const { gl, program } = this;
-        { // assign attribute locations
-            gl.bindAttribLocation(program, 0, "center_point");
-            gl.bindAttribLocation(program, 1, "angle");
-            gl.bindAttribLocation(program, 2, "radius");
-            gl.bindAttribLocation(program, 3, "rgba");
-            gl.bindAttribLocation(program, 4, "dash_ratio");
-            gl.bindAttribLocation(program, 5, "dash_opacity");
-        }
-
-        {
-            this._opacityLocation = gl.getUniformLocation(program, "opacity");
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this._opacityLocation, this._lastOpacity);
-            gl.useProgram(currentProgram);
-        }
-
-        this.cameraBlockBindingPoint = 0;
-        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-
-    }
-
-
-    draw(vao, length, opacity) {
-        const { gl, program, globe, cameraBlockTotem, cameraBlockBindingPoint } = this;
-        gl.useProgram(program);
-        if (opacity !== this._lastOpacity) {
-            gl.uniform1f(this._opacityLocation, opacity);
-            this._lastOpacity = opacity;
-        }
-        const drawCount = globe.api_GetCurrentGeometry() === 0 ? EDGE_COUNT_ON_SPHERE : 2;
-        gl.bindVertexArray(vao);
-        cameraBlockTotem.bind(cameraBlockBindingPoint)
-        // gl.disable(gl.DEPTH_TEST);
-        gl.drawArraysInstanced(gl.LINE_STRIP, 0, drawCount, length);
-        gl.bindVertexArray(null);
-        cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        // gl.enable(gl.DEPTH_TEST);
-    }
-
-
-    createVAO(centerCoords, angle, radius, rgba, dashRatio, dashOpacity) {
-
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-        {
-            const { buffer, stride = 0, offset = 0 } = centerCoords;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(0, 1);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = angle;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(1);
-            gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(1, 1);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = radius;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(2);
-            gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(2, 1);
-        }
-
-        {
-            const { buffer, stride = 0, offset = 0 } = rgba;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(3);
-            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(3, 1);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashRatio;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(4);
-            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(4, 1);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashOpacity;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(5);
-            gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(5, 1);
-        }
-        gl.bindVertexArray(null);
-        return vao;
-    }
-
-
-    free() {
-        if (this.isFreed) return;
-        CameraUniformBlockTotemCache.release(this.globe);
-        this.cameraBlockTotem = null;
-        this.gl.deleteProgram(this.program);
-        this.isFreed = true;
-    }
-
-
-}
-
-
-export const AngledLineProgramCache = Object.freeze({
-    get: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
-    release: (globe) => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
-});
+}`;
+class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this.program = (0, util_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        this._lastOpacity = 1;
+        const { gl, program } = this;
+        { // assign attribute locations
+            gl.bindAttribLocation(program, 0, "center_point");
+            gl.bindAttribLocation(program, 1, "angle");
+            gl.bindAttribLocation(program, 2, "radius");
+            gl.bindAttribLocation(program, 3, "rgba");
+            gl.bindAttribLocation(program, 4, "dash_ratio");
+            gl.bindAttribLocation(program, 5, "dash_opacity");
+        }
+        {
+            this._opacityLocation = gl.getUniformLocation(program, "opacity");
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1f(this._opacityLocation, this._lastOpacity);
+            gl.useProgram(currentProgram);
+        }
+        this.cameraBlockBindingPoint = 0;
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        this.cameraBlockTotem = totems_1.CameraUniformBlockTotemCache.get(globe);
+        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
+    }
+    draw(vao, length, opacity) {
+        const { gl, program, globe, cameraBlockTotem, cameraBlockBindingPoint } = this;
+        gl.useProgram(program);
+        if (opacity !== this._lastOpacity) {
+            gl.uniform1f(this._opacityLocation, opacity);
+            this._lastOpacity = opacity;
+        }
+        const drawCount = globe.api_GetCurrentGeometry() === 0 ? EDGE_COUNT_ON_SPHERE : 2;
+        gl.bindVertexArray(vao);
+        cameraBlockTotem.bind(cameraBlockBindingPoint);
+        // gl.disable(gl.DEPTH_TEST);
+        gl.drawArraysInstanced(gl.LINE_STRIP, 0, drawCount, length);
+        gl.bindVertexArray(null);
+        cameraBlockTotem.unbind(cameraBlockBindingPoint);
+        // gl.enable(gl.DEPTH_TEST);
+    }
+    createVAO(centerCoords, angle, radius, rgba, dashRatio, dashOpacity) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        {
+            const { buffer, stride = 0, offset = 0 } = centerCoords;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(0);
+            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(0, 1);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = angle;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(1);
+            gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(1, 1);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = radius;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(2);
+            gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(2, 1);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = rgba;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(3);
+            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(3, 1);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = dashRatio;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(4);
+            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(4, 1);
+        }
+        {
+            const { buffer, stride = 0, offset = 0 } = dashOpacity;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(5);
+            gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(5, 1);
+        }
+        gl.bindVertexArray(null);
+        return vao;
+    }
+    free() {
+        if (this.isFreed)
+            return;
+        totems_1.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); }
+});

package/{programs → dist/programs}/line-on-globe/circle-accurate-3d.js

@@ -1,33 +1,28 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
-import { noRegisterGlobeProgramCache } from "../programcache";
-// import { vaoAttributeLoader } from "../../util/account/util";
-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
- * 2. integrate attributes
- * 
- * TODO:
- * center_position is too small or doenst loaded as expected.
- */
-const EDGE_COUNT_ON_SPHERE = 360;
-//${circleLimpFromLongLatRadCenterCartesian3D_accurate}
+"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 { vaoAttributeLoader } from "../../util/account/util";
+const attribute_loader_1 = require("../../util/gl-util/buffer/attribute-loader");
+const geometrytransformations_1 = require("../../util/shaderfunctions/geometrytransformations");
+/**
+ * TODO:
+ * 1. integrate geometry functions for radius angle and center
+ * 2. integrate attributes
+ *
+ * TODO:
+ * center_position is too small or doenst loaded as expected.
+ */
+const EDGE_COUNT_ON_SPHERE = 360;
+//${circleLimpFromLongLatRadCenterCartesian3D_accurate}
 const vertexShaderSource = `#version 300 es
 precision highp float;
-${PI}
-${CameraUniformBlockString}
-${cartesian3DToGLPosition}
-${circleOnSphere}
+${geometrytransformations_1.PI}
+${camerauniformblock_1.CameraUniformBlockString}
+${geometrytransformations_1.cartesian3DToGLPosition}
+${geometrytransformations_1.circleOnSphere}
 
 uniform float edge_count;
 
@@ -55,10 +50,9 @@ void main() {
     v_dash_opacity = dash_opacity;
     v_color = color;
     gl_PointSize = 3.0;
-}`
-
+}`;
 const fragmentShaderSource = `#version 300 es
-${POLE}
+${geometrytransformations_1.POLE}
 precision highp float;
 uniform float opacity;
 in vec4 v_color;
@@ -75,93 +69,73 @@ void main() {
         color.a *= v_dash_opacity;
     }   
 }
-`;
-
-
-
-class Logic {
-
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this._lastOpacity = 1.0;
-
-        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
-
-        const { gl, program } = this;
-        this.program.uniforms = {
-            opacity: gl.getUniformLocation(program, "opacity")
-        };
-
-        { // initial uniform values
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(program.uniforms.opacity, 1.0);
-            gl.useProgram(currentProgram);
-        }
-
-        {   // assign attribute locations
-            gl.bindAttribLocation(program, 0, "center_position3d");
-            gl.bindAttribLocation(program, 1, "target_position3d");
-            gl.bindAttribLocation(program, 2, "color");
-            gl.bindAttribLocation(program, 3, "dash_ratio");
-            gl.bindAttribLocation(program, 4, "dash_opacity");
-        }
-
-        this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
-    }
-
-    createVAO(center3dObj, target3dObj, colorObj, dashRatioObj, dashOpacityObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        const divisor = 1;
-
-        gl.bindVertexArray(vao);
-
-        attributeLoader(gl, center3dObj, 0, 3, { divisor });
-        attributeLoader(gl, target3dObj, 1, 3, { divisor });
-        // attributeLoader(gl, radiusObj, 1, 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;
-    }
-
-    draw(vao, length, opacity) {
-        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
-        gl.useProgram(program);
-
-        if (this._lastOpacity !== opacity) {
-            gl.uniform1f(program.uniforms.opacity, opacity);
-            this._lastOpacity = opacity;
-        }
-        gl.bindVertexArray(vao);
-        cameraBlockTotem.bind(cameraBindingPoint);
-        gl.drawArraysInstanced(gl.LINE_STRIP, 0, EDGE_COUNT_ON_SPHERE + 1, length);
-        // gl.drawArraysInstanced(gl.POINTS, 0, EDGE_COUNT_ON_SPHERE + 1, length);
-        cameraBlockTotem.unbind(cameraBindingPoint);
-        gl.bindVertexArray(null);
-    }
-
-
-
-    free() {
-        if (this.isFreed) return;
-        CameraUniformBlockTotemCache.release(this.globe);
-        this.gl.deleteProgram(this.program);
-        this.isFreed = true;
-    }
-}
-
-
-
-export const CircleCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
-});
+`;
+class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._lastOpacity = 1.0;
+        this.program = (0, webglobjectbuilders_1.createProgram)(this.gl, vertexShaderSource, fragmentShaderSource);
+        const { gl, program } = this;
+        this.program.uniforms = {
+            opacity: gl.getUniformLocation(program, "opacity")
+        };
+        { // initial uniform values
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1f(program.uniforms.opacity, 1.0);
+            gl.useProgram(currentProgram);
+        }
+        { // assign attribute locations
+            gl.bindAttribLocation(program, 0, "center_position3d");
+            gl.bindAttribLocation(program, 1, "target_position3d");
+            gl.bindAttribLocation(program, 2, "color");
+            gl.bindAttribLocation(program, 3, "dash_ratio");
+            gl.bindAttribLocation(program, 4, "dash_opacity");
+        }
+        this.cameraBindingPoint = 0;
+        this.cameraBlockTotem = camerauniformblock_1.CameraUniformBlockTotemCache.get(globe);
+        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
+    }
+    createVAO(center3dObj, target3dObj, colorObj, dashRatioObj, dashOpacityObj) {
+        const { gl } = this;
+        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, 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 });
+        gl.bindVertexArray(null);
+        gl.bindVertexArray(null);
+        return vao;
+    }
+    draw(vao, length, opacity) {
+        const { gl, program, cameraBlockTotem, cameraBindingPoint } = this;
+        gl.useProgram(program);
+        if (this._lastOpacity !== opacity) {
+            gl.uniform1f(program.uniforms.opacity, opacity);
+            this._lastOpacity = opacity;
+        }
+        gl.bindVertexArray(vao);
+        cameraBlockTotem.bind(cameraBindingPoint);
+        gl.drawArraysInstanced(gl.LINE_STRIP, 0, EDGE_COUNT_ON_SPHERE + 1, length);
+        // gl.drawArraysInstanced(gl.POINTS, 0, EDGE_COUNT_ON_SPHERE + 1, length);
+        cameraBlockTotem.unbind(cameraBindingPoint);
+        gl.bindVertexArray(null);
+    }
+    free() {
+        if (this.isFreed)
+            return;
+        camerauniformblock_1.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)
+});