@pirireis/webglobeplugins 0.12.0-alpha → 0.13.0-alpha

package/programs/line-on-globe/to-the-surface.js

@@ -1,109 +1,111 @@
-import { createProgram } from './util';
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from '../totems';
-import { cartesian3DToGLPosition, R_3D } from '../../util/shaderfunctions/geometrytransformations';
-import { noRegisterGlobeProgramCache } from '../programcache';
-import { attributeLoader } from '../../util/gl-util/buffer/attribute-loader';
-import '../draw-options/types';
-import { drawInstanced } from '../draw-options/methods';
-const vs = `#version 300 es
-${R_3D}
-${CameraUniformBlockString}
-${cartesian3DToGLPosition}
-in vec3 pos3D
-in vec4 color;
-out float ratio;
-out flat vec4 vColor;
-void main(){
- if ( gl_VertexID  == 0) {
-  gl_Position = cartesian3DToGLPosition(pos3D);
-  ratio =0.0;
- } else {
-  vec3 sea_level_pos3D = norm(pos3D) * R_3D;
-  gl_Position = cartesian3DToGLPosition(pos3D);
-  ratio = 1.0;
- }
- vColor = color;   
-}`;
-const fs = `#version 300 es
-uniform float opacity;
-uniform float phase;
-uniform float fadeOpacity;
-in flat vec4 vColor;
-in float ratio;
-out vec4 fragColor;
-void main(){
- fragColor = vec4( vColor.rgb, vColor.a * opacity);
- if (fadeOpacity < 1.0) {
-  float alpha= mix( fadeOpacity, vColor.a, fract( ratio + phase ));
-  fragColor.a *= alpha;
- } 
-}`;
-class Logic {
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this.program = createProgram(this.gl, vs, fs);
-        const { gl, program } = this;
-        this._opacity = {
-            lastValue: 1.0,
-            location: gl.getUniformLocation(program, 'opacity')
-        };
-        this._phase = {
-            lastValue: 1.0,
-            location: gl.getUniformLocation(program, 'phase')
-        };
-        this._fadeOpacity = {
-            lastValue: 1.0,
-            location: gl.getUniformBlockLocation(program, 'fadeOpacity')
-        };
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(program);
-        [this._opacity, this._phase, this._fadeOpacity].forEach((wrapper) => gl.uniform1f(wrapper.location, wrapper.lastValue));
-        gl.useProgram(currentProgram);
-        gl.useProgram(program);
-        gl.bindAttribLocation(program, 0, 'pos3D');
-        gl.bindAttribLocation(program, 1, 'color');
-        this.cameraUniformBlockTotem = new CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockBindingPoint = 0;
-        const cameraBlockIndex = gl.getUniformBlockLocation(program, 'CameraUniformBlock');
-        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-    }
-    createVao(pos3DObj, colorObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        const divisor = 1;
-        gl.bindVertexArray(vao);
-        attributeLoader(gl, pos3DObj, 0, 3, { divisor });
-        attributeLoader(gl, colorObj, 1, 4, { divisor, escapeValue: [-1, -1, -1, -1] });
-        gl.bindVertexArray(null);
-        this._vaoCache.push(vao);
-        return vao;
-    }
-    /**
-     *
-     * @param {WebGL2RenderingContext.vertexArrayObject} vao
-     * @param {Render} drawOptions
-     */
-    draw(vao, drawOptions, { opacity = 1.0, fadeOpacity = 1.0, }) {
-        const { globe, gl, program, _opacity, _fadeOpacity } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        if (fadeOpacity < 1.0) {
-            this._updatePhase();
-            globe.drawRender();
-        }
-        if (fadeOpacity !== _fadeOpacity.lastValue) {
-            _fadeOpacity.lastValue = fadeOpacity;
-            gl.uniform1f(_fadeOpacity.location, fadeOpacity);
-        }
-        if (opacity !== _opacity.lastValue) {
-            _opacity.lastValue = opacity;
-            gl.uniform1f(_opacity.location, opacity);
-        }
-        drawInstanced(gl, gl.TRIANGLE_FAN, drawOptions);
-    }
-    _updatePhase() {
-        this._phase.lastValue = (Date.now() / 3.0) % 1000;
-        gl.uniform1f(_phase.location, _phase.lastValue);
-    }
-}
+"use strict";
+// TODO: Delete this file if it is not needed anymore.
+// import { createProgram } from './util'
+// import { CameraUniformBlockTotemCache, CameraUniformBlockString } from '../totems';
+// import { cartesian3DToGLPosition, R_3D } from '../../util/shaderfunctions/geometrytransformations';
+// import { noRegisterGlobeProgramCache } from '../programcache';
+// import { attributeLoader } from '../../util/gl-util/buffer/attribute-loader';
+// import '../draw-options/types';
+// import { drawInstanced } from '../draw-options/methods';
+// const vs = `#version 300 es
+// ${R_3D}
+// ${CameraUniformBlockString}
+// ${cartesian3DToGLPosition}
+// in vec3 pos3D
+// in vec4 color;
+// out float ratio;
+// out flat vec4 vColor;
+// void main(){
+//  if ( gl_VertexID  == 0) {
+//   gl_Position = cartesian3DToGLPosition(pos3D);
+//   ratio =0.0;
+//  } else {
+//   vec3 sea_level_pos3D = norm(pos3D) * R_3D;
+//   gl_Position = cartesian3DToGLPosition(pos3D);
+//   ratio = 1.0;
+//  }
+//  vColor = color;
+// }`;
+// const fs = `#version 300 es
+// uniform float opacity;
+// uniform float phase;
+// uniform float fadeOpacity;
+// in flat vec4 vColor;
+// in float ratio;
+// out vec4 fragColor;
+// void main(){
+//  fragColor = vec4( vColor.rgb, vColor.a * opacity);
+//  if (fadeOpacity < 1.0) {
+//   float alpha= mix( fadeOpacity, vColor.a, fract( ratio + phase ));
+//   fragColor.a *= alpha;
+//  }
+// }`;
+// class Logic {
+//     constructor(globe) {
+//         this.globe = globe;
+//         this.gl = globe.gl;
+//         this.program = createProgram(this.gl, vs, fs);
+//         const { gl, program } = this;
+//         this._opacity = {
+//             lastValue: 1.0,
+//             location: gl.getUniformLocation(program, 'opacity')
+//         }
+//         this._phase = {
+//             lastValue: 1.0,
+//             location: gl.getUniformLocation(program, 'phase')
+//         }
+//         this._fadeOpacity = {
+//             lastValue: 1.0,
+//             location: gl.getUniformBlockLocation(program, 'fadeOpacity')
+//         }
+//         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+//         gl.useProgram(program);
+//         [this._opacity, this._phase, this._fadeOpacity].forEach((wrapper) => gl.uniform1f(wrapper.location, wrapper.lastValue))
+//         gl.useProgram(currentProgram)
+//         gl.useProgram(program);
+//         gl.bindAttribLocation(program, 0, 'pos3D');
+//         gl.bindAttribLocation(program, 1, 'color');
+//         this.cameraUniformBlockTotem = new CameraUniformBlockTotemCache.get(globe);
+//         this.cameraBlockBindingPoint = 0;
+//         const cameraBlockIndex = gl.getUniformBlockLocation(program, 'CameraUniformBlock');
+//         gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint)
+//     }
+//     createVao(pos3DObj, colorObj) {
+//         const { gl } = this;
+//         const vao = gl.createVertexArray();
+//         const divisor = 1;
+//         gl.bindVertexArray(vao);
+//         attributeLoader(gl, pos3DObj, 0, 3, { divisor });
+//         attributeLoader(gl, colorObj, 1, 4, { divisor, escapeValue: [-1, -1, -1, -1] });
+//         gl.bindVertexArray(null);
+//         this._vaoCache.push(vao);
+//         return vao;
+//     }
+//     /**
+//      *
+//      * @param {WebGL2RenderingContext.vertexArrayObject} vao
+//      * @param {Render} drawOptions
+//      */
+//     draw(vao, drawOptions, { opacity = 1.0, fadeOpacity = 1.0, }) {
+//         const { globe, gl, program, _opacity, _fadeOpacity } = this;
+//         gl.useProgram(program);
+//         gl.bindVertexArray(vao);
+//         if (fadeOpacity < 1.0) {
+//             this._updatePhase();
+//             globe.drawRender();
+//         }
+//         if (fadeOpacity !== _fadeOpacity.lastValue) {
+//             _fadeOpacity.lastValue = fadeOpacity;
+//             gl.uniform1f(_fadeOpacity.location, fadeOpacity);
+//         }
+//         if (opacity !== _opacity.lastValue) {
+//             _opacity.lastValue = opacity;
+//             gl.uniform1f(_opacity.location, opacity);
+//         }
+//         drawInstanced(gl, gl.TRIANGLE_FAN, drawOptions)
+//     }
+//     _updatePhase() {
+//         this._phase.lastValue = (Date.now() / 3.0) % 1000;
+//         gl.uniform1f(_phase.location, _phase.lastValue);
+//     }
+// }

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)
 });