@pirireis/webglobeplugins 0.12.0-alpha → 0.14.0-alpha

package/programs/rings/distancering/circleflatprogram.js

@@ -1,120 +1,116 @@
-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) }
+// });

package/programs/rings/distancering/circlepaddingfreeangleprogram.js

@@ -120,7 +120,7 @@ class Logic {
         return new BufferManager(this.gl, bufferType, initialRingCapacity);
     }
 }
-export const PaddingFreeAngleCache = Object.freeze({
+const PaddingFreeAngleCache = Object.freeze({
     getProgram: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
     releaseProgram: (globe) => globeProgramCache.releaseProgram(globe, Logic)
 });