@pirireis/webglobeplugins 0.16.0 → 0.16.2

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

@@ -1,9 +1,7 @@
-import { createProgram } from "../../util";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
-import { noRegisterGlobeProgramCache } from "../programcache";
-
-
+import { createProgram } from "../../util";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
 const vs = `#version 300 es
 ${CameraUniformBlockString}
 ${mercatorXYToGLPosition}
@@ -40,8 +38,7 @@ void main() {
     }
     v_rgba = rgba;
     vVertexID = gl_VertexID;
-}`;
-
+}`;
 const fs = `#version 300 es
 precision highp float;
 
@@ -57,133 +54,118 @@ void main() {
     vertexID = vVertexID; 
     fragColor = v_rgba;
     fragColor.a *= opacity;
-}`;
-
-
-class PointOnGlobeProgram {
-
-    constructor(globe) {
-
-        this.globe = globe;
-        this.gl = globe.gl;
-
-        this.program = createProgram(this.gl, vs, fs);
-
-        const { gl, program } = this;
-
-
-        this.uniforms = {
-            opacity: gl.getUniformLocation(program, "opacity"),
-            hovered_vertexID: gl.getUniformLocation(program, "hovered_vertexID"),
-            hoveredPointSize: gl.getUniformLocation(program, "hoveredPointSize"),
-            pointSize: gl.getUniformLocation(program, "pointSize"),
-        }
-
-        // eslint-disable-next-line
-        { // assign opacity
-            this._lastOpacity = 1.0;
-            this._lastPointSize = 2.0;
-            this._lastHoveredPointSize = 4.0;
-            this._lastHoveredID = -1;
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this.uniforms.opacity, this._lastOpacity);
-            gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
-            gl.uniform1f(this.uniforms.hoveredPointSize, this._lastHoveredPointSize);
-            gl.uniform1i(this.uniforms.hovered_vertexID, this._lastHoveredID);
-            gl.useProgram(currentProgram);
-        }
-        // eslint-disable-next-line
-        { // assign attribute locations
-            gl.bindAttribLocation(program, 0, "pos3D");
-            gl.bindAttribLocation(program, 1, "pos2D");
-            gl.bindAttribLocation(program, 2, "rgba");
-        }
-        // eslint-disable-next-line
-        { // arrange camera uniform block
-            this.cameraBlockBingingPoint = 0;
-            this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
-        }
-    }
-
-
-    createVAO(pos3DBuffer, pos2DBuffer, rgbaBuffer) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-        // eslint-disable-next-line
-        {
-            gl.bindBuffer(gl.ARRAY_BUFFER, pos3DBuffer);
-            gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 3, gl.FLOAT, false, 0, 0);
-        }
-        // eslint-disable-next-line
-        {
-            gl.bindBuffer(gl.ARRAY_BUFFER, pos2DBuffer);
-            gl.enableVertexAttribArray(1);
-            gl.vertexAttribPointer(1, 2, gl.FLOAT, false, 0, 0);
-        }
-        // eslint-disable-next-line
-        {
-            gl.bindBuffer(gl.ARRAY_BUFFER, rgbaBuffer);
-            gl.enableVertexAttribArray(2);
-            gl.vertexAttribPointer(2, 4, gl.FLOAT, false, 0, 0);
-        }
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-    }
-
-
-    draw(vao, length, { opacity = 1.0, hoveredID = -1, pointSize = 2.0, hoveredPointSize = 4.0, elementBuffer = null } = {}) {
-        if (length === 0 || opacity === 0) return;
-        const { gl, program, uniforms } = this;
-        gl.useProgram(program);
-        if (this._lastOpacity !== opacity) {
-            gl.uniform1f(uniforms.opacity, opacity);
-            this._lastOpacity = opacity;
-        }
-        if (this._lastPointSize !== pointSize) {
-            gl.uniform1f(uniforms.pointSize, pointSize);
-            this._lastPointSize = pointSize;
-        }
-        if (this._lastHoveredPointSize !== hoveredPointSize) {
-            gl.uniform1f(uniforms.hoveredPointSize, hoveredPointSize);
-            this._lastHoveredPointSize = hoveredPointSize;
-        }
-        if (this._lastHoveredID !== hoveredID) {
-            gl.uniform1i(uniforms.hovered_vertexID, hoveredID);
-            this._lastHoveredID = hoveredID;
-        }
-        gl.bindVertexArray(vao);
-        this.cameraBlockTotem.bind(this.cameraBlockBingingPoint);
-        if (elementBuffer) {
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, elementBuffer);
-            gl.drawElements(gl.POINTS, length, gl.UNSIGNED_INT, 0);
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
-        } else {
-            gl.drawArrays(gl.POINTS, 0, length);
-        }
-        this.cameraBlockTotem.unbind(this.cameraBlockBingingPoint);
-        gl.bindVertexArray(null);
-    }
-
-    free() {
-        if (this._isFreed) return;
-        const { gl, globe } = this;
-        CameraUniformBlockTotemCache.release(globe);
-        gl.deleteProgram(this.program);
-        this._isFreed = true;
-    }
-}
-
-
-const PointOnGlobeProgramCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
-});
-
-export { PointOnGlobeProgramCache };
+}`;
+class PointOnGlobeProgram {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
+        this.uniforms = {
+            opacity: gl.getUniformLocation(program, "opacity"),
+            hovered_vertexID: gl.getUniformLocation(program, "hovered_vertexID"),
+            hoveredPointSize: gl.getUniformLocation(program, "hoveredPointSize"),
+            pointSize: gl.getUniformLocation(program, "pointSize"),
+        };
+        // eslint-disable-next-line
+        { // assign opacity
+            this._lastOpacity = 1.0;
+            this._lastPointSize = 2.0;
+            this._lastHoveredPointSize = 4.0;
+            this._lastHoveredID = -1;
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1f(this.uniforms.opacity, this._lastOpacity);
+            gl.uniform1f(this.uniforms.pointSize, this._lastPointSize);
+            gl.uniform1f(this.uniforms.hoveredPointSize, this._lastHoveredPointSize);
+            gl.uniform1i(this.uniforms.hovered_vertexID, this._lastHoveredID);
+            gl.useProgram(currentProgram);
+        }
+        // eslint-disable-next-line
+        { // assign attribute locations
+            gl.bindAttribLocation(program, 0, "pos3D");
+            gl.bindAttribLocation(program, 1, "pos2D");
+            gl.bindAttribLocation(program, 2, "rgba");
+        }
+        // eslint-disable-next-line
+        { // arrange camera uniform block
+            this.cameraBlockBingingPoint = 0;
+            this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBingingPoint);
+        }
+    }
+    createVAO(pos3DBuffer, pos2DBuffer, rgbaBuffer) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        // eslint-disable-next-line
+        {
+            gl.bindBuffer(gl.ARRAY_BUFFER, pos3DBuffer);
+            gl.enableVertexAttribArray(0);
+            gl.vertexAttribPointer(0, 3, gl.FLOAT, false, 0, 0);
+        }
+        // eslint-disable-next-line
+        {
+            gl.bindBuffer(gl.ARRAY_BUFFER, pos2DBuffer);
+            gl.enableVertexAttribArray(1);
+            gl.vertexAttribPointer(1, 2, gl.FLOAT, false, 0, 0);
+        }
+        // eslint-disable-next-line
+        {
+            gl.bindBuffer(gl.ARRAY_BUFFER, rgbaBuffer);
+            gl.enableVertexAttribArray(2);
+            gl.vertexAttribPointer(2, 4, gl.FLOAT, false, 0, 0);
+        }
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    draw(vao, length, { opacity = 1.0, hoveredID = -1, pointSize = 2.0, hoveredPointSize = 4.0, elementBuffer = null } = {}) {
+        if (length === 0 || opacity === 0)
+            return;
+        const { gl, program, uniforms } = this;
+        gl.useProgram(program);
+        if (this._lastOpacity !== opacity) {
+            gl.uniform1f(uniforms.opacity, opacity);
+            this._lastOpacity = opacity;
+        }
+        if (this._lastPointSize !== pointSize) {
+            gl.uniform1f(uniforms.pointSize, pointSize);
+            this._lastPointSize = pointSize;
+        }
+        if (this._lastHoveredPointSize !== hoveredPointSize) {
+            gl.uniform1f(uniforms.hoveredPointSize, hoveredPointSize);
+            this._lastHoveredPointSize = hoveredPointSize;
+        }
+        if (this._lastHoveredID !== hoveredID) {
+            gl.uniform1i(uniforms.hovered_vertexID, hoveredID);
+            this._lastHoveredID = hoveredID;
+        }
+        gl.bindVertexArray(vao);
+        this.cameraBlockTotem.bind(this.cameraBlockBingingPoint);
+        if (elementBuffer) {
+            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, elementBuffer);
+            gl.drawElements(gl.POINTS, length, gl.UNSIGNED_INT, 0);
+            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+        }
+        else {
+            gl.drawArrays(gl.POINTS, 0, length);
+        }
+        this.cameraBlockTotem.unbind(this.cameraBlockBingingPoint);
+        gl.bindVertexArray(null);
+    }
+    free() {
+        if (this._isFreed)
+            return;
+        const { gl, globe } = this;
+        CameraUniformBlockTotemCache.release(globe);
+        gl.deleteProgram(this.program);
+        this._isFreed = true;
+    }
+}
+const PointOnGlobeProgramCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
+});
+export { PointOnGlobeProgramCache };

