@pirireis/webglobeplugins 0.11.1-alpha → 0.13.0-alpha

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

@@ -1,164 +1,166 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { vaoAttributeLoader } from "../../util/account/util";
-import { longLatRadToMercator, longLatRadToCartesian3D, cartesian3DToGLPosition, mercatorXYToGLPosition, realDistanceOnSphereR1, circleLimpFromLongLatRadCenterCartesian3D, circleLimpFromLongLatRadCenterMercatorCompass, circleLimpFromLongLatRadCenterMercatorRealDistance, POLE } 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;
-const vertexShaderSource = `#version 300 es
-precision highp float;
-${CameraUniformBlockString}
-${longLatRadToMercator}
-${longLatRadToCartesian3D}
-${cartesian3DToGLPosition}
-${mercatorXYToGLPosition}
-${realDistanceOnSphereR1}
-${circleLimpFromLongLatRadCenterCartesian3D}
-${circleLimpFromLongLatRadCenterMercatorCompass}
-${circleLimpFromLongLatRadCenterMercatorRealDistance}
-
-uniform float edge_count;
-
-in vec2 center_position;
-in float radius;
-in vec4 color;
-in float dash_ratio;
-in float dash_opacity;
-
-out float interpolation;
-out vec4 v_color;
-out float v_dash_ratio;
-out float v_dash_opacity;
-out vec2 v_limp;
-void main() {
-    interpolation = float( gl_VertexID ) / ${EDGE_COUNT_ON_SPHERE}.0;
-    float angle = PI * 2.0 * interpolation;
-    if ( is3D ) {
-        vec3 position = circleLimpFromLongLatRadCenterCartesian3D( center_position, radius, angle);
-        gl_Position = cartesian3DToGLPosition(position);
-        v_limp = vec2(0.0, 0.0);
-    } else {
-        vec2 position;
-        if (radius < 1400.0) {
-            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius/ cos(center_position.y), angle);
-        } else {
-           position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);
-        }
-        v_limp = position;
-        gl_Position = mercatorXYToGLPosition( position);
-
-    }
-    v_dash_ratio = dash_ratio;
-    v_dash_opacity = dash_opacity;
-    v_color = color;
-
-}`;
-const fragmentShaderSource = `#version 300 es
-${POLE}
-precision highp float;
-uniform float opacity;
-in vec4 v_color;
-in float v_dash_ratio;
-in float v_dash_opacity;
-in float interpolation;
-in vec2 v_limp;
-out vec4 color;
-void main() {
-    if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ color = vec4(0.0,0.0,0.0,0.0); return; }
-    color = v_color;
-    color.a *= opacity;
-    if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;
-    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._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_position");
-            gl.bindAttribLocation(program, 1, "radius");
-            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(centerObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        const divisor = 1;
-        gl.bindVertexArray(vao);
-        { // make this a function end import from account module. 
-            const { buffer, stride = 0, offset = 0 } = centerObj;
-            vaoAttributeLoader(gl, buffer, 0, 2, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = radiusObj;
-            vaoAttributeLoader(gl, buffer, 1, 1, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = colorObj;
-            vaoAttributeLoader(gl, buffer, 2, 4, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
-            vaoAttributeLoader(gl, buffer, 3, 1, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
-            vaoAttributeLoader(gl, buffer, 4, 1, stride, offset, 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);
-        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)
-});
+"use strict";
+// TODO: Delete this file if it is not needed anymore.
+// import { createProgram } from "../../util/webglobjectbuilders";
+// import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
+// import { noRegisterGlobeProgramCache } from "../programcache";
+// import { vaoAttributeLoader } from "../../util/account/util";
+// import {
+//     longLatRadToMercator, longLatRadToCartesian3D, cartesian3DToGLPosition, mercatorXYToGLPosition, realDistanceOnSphereR1,
+//     circleLimpFromLongLatRadCenterCartesian3D,
+//     circleLimpFromLongLatRadCenterMercatorCompass,
+//     circleLimpFromLongLatRadCenterMercatorRealDistance,
+//     POLE
+// } 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;
+// const vertexShaderSource = `#version 300 es
+// precision highp float;
+// ${CameraUniformBlockString}
+// ${longLatRadToMercator}
+// ${longLatRadToCartesian3D}
+// ${cartesian3DToGLPosition}
+// ${mercatorXYToGLPosition}
+// ${realDistanceOnSphereR1}
+// ${circleLimpFromLongLatRadCenterCartesian3D}
+// ${circleLimpFromLongLatRadCenterMercatorCompass}
+// ${circleLimpFromLongLatRadCenterMercatorRealDistance}
+// uniform float edge_count;
+// in vec2 center_position;
+// in float radius;
+// in vec4 color;
+// in float dash_ratio;
+// in float dash_opacity;
+// out float interpolation;
+// out vec4 v_color;
+// out float v_dash_ratio;
+// out float v_dash_opacity;
+// out vec2 v_limp;
+// void main() {
+//     interpolation = float( gl_VertexID ) / ${EDGE_COUNT_ON_SPHERE}.0;
+//     float angle = PI * 2.0 * interpolation;
+//     if ( is3D ) {
+//         vec3 position = circleLimpFromLongLatRadCenterCartesian3D( center_position, radius, angle);
+//         gl_Position = cartesian3DToGLPosition(position);
+//         v_limp = vec2(0.0, 0.0);
+//     } else {
+//         vec2 position;
+//         if (radius < 1400.0) {
+//             position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius/ cos(center_position.y), angle);
+//         } else {
+//            position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);
+//         }
+//         v_limp = position;
+//         gl_Position = mercatorXYToGLPosition( position);
+//     }
+//     v_dash_ratio = dash_ratio;
+//     v_dash_opacity = dash_opacity;
+//     v_color = color;
+// }`
+// const fragmentShaderSource = `#version 300 es
+// ${POLE}
+// precision highp float;
+// uniform float opacity;
+// in vec4 v_color;
+// in float v_dash_ratio;
+// in float v_dash_opacity;
+// in float interpolation;
+// in vec2 v_limp;
+// out vec4 color;
+// void main() {
+//     if ( v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE ){ color = vec4(0.0,0.0,0.0,0.0); return; }
+//     color = v_color;
+//     color.a *= opacity;
+//     if ( v_dash_ratio == 1.0 || v_dash_ratio == 0.0 ) return;
+//     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._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_position");
+//             gl.bindAttribLocation(program, 1, "radius");
+//             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(centerObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj) {
+//         const { gl } = this;
+//         const vao = gl.createVertexArray();
+//         const divisor = 1;
+//         gl.bindVertexArray(vao);
+//         {  // make this a function end import from account module.
+//             const { buffer, stride = 0, offset = 0 } = centerObj;
+//             vaoAttributeLoader(gl, buffer, 0, 2, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = radiusObj;
+//             vaoAttributeLoader(gl, buffer, 1, 1, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = colorObj;
+//             vaoAttributeLoader(gl, buffer, 2, 4, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = dashRatioObj;
+//             vaoAttributeLoader(gl, buffer, 3, 1, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
+//             vaoAttributeLoader(gl, buffer, 4, 1, stride, offset, 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);
+//         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)
+// });

