@pirireis/webglobeplugins 0.12.0-alpha → 0.13.0-alpha

package/Math/circle-cdf-points.js

@@ -206,7 +206,6 @@ function createCummulativeTemplate(numberOfPoints, strength, denseRatio = 0.5 //
         // Normalize the values to ensure they sum up to 1.
         distribution[i] = distribution[i] / totalWeight;
     }
-    console.log("distribution", distribution, "strength", strength, "numberOfPoints", numberOfPoints);
     return distribution;
 }
 function createCummulativeTemplateStash(levels, numberOfPoints, denseRatio = 0.5, strengthMultiplier = 2.4) {
@@ -239,7 +238,6 @@ function globeFindPointByPolarHalfCircle(out, globe, centerLong, centerLat, radi
         out[offset - 1] = point.lat;
         offset -= 2;
     }
-    console.log("1");
 }
 export { 
 // createTemplate,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.12.0-alpha",
+    "version": "0.13.0-alpha",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",

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

@@ -1,175 +1,176 @@
-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_accurate, circleLimpFromLongLatRadCenterMercatorCompass_accurate, circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate, 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_accurate}
-${circleLimpFromLongLatRadCenterMercatorCompass_accurate}
-${circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate}
-
-uniform float edge_count;
-
-in vec2 center_position;
-in vec3 center_position3d;
-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_accurate(center_position3d, radius, angle);
-    
-        gl_Position = cartesian3DToGLPosition(position);
-        v_limp = vec2(0.0, 0.0);
-    } else {
-        vec2 position;  
-        if ( radius < 0.0) {
-            float cosine1 = cos(asin(tanh(center_position.y / 6378137.0)));
-            position = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center_position, radius /  cosine1 , angle);
-        } else {
-            position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);
-        }
-        v_limp = position;
-        gl_Position = mercatorXYToGLPosition( position);
-
-    }
-    v_dash_ratio = dash_ratio;
-    v_dash_opacity = dash_opacity;
-    v_color = color;
-    gl_PointSize = 3.0;
-
-}`;
-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, "center_position3d");
-            gl.bindAttribLocation(program, 2, "radius");
-            gl.bindAttribLocation(program, 3, "color");
-            gl.bindAttribLocation(program, 4, "dash_ratio");
-            gl.bindAttribLocation(program, 5, "dash_opacity");
-        }
-        this.cameraBindingPoint = 0;
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
-    }
-    createVAO(centerObj, center3dObj, 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);
-        }
-        { // make this a function end import from account module. 
-            const { buffer, stride = 0, offset = 0 } = center3dObj;
-            vaoAttributeLoader(gl, buffer, 1, 3, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = radiusObj;
-            vaoAttributeLoader(gl, buffer, 2, 1, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = colorObj;
-            vaoAttributeLoader(gl, buffer, 3, 4, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashRatioObj;
-            vaoAttributeLoader(gl, buffer, 4, 1, stride, offset, divisor);
-        }
-        {
-            const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
-            vaoAttributeLoader(gl, buffer, 5, 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);
-        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)
-});
+"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_accurate,
+//     circleLimpFromLongLatRadCenterMercatorCompass_accurate,
+//     circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate,
+//     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_accurate}
+// ${circleLimpFromLongLatRadCenterMercatorCompass_accurate}
+// ${circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate}
+// uniform float edge_count;
+// in vec2 center_position;
+// in vec3 center_position3d;
+// 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_accurate(center_position3d, radius, angle);
+//         gl_Position = cartesian3DToGLPosition(position);
+//         v_limp = vec2(0.0, 0.0);
+//     } else {
+//         vec2 position;  
+//         if ( radius < 0.0) {
+//             float cosine1 = cos(asin(tanh(center_position.y / 6378137.0)));
+//             position = circleLimpFromLongLatRadCenterMercatorCompass_accurate(center_position, radius /  cosine1 , angle);
+//         } else {
+//             position = circleLimpFromLongLatRadCenterMercatorRealDistanceNew_accurate( center_position, radius, angle);
+//         }
+//         v_limp = position;
+//         gl_Position = mercatorXYToGLPosition( position);
+//     }
+//     v_dash_ratio = dash_ratio;
+//     v_dash_opacity = dash_opacity;
+//     v_color = color;
+//     gl_PointSize = 3.0;
+// }`
+// 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, "center_position3d");
+//             gl.bindAttribLocation(program, 2, "radius");
+//             gl.bindAttribLocation(program, 3, "color");
+//             gl.bindAttribLocation(program, 4, "dash_ratio");
+//             gl.bindAttribLocation(program, 5, "dash_opacity");
+//         }
+//         this.cameraBindingPoint = 0;
+//         this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+//         const cameraBlockLocation = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+//         gl.uniformBlockBinding(program, cameraBlockLocation, this.cameraBindingPoint);
+//     }
+//     createVAO(centerObj, center3dObj, 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);
+//         }
+//         {  // make this a function end import from account module. 
+//             const { buffer, stride = 0, offset = 0 } = center3dObj;
+//             vaoAttributeLoader(gl, buffer, 1, 3, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = radiusObj;
+//             vaoAttributeLoader(gl, buffer, 2, 1, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = colorObj;
+//             vaoAttributeLoader(gl, buffer, 3, 4, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = dashRatioObj;
+//             vaoAttributeLoader(gl, buffer, 4, 1, stride, offset, divisor);
+//         }
+//         {
+//             const { buffer, stride = 0, offset = 0 } = dashOpacityObj;
+//             vaoAttributeLoader(gl, buffer, 5, 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);
+//         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)
+// });