@pirireis/webglobeplugins 0.6.28-b → 0.6.28-c

package/circle-line-chain/plugin.js

@@ -145,7 +145,7 @@ export class CircleLineChainPlugin {
                         'bufferManager': new BufferManager(gl, 1 * _circleFlatEdgeCount, { bufferType, initialCapacity }),
                         'adaptor': (item) => {
                             if (item.circleProperties?.circleDashAngle) return new Float32Array([item.circleProperties.circleDashAngle / 360]);
-                            return new populateFloat32Array.fillFloat32Array(_circleFlatEdgeCount, item.chainProperties.circleDashAngle / 360);
+                            return populateFloat32Array.fillFloat32Array(_circleFlatEdgeCount, item.chainProperties.circleDashAngle / 360);
                         }
                     }],
                     ["rgbaCircleMercator", {                            // 62

package/package.json

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

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

@@ -1,360 +0,0 @@
-import { CameraUniformBlockString, CameraUniformBlockTotem } from "../totems";
-import { longLatRadToMercator, longLatRadToCartesian3D, cartesian3DToGLPosition, mercatorXYToGLPosition, POLE } from "../../util/shaderfunctions/geometrytransformations";
-import { createProgram } from "../../util";
-import { noRegisterGlobeProgramCache, globeProgramCache } from "../programcache";
-import BufferOffsetManger from "../../util/account/bufferoffsetmanager";
-import { programCache } from "../rings/distancering/circleflatprogram";
-
-const GLOBE_MIDPOINT_COUNT = 100;
-const ITEM_SIZE = 9;
-
-const vertexShader = `#version 300 es
-precision highp float;
-${CameraUniformBlockString}
-${longLatRadToMercator}
-${longLatRadToCartesian3D}
-${cartesian3DToGLPosition}
-${mercatorXYToGLPosition}
-
-
-in vec2 start_position;
-in vec2 end_position;
-in float dash_ratio;
-in vec4 color;
-in float dash_opacity;
-out vec4 v_color;
-out vec2 v_limp;
-out float interpolation;
-out float v_dash_ratio;
-out float v_dash_opacity;
-
-
-void main() {
-    vec2 longLat;
-    if (is3D) {
-        interpolation = float(gl_VertexID) / ${GLOBE_MIDPOINT_COUNT - 1}.0;
-        longLat = mix(start_position, end_position, interpolation);
-        vec3 cartesian = longLatRadToCartesian3D(longLat);
-        gl_Position = cartesian3DToGLPosition(cartesian);
-        v_limp = vec2(0.0, 0.0);
-    } else {
-        interpolation = float(gl_VertexID);
-        if (gl_VertexID % 2 == 0) {
-            longLat = start_position;
-        } else {
-            longLat = end_position;
-        }
-        vec2 mercator = longLatRadToMercator(longLat);
-        v_limp = mercator;
-        gl_Position = mercatorXYToGLPosition(mercator);
-    }
-    // if ( gl_VertexID % 2 == 0) {v_color = color;}
-    // else {v_color = vec4(0.0, 0.0, 0.0, 0.0);}
-    v_color = color;
-    v_dash_ratio = dash_ratio;
-    v_dash_opacity = dash_opacity;
-}
-`;
-
-const fragmentShader = `#version 300 es
-${POLE}
-precision highp float;
-uniform float opacity;
-in vec4 v_color;
-out vec4 color;
-in float interpolation;
-in float v_dash_ratio;
-in vec2 v_limp;
-in float v_dash_opacity;
-void main() {
-    if (v_limp.x < -POLE || v_limp.x > POLE || v_limp.y < -POLE || v_limp.y > POLE) { discard; }
-    color = v_color;
-    color.a *= opacity;
-    if ( v_dash_ratio >= 1.0 ) { return; }
-    if (interpolation > 0.95) { 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.program = createProgram(this.gl, vertexShader, fragmentShader);
-        this._lastOpacity = 1.0;
-        const { gl, program } = this;
-        {
-            // assign attribute locations
-            gl.bindAttribLocation(program, 0, "start_position");
-            gl.bindAttribLocation(program, 1, "end_position");
-            gl.bindAttribLocation(program, 2, "dash_ratio");
-            gl.bindAttribLocation(program, 3, "color");
-            gl.bindAttribLocation(program, 4, "dash_opacity");
-        }
-
-        {
-            this._opacityLocation = gl.getUniformLocation(program, "opacity");
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1f(this._opacityLocation, this._lastOpacity);
-            gl.useProgram(currentProgram);
-
-        }
-
-        this.cameraBlockBindingPoint = 0;
-        const cameraBlockIndex = this.gl.getUniformBlockIndex(this.program, "CameraUniformBlock");
-        this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
-        gl.uniformBlockBinding(this.program, cameraBlockIndex, this.cameraBlockBindingPoint);
-
-
-    }
-
-
-    draw(vao, length, opacity) {
-        const { gl, program, globe, cameraBlockTotem, cameraBlockBindingPoint } = this;
-        gl.useProgram(program);
-        cameraBlockTotem.bind(cameraBlockBindingPoint);
-        gl.bindVertexArray(vao);
-        if (opacity !== this._lastOpacity) {
-            gl.uniform1f(this._opacityLocation, opacity);
-            this._lastOpacity = opacity;
-        }
-        const drawCount = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
-        // gl.disable(gl.DEPTH_TEST);
-        gl.drawArraysInstanced(gl.LINE_STRIP, 0, drawCount, length);
-        gl.bindVertexArray(null);
-        cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        // gl.enable(gl.DEPTH_TEST);
-    }
-
-
-    createBufferManager({ capacity = 10, bufferType = "DYNAMIC_DRAW" } = {}) {
-        return new BufferManager(this.globe, { capacity, bufferType });
-    }
-
-
-
-    //
-    createVAO(startPotisionBufferObj, endPositionBufferObj, dashRatioBufferObj, dashOpacityBufferObj, colorBufferObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-        {
-            const { buffer, stride = 0, offset = 0 } = startPotisionBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(0, 1);
-        }
-        {
-
-            const { buffer, stride = 0, offset = 0 } = endPositionBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(1);
-            gl.vertexAttribPointer(1, 2, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(1, 1);
-        }
-
-        {
-            const { buffer, stride = 0, offset = 0 } = dashRatioBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(2);
-            gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(2, 1);
-        }
-
-        {
-            const { buffer, stride = 0, offset = 0 } = colorBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(3);
-            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(3, 1);
-        }
-
-        {
-            const { buffer, stride = 0, offset = 0 } = dashOpacityBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(4);
-            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(4, 1);
-        }
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-
-    }
-
-
-    free() {
-        if (this.isFreed) return;
-        programCache.releaseProgram(this.globe, CameraUniformBlockTotem);
-        this.gl.deleteProgram(this.program);
-        this.isFreed = true;
-    }
-}
-
-
-class BufferManager extends BufferOffsetManger {
-
-    constructor(globe, { capacity = 10, bufferType = "DYNAMIC_DRAW", } = {}) {
-        super(ITEM_SIZE, { capacity, bufferType });
-        this.globe = globe
-        this.gl = globe.gl;
-        this.buffer = this.gl.createBuffer();
-
-        const { gl, buffer } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, capacity * ITEM_SIZE * 4, gl[bufferType]);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-
-        this.vao = gl.createVertexArray();
-        {
-            gl.bindVertexArray(this.vao);
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(0);
-            gl.vertexAttribPointer(0, 2, gl.FLOAT, false, ITEM_SIZE * 4, 0);
-            gl.enableVertexAttribArray(1);
-            gl.vertexAttribPointer(1, 2, gl.FLOAT, false, ITEM_SIZE * 4, 8);
-            gl.enableVertexAttribArray(2);
-            gl.vertexAttribPointer(2, 1, gl.FLOAT, false, ITEM_SIZE * 4, 16);
-            gl.enableVertexAttribArray(3);
-            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, ITEM_SIZE * 4, 20);
-            gl.vertexAttribDivisor(0, 1);
-            gl.vertexAttribDivisor(1, 1);
-            gl.vertexAttribDivisor(2, 1);
-            gl.vertexAttribDivisor(3, 1);
-            gl.bindVertexArray(null);
-        }
-    }
-
-
-    /**
-     * 
-     * @param {Array<{key:string, long:number, lat:number, endLong:number, endLat:number, rgba:[4numbers] }} items 
-     */
-    insertBulk(items) {
-        this.autoExtendBuffer(items.length)
-        const { gl, buffer, globe } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, endLong, endLat, rgba, dashRatio = 1 } of items) {
-            const payload = new Float32Array([
-                long,
-                lat,
-                endLong,
-                endLat,
-                dashRatio,
-                ...rgba]);
-
-            const offset = this.getOffset(key) | this.nextOffset();
-            gl.bufferSubData(gl.ARRAY_BUFFER, offset, payload);
-            this.setOffset(key, offset);
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        globe.DrawRender();
-    }
-
-    /**
-     * 
-     * @param {Array<{key:string, long:number, lat:number, endLong:number, endLat:number, rgba:[4numbers] }} items 
-     */
-    updateBulk(items) {
-        const { gl, buffer, globe } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, endLong, endLat, rgba, dashRatio = 1 } of items) {
-            const payload = new Float32Array([
-                long,
-                lat,
-                endLong,
-                endLat,
-                dashRatio,
-                ...rgba]);
-            const offset = this.getOffset(key);
-            if (offset !== undefined) {
-                gl.bufferSubData(gl.ARRAY_BUFFER, offset, payload);
-            } else {
-                console.warn("key not found", key);
-            }
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        globe.DrawRender();
-    }
-
-    /**
-     * 
-     * @param {Array<{key:string, long:number, lat:number, endLong:number, endLat:number }} items 
-     */
-    updateCoordinatesBulk(items) {
-        const { gl, buffer, globe } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, long, lat, endLong, endLat, dashRatio = 1 } of items) {
-            const payload = new Float32Array([
-                long,
-                lat,
-                endLong,
-                endLat,
-                dashRatio]);
-            const offset = this.getOffset(key);
-            if (offset !== undefined) {
-                gl.bufferSubData(gl.ARRAY_BUFFER, offset, payload);
-            } else {
-                console.warn("key not found", key);
-            }
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        globe.DrawRender();
-    }
-
-
-    /**
-     * 
-     * @param {Array<{key:string, rgba:[4numbers] }} items 
-     */
-    updateColorBulk(items) {
-        const { gl, buffer, globe } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        for (let { key, rgba } of items) {
-            const payload = new Float32Array([...rgba]);
-            const offset = this.getOffset(key);
-            if (offset !== undefined) {
-                gl.bufferSubData(gl.ARRAY_BUFFER, offset + 20, payload);
-            } else {
-                console.warn("key not found", key);
-            }
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        globe.DrawRender();
-    }
-
-
-    /**
-     * 
-     * @param {Array<string>} keys 
-     */
-    deleteBulk(keys) {
-        const { gl, buffer, globe } = this;
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        const emptyBlock = new Float32Array(ITEM_SIZE).fill(0);
-        for (let key of keys) {
-            const offset = this.getOffset(key);
-            if (offset !== undefined) {
-                this.deleteFromAccount(key);
-                gl.bufferSubData(gl.ARRAY_BUFFER, offset, emptyBlock);
-            } else {
-                console.warn("key not found", key);
-            }
-        }
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        globe.DrawRender();
-    }
-}
-
-
-export const LineOnGlobeCache = Object.freeze({
-    get: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
-    release: (globe) => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
-});
-