package/programs/line-on-globe/linestrip/data.js

@@ -0,0 +1,4 @@
+export function createLineStripData(program, globe, gl, DrawStyleOptions) {
+    // @ts-ignore
+    return;
+}

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

@@ -1,24 +1,23 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import "../interface";
-import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/index";
-import { cartesian3DToGLPosition, mercatorXYToGLPosition, } from "../../util/shaderfunctions/geometrytransformations.js";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import "../../util/gl-util/buffer/attribute-loader";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-import "../../util/gl-util/uniform-block/types";
-import { drawArrays } from "../../util/gl-util/draw-options/methods";
-import "../../util/gl-util/draw-options/types";
+import { createProgram } from "../../../util/webglobjectbuilders";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../../totems/index";
+import { cartesian3DToGLPosition, mercatorXYToGLPosition, } from "../../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../../programcache";
+import { attributeLoader } from "../../../util/gl-util/buffer/attribute-loader";
+import "../../../util/gl-util/buffer/attribute-loader";
+import { UniformBlockManager } from "../../../util/gl-util/uniform-block/manager";
+import "../../../util/gl-util/uniform-block/types";
+import { drawArrays } from "../../../util/gl-util/draw-options/methods";
+import "../../../util/gl-util/draw-options/types";
 const ESCAPE_VALUE = -1;
 const uniformBindingPoints = {
     camera: 0,
     flexible: 1,
 };