package/programs/rings/distancering/circleflatprogram.js

@@ -1,138 +1,116 @@
-// TODO: Delete this file if it is not needed anymore.
-
-// import { createProgram, shaderfunctions } from "../../../util";
-// import CameraUniformBlockTotem, { CameraUniformBlockString } from "../../totems/camerauniformblock";
-// import { noRegisterGlobeProgramCache, globeProgramCache } from "../../programcache";
-
-// const CIRCLE_EDGE_COUNT = 360;
-
-// const vertexShader = `#version 300 es ` +
-//     shaderfunctions.PI +
-//     shaderfunctions.R +
-//     shaderfunctions.POLE +
-//     CameraUniformBlockString +
-//     shaderfunctions.mercatorXYToGLPosition +
-//     shaderfunctions.longLatRadToMercator +
-//     shaderfunctions.longLatRadToCartesian3D +
-//     shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
-//     shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
-//     shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
-
-// uniform int compass;
-// uniform float circle_edge_count;
-
-// uniform float opacity;
-
-// in vec2 center;
-// in float radius;
-// in vec4 color;
-// in float flag;
-// out vec4 v_color;
-// out vec2 v_limp;
-
-// void main() {
-//     if( flag == 1.0 || radius == 0.0) return; // flag 1.0 is hide
-//     v_color = vec4(color.rgb, color.a * opacity);
-//     if ( gl_VertexID == 270 ) v_color.rgb += 0.2;
-//     float angle = 3.1415926535897932384626433832795 * 2.0 * (float(gl_VertexID) /  circle_edge_count);
-//     if ( is3D ){
-//             gl_Position = projection * view * vec4(
-//             circleLimpFromLongLatRadCenterCartesian3D( center, radius, angle) - translate, 1.0);
-//         v_limp = vec2(0.0, 0.0);
-//         return;
-//     }
-//     vec2 limp;
-//     if ( compass == 1 ){
-//         limp = circleLimpFromLongLatRadCenterMercatorCompass(center, radius, angle);
-//     } else {
-//         limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius, angle);
-//     }   
-//     v_limp = limp;
-//     gl_Position = mercatorXYToGLPosition(limp);
-    
-// }`;
-
-// const fragmentShader = `#version 300 es
-// precision highp float;` +
-//     shaderfunctions.POLE + `
-
-// in vec4 v_color;
-// in vec2 v_limp;
-// out vec4 outColor;
-// void main() {
-//     if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ discard; }
-//     outColor = v_color;
-// }`;
-
-// class Logic {
-//     constructor(globe) {
-//         this.globe = globe;
-//         this.gl = globe.gl;
-//         this.program = createProgram(this.gl, vertexShader, fragmentShader);
-//         { // bind positions so bufferManager can use them
-//             this.gl.bindAttribLocation(this.program, 0, "center");
-//             this.gl.bindAttribLocation(this.program, 1, "radius");
-//             this.gl.bindAttribLocation(this.program, 2, "color");
-//             this.gl.bindAttribLocation(this.program, 3, "flag");
-//         }
-//         this.cameraBlockBindingPoint = 0;
-//         this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
-//         const cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
-//         this.gl.uniformBlockBinding(this.program, cameraBlockIndex, this.cameraBlockBindingPoint);
-
-//         this._opacityLocation = this.gl.getUniformLocation(this.program, "opacity");
-//         this._compassLocation = this.gl.getUniformLocation(this.program, "compass");
-//         this._circleEdgeCountLocation = this.gl.getUniformLocation(this.program, "circle_edge_count");
-//         this._circleEdgeCount = CIRCLE_EDGE_COUNT;
-//         this._compassmode = 1;
-//         this._opacity = 1.0;
-//         {
-//             const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
-//             this.gl.useProgram(this.program);
-//             this.gl.uniform1i(this._compassLocation, 1);
-//             this.gl.uniform1f(this._circleEdgeCountLocation, CIRCLE_EDGE_COUNT);
-//             this.gl.uniform1f(this._opacityLocation, 1.0);
-
-//             this.gl.useProgram(currentProgram);
-//         }
-
-//     }
-
-
-//     draw(attrBufferManager, compass, circleEdgeCount, opacity) {
-//         const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this;
-//         gl.useProgram(program);
-//         cameraBlockTotem.bind(cameraBlockBindingPoint);
-//         attrBufferManager.bindCircleVAO();
-
-//         if (compass !== this._compassmode) {
-//             gl.uniform1i(this._compassLocation, compass);
-//             this._compassmode = compass;
-//         }
-
-//         if (opacity !== this._opacity) {
-//             gl.uniform1f(this._opacityLocation, opacity);
-//             this._opacity = opacity;
-//         }
-
-//         if (circleEdgeCount !== this._circleEdgeCount) {
-//             gl.uniform1f(this._circleEdgeCountLocation, circleEdgeCount);
-//             this._circleEdgeCount = circleEdgeCount;
-//         }
-//         gl.drawArraysInstanced(gl.LINE_LOOP, 0, circleEdgeCount, attrBufferManager.length);
-//         gl.bindVertexArray(null);
-//         cameraBlockTotem.unbind(cameraBlockBindingPoint);
-//     }
-
-//     free() {
-//         this.gl.deleteProgram(this.program);
-//         globeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
-
-//     }
-// }
-
-
-// export const programCache = Object.freeze({
-//     getProgram: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
-//     releaseProgram: (globe) => { noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
-// });
+"use strict";
+// TODO: Delete this file if it is not needed anymore.
+// import { createProgram, shaderfunctions } from "../../../util";
+// import CameraUniformBlockTotem, { CameraUniformBlockString } from "../../totems/camerauniformblock";
+// import { noRegisterGlobeProgramCache, globeProgramCache } from "../../programcache";
+// const CIRCLE_EDGE_COUNT = 360;
+// const vertexShader = `#version 300 es ` +
+//     shaderfunctions.PI +
+//     shaderfunctions.R +
+//     shaderfunctions.POLE +
+//     CameraUniformBlockString +
+//     shaderfunctions.mercatorXYToGLPosition +
+//     shaderfunctions.longLatRadToMercator +
+//     shaderfunctions.longLatRadToCartesian3D +
+//     shaderfunctions.circleLimpFromLongLatRadCenterCartesian3D +
+//     shaderfunctions.circleLimpFromLongLatRadCenterMercatorCompass +
+//     shaderfunctions.circleLimpFromLongLatRadCenterMercatorRealDistance + `
+// uniform int compass;
+// uniform float circle_edge_count;
+// uniform float opacity;
+// in vec2 center;
+// in float radius;
+// in vec4 color;
+// in float flag;
+// out vec4 v_color;
+// out vec2 v_limp;
+// void main() {
+//     if( flag == 1.0 || radius == 0.0) return; // flag 1.0 is hide
+//     v_color = vec4(color.rgb, color.a * opacity);
+//     if ( gl_VertexID == 270 ) v_color.rgb += 0.2;
+//     float angle = 3.1415926535897932384626433832795 * 2.0 * (float(gl_VertexID) /  circle_edge_count);
+//     if ( is3D ){
+//             gl_Position = projection * view * vec4(
+//             circleLimpFromLongLatRadCenterCartesian3D( center, radius, angle) - translate, 1.0);
+//         v_limp = vec2(0.0, 0.0);
+//         return;
+//     }
+//     vec2 limp;
+//     if ( compass == 1 ){
+//         limp = circleLimpFromLongLatRadCenterMercatorCompass(center, radius, angle);
+//     } else {
+//         limp = circleLimpFromLongLatRadCenterMercatorRealDistance(center, radius, angle);
+//     }   
+//     v_limp = limp;
+//     gl_Position = mercatorXYToGLPosition(limp);
+// }`;
+// const fragmentShader = `#version 300 es
+// precision highp float;` +
+//     shaderfunctions.POLE + `
+// in vec4 v_color;
+// in vec2 v_limp;
+// out vec4 outColor;
+// void main() {
+//     if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ discard; }
+//     outColor = v_color;
+// }`;
+// class Logic {
+//     constructor(globe) {
+//         this.globe = globe;
+//         this.gl = globe.gl;
+//         this.program = createProgram(this.gl, vertexShader, fragmentShader);
+//         { // bind positions so bufferManager can use them
+//             this.gl.bindAttribLocation(this.program, 0, "center");
+//             this.gl.bindAttribLocation(this.program, 1, "radius");
+//             this.gl.bindAttribLocation(this.program, 2, "color");
+//             this.gl.bindAttribLocation(this.program, 3, "flag");
+//         }
+//         this.cameraBlockBindingPoint = 0;
+//         this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
+//         const cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
+//         this.gl.uniformBlockBinding(this.program, cameraBlockIndex, this.cameraBlockBindingPoint);
+//         this._opacityLocation = this.gl.getUniformLocation(this.program, "opacity");
+//         this._compassLocation = this.gl.getUniformLocation(this.program, "compass");
+//         this._circleEdgeCountLocation = this.gl.getUniformLocation(this.program, "circle_edge_count");
+//         this._circleEdgeCount = CIRCLE_EDGE_COUNT;
+//         this._compassmode = 1;
+//         this._opacity = 1.0;
+//         {
+//             const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
+//             this.gl.useProgram(this.program);
+//             this.gl.uniform1i(this._compassLocation, 1);
+//             this.gl.uniform1f(this._circleEdgeCountLocation, CIRCLE_EDGE_COUNT);
+//             this.gl.uniform1f(this._opacityLocation, 1.0);
+//             this.gl.useProgram(currentProgram);
+//         }
+//     }
+//     draw(attrBufferManager, compass, circleEdgeCount, opacity) {
+//         const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this;
+//         gl.useProgram(program);
+//         cameraBlockTotem.bind(cameraBlockBindingPoint);
+//         attrBufferManager.bindCircleVAO();
+//         if (compass !== this._compassmode) {
+//             gl.uniform1i(this._compassLocation, compass);
+//             this._compassmode = compass;
+//         }
+//         if (opacity !== this._opacity) {
+//             gl.uniform1f(this._opacityLocation, opacity);
+//             this._opacity = opacity;
+//         }
+//         if (circleEdgeCount !== this._circleEdgeCount) {
+//             gl.uniform1f(this._circleEdgeCountLocation, circleEdgeCount);
+//             this._circleEdgeCount = circleEdgeCount;
+//         }
+//         gl.drawArraysInstanced(gl.LINE_LOOP, 0, circleEdgeCount, attrBufferManager.length);
+//         gl.bindVertexArray(null);
+//         cameraBlockTotem.unbind(cameraBlockBindingPoint);
+//     }
+//     free() {
+//         this.gl.deleteProgram(this.program);
+//         globeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
+//     }
+// }
+// export const programCache = Object.freeze({
+//     getProgram: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
+//     releaseProgram: (globe) => { noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
+// });