-const one = new Float32Array([1]);
+// const one = new Float32Array([1]);
 const flexibleBlockManager = new UniformBlockManager('FlexibleAttributes', [
     { name: "u_color", type: "vec4", value: new Float32Array([0.12, 1, 0.1, 1]) },
-    { name: "u_dash_opacity", type: "float", value: one },
-    { name: "u_dash_length", type: "float", value: one },
+    // { name: "u_dash_opacity", type: "float", value: one },
+    // { name: "u_dash_length", type: "float", value: one },
 ], uniformBindingPoints.flexible);
 const vertexShaderSource = `#version 300 es
 precision highp float;
@@ -32,11 +31,11 @@ ${flexibleBlockManager.glslCode()}
 in vec3 position3d;
 in vec2 position2d;
 in vec4 color; 
-in float dash_length;
-in float dash_opacity;
+// in float dash_length;
+// in float dash_opacity;
 
-out float v_dash_length;
-out float v_dash_opacity;
+// out float v_dash_length;
+// out float v_dash_opacity;
 out vec4 v_color;
 
 flat out vec3 v_flat_position;
@@ -45,8 +44,8 @@ out vec3 v_position;
 void main() {
 
     v_color = ( color.r == -1.0 ) ? u_color : color;
-    v_dash_length = ( dash_length == -1.0 ) ? u_dash_length : dash_length;
-    v_dash_opacity = ( dash_opacity == -1.0 ) ? u_dash_opacity : dash_opacity;
+    // v_dash_length = ( dash_length == -1.0 ) ? u_dash_length : dash_length;
+    // v_dash_opacity = ( dash_opacity == -1.0 ) ? u_dash_opacity : dash_opacity;
 
     if ( is3D ) {
         gl_Position = cartesian3DToGLPosition( position3d );
@@ -57,7 +56,7 @@ void main() {
         v_position = vec3( position2d, 0.0 );
         v_flat_position = vec3( position2d, 0.0 );
     }
-    gl_PointSize = 4.0;
+    gl_PointSize = 6.0;
 }`;
 const fragmentShaderSource = `#version 300 es
 precision highp float;
@@ -71,24 +70,23 @@ in float v_dash_opacity;
 flat in vec3 v_flat_position;
 in vec3 v_position;
 
-
 out vec4 outColor;
 
 void main() {
     outColor = v_color;
     return;
-    float dash_length = v_dash_length;
-    float dash_opacity = v_dash_opacity;
+    // float dash_length = v_dash_length;
+    // float dash_opacity = v_dash_opacity;
 
-    if ( dash_length == 0.0 ) {
-        outColor = vec4( v_color.rgb, v_color.a * v_dash_opacity );
-    } else {
-        float dist = distance( v_flat_position, v_position );
-        // float alpha = mod( dist , v_dash_length * 2.0 ) / v_dash_length < 1.0 ? 1.0 : v_dash_opacity;
-        outColor = vec4( v_color.rgb,  v_color.a * opacity );
-    }
+    // if ( dash_length == 0.0 ) {
+        outColor = vec4( v_color.rgb, v_color.a );
+    // } else {
+    //     float dist = distance( v_flat_position, v_position );
+    //     // float alpha = mod( dist , v_dash_length * 2.0 ) / v_dash_length < 1.0 ? 1.0 : v_dash_opacity;
+    //     outColor = vec4( 1.0, 1.0, 1.0,  v_color.a * opacity *alpha);
+    // }
 }`;
-class Logic {
+export class LineProgram {
     _vaosPublished = [];
     _ubosPublished = [];
     program;
@@ -112,8 +110,8 @@ class Logic {
         this.gl.bindAttribLocation(this.program, 0, "position3d");
         this.gl.bindAttribLocation(this.program, 1, "position2d");
         this.gl.bindAttribLocation(this.program, 2, "color");
-        this.gl.bindAttribLocation(this.program, 3, "dash_length");
-        this.gl.bindAttribLocation(this.program, 4, "dash_opacity");
+        // this.gl.bindAttribLocation(this.program, 3, "dash_length");
+        // this.gl.bindAttribLocation(this.program, 4, "dash_opacity");
         this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
         this.cameraBlockTotem.assignBindingPoint(this.program, uniformBindingPoints.camera);
         flexibleBlockManager.assignBindingPoint(this.gl, this.program);
@@ -125,15 +123,16 @@ class Logic {
         this._ubosPublished.push(ubo);
         return ubo;
     }
-    createVAO(position3D, position2D, color, dashLength, dashOpacity) {
+    createVAO(position3D, position2D, color //, dashLength: BufferAndReadInfo, dashOpacity: BufferAndReadInfo,
+    ) {
         const { gl } = this;
         const vao = gl.createVertexArray();
         gl.bindVertexArray(vao);
         attributeLoader(gl, position3D, 0, 3);
         attributeLoader(gl, position2D, 1, 2);
         attributeLoader(gl, color, 2, 4, { escapeValues: [ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE] });
-        attributeLoader(gl, dashLength, 3, 1, { escapeValues: [ESCAPE_VALUE] });
-        attributeLoader(gl, dashOpacity, 4, 1, { escapeValues: [ESCAPE_VALUE] });
+        // attributeLoader(gl, dashLength, 3, 1, { escapeValues: [ESCAPE_VALUE] });
+        // attributeLoader(gl, dashOpacity, 4, 1, { escapeValues: [ESCAPE_VALUE] });
         gl.bindVertexArray(null);
         return vao;
     }
@@ -164,6 +163,6 @@ class Logic {
     }
 }
 export const LineStripProgramCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic),
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, LineProgram),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, LineProgram),
 });