@pirireis/webglobeplugins 0.16.0 → 0.16.1

package/partialrings/program.js

@@ -1,33 +1,16 @@
-import { createProgram, shaderfunctions } from "../util";
-import { CameraUniformBlockTotem, CameraUniformBlockString, noRegisterGlobeProgramCache, globeProgramCache } from "../programs";
-import BufferManager from "./buffer-manager";
-import {
-    POLE,
-    PI,
-    longLatRadToMercator,
-    mercatorXYToGLPosition,
-    longLatRadToCartesian3D,
-    circleLimpFromLongLatRadCenterCartesian3D,
-    circleLimpFromLongLatRadCenterMercatorRealDistance,
-    cartesian3DToGLPosition
-
-
-} from "../util/shaderfunctions/geometrytransformations";
-
-
-/**
- * TODO:
- * 1. Triangle face looks at screen. if rotation angle is positive the last vertex must be the faintest.
- * 
- */
-
-const drawModeMap = Object.freeze({
-    LINE_STRIP: 0,
-    TRIANGLE_FAN: 1,
-});
-
-
-
+import { createProgram, shaderfunctions } from "../util";
+import { CameraUniformBlockTotem, CameraUniformBlockString, noRegisterGlobeProgramCache, globeProgramCache } from "../programs";
+import BufferManager from "./buffer-manager";
+import { POLE, PI, longLatRadToMercator, mercatorXYToGLPosition, longLatRadToCartesian3D, circleLimpFromLongLatRadCenterCartesian3D, circleLimpFromLongLatRadCenterMercatorRealDistance, cartesian3DToGLPosition } from "../util/shaderfunctions/geometrytransformations";
+/**
+ * TODO:
+ * 1. Triangle face looks at screen. if rotation angle is positive the last vertex must be the faintest.
+ *
+ */
+const drawModeMap = Object.freeze({
+    LINE_STRIP: 0,
+    TRIANGLE_FAN: 1,
+});
 const vertexShaderSource = `#version 300 es
 
 ${CameraUniformBlockString} 
@@ -105,9 +88,7 @@ void main() {
     }
 
     gl_PointSize = 10.0;
-}`;
-
-
+}`;
 const fragmentShaderSource = `#version 300 es` + POLE + PI + `
 precision highp float;
 // flat in int vid;
@@ -122,203 +103,177 @@ void main() {
     // if ( mod(v_angle * v_phase,  PI / 90.0 ) < (PI / 180.0)) { discard; }
     if ( v_pos.x < -POLE || v_pos.x > POLE || v_pos.y < -POLE || v_pos.y > POLE ) { discard; }
     outColor = v_color;
-}`;
-
-export const ITEM_SIZE = 10;
-
-export class Logic {
-
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this._lastMode = 0;
-        this._lastEdgeCount = 64;
-        this._lastAlphaMultiplier = 1.0;
-
-        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
-        const { gl, program } = this;
-        {   // set attributes locations 
-            gl.bindAttribLocation(program, 0, 'center');
-            gl.bindAttribLocation(program, 1, 'start_angle');
-            gl.bindAttribLocation(program, 2, 'tail_angle');
-            gl.bindAttribLocation(program, 3, 'color');
-            gl.bindAttribLocation(program, 4, 'radius');
-            gl.bindAttribLocation(program, 5, 'color_mode');
-            // vao
-            // instanced draw read 1 
-        }
-        {   // Uniforms
-            this._edgeCountLocation = gl.getUniformLocation(program, 'edge_count');
-            this._draw_modeLocation = gl.getUniformLocation(program, 'draw_mode');
-            this._plugin_alpha_multiplierLocation = gl.getUniformLocation(program, 'plugin_alpha_multiplier');
-            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-            gl.useProgram(program);
-            gl.uniform1i(this._draw_modeLocation, this._lastMode);
-            gl.uniform1f(this._edgeCountLocation, this._lastEdgeCount);
-            gl.uniform1f(this._plugin_alpha_multiplierLocation, 1.0);
-
-            this.cameraBlockBindingPoint = 0;
-            this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
-            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-
-            gl.useProgram(currentProgram);
-        }
-
-    }
-
-
-
-    draw(length, vao, edgeCount, alphaMultiplier, drawMode) {
-        const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this
-
-        // gl.disable(gl.DEPTH_TEST);
-        gl.useProgram(program);
-        if (drawMode !== this._lastMode) {
-            gl.uniform1i(this._draw_modeLocation, drawModeMap[drawMode]);
-            this._lastMode = drawMode;
-        }
-        if (edgeCount !== this._lastEdgeCount) {
-            gl.uniform1f(this._edgeCountLocation, edgeCount);
-            this._lastEdgeCount = edgeCount;
-        }
-        if (alphaMultiplier !== this._lastAlphaMultiplier) {
-            gl.uniform1f(this._plugin_alpha_multiplierLocation, alphaMultiplier);
-            this._lastAlphaMultiplier = alphaMultiplier;
-        }
-        const overdraw = drawModeMap[drawMode];
-        cameraBlockTotem.bind(cameraBlockBindingPoint);
-        gl.bindVertexArray(vao);
-        gl.drawArraysInstanced(gl[drawMode], 0, edgeCount + overdraw, length);
-        cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        gl.bindVertexArray(null);
-        // gl.enable(gl.DEPTH_TEST);
-    }
-
-
-    free() {
-        noRegisterGlobeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
-        this.gl.deleteProgram(this.program);
-        this.program = null;
-    }
-
-
-    getVaoBuffer() {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        const buffer = gl.createBuffer();
-        gl.bindVertexArray(vao);
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-
-        const stride = ITEM_SIZE * 4;
-        let offset = 0;
-        gl.enableVertexAttribArray(0);
-        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
-        offset += 2 * 4;
-        gl.enableVertexAttribArray(1);
-        gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
-        offset += 1 * 4;
-        gl.enableVertexAttribArray(2);
-        gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
-        offset += 1 * 4;
-        gl.enableVertexAttribArray(3);
-        gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
-        offset += 4 * 4;
-        gl.enableVertexAttribArray(4);
-        gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
-        offset += 1 * 4;
-        gl.enableVertexAttribArray(5);
-        gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
-
-        gl.vertexAttribDivisor(0, 1);
-        gl.vertexAttribDivisor(1, 1);
-        gl.vertexAttribDivisor(2, 1);
-        gl.vertexAttribDivisor(3, 1);
-        gl.vertexAttribDivisor(4, 1);
-        gl.vertexAttribDivisor(5, 1);
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-
-        return {
-            vao,
-            buffer,
-        }
-    }
-
-    /**
-     * in vec2 center; // long, lat in radian
-in float start_angle; // the start of partial circle from bearing point
-in float tail_angle; // the rotation of the partial circle
-in vec4 color;
-in float radius; // in meter
-in float color_mode; // 0.0: constant, 1.0: fading, 2.0: hide
-     */
-
-    createVAO(centerObj, startAngleObj, tailAngleObj, colorObj, radiusObj, colorModeObj) {
-
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-
-        {
-            const { buffer, stride, offset } = centerObj;
-            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, offset } = startAngleObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(1);
-            gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(1, 1);
-        }
-        {
-            const { buffer, stride, offset } = tailAngleObj;
-            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, offset } = colorObj;
-            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, offset } = radiusObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(4);
-            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(4, 1);
-        }
-        {
-            const { buffer, stride, offset } = colorModeObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(5);
-            gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(5, 1);
-        }
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-    }
-
-
-    getBufferManagerAndVao({ capacity = 10, bufferType = "DYNAMIC_DRAW" } = {}) {
-        const { vao, buffer } = this.getVaoBuffer();
-        return {
-            bufferManager: new BufferManager(this.globe, this.gl, buffer, { capacity, bufferType }),
-            vao
-        };
-    }
-}
-
-export const programCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
-});
+}`;
+export const ITEM_SIZE = 10;
+export class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._lastMode = 0;
+        this._lastEdgeCount = 64;
+        this._lastAlphaMultiplier = 1.0;
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+        const { gl, program } = this;
+        { // set attributes locations 
+            gl.bindAttribLocation(program, 0, 'center');
+            gl.bindAttribLocation(program, 1, 'start_angle');
+            gl.bindAttribLocation(program, 2, 'tail_angle');
+            gl.bindAttribLocation(program, 3, 'color');
+            gl.bindAttribLocation(program, 4, 'radius');
+            gl.bindAttribLocation(program, 5, 'color_mode');
+            // vao
+            // instanced draw read 1 
+        }
+        { // Uniforms
+            this._edgeCountLocation = gl.getUniformLocation(program, 'edge_count');
+            this._draw_modeLocation = gl.getUniformLocation(program, 'draw_mode');
+            this._plugin_alpha_multiplierLocation = gl.getUniformLocation(program, 'plugin_alpha_multiplier');
+            const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+            gl.useProgram(program);
+            gl.uniform1i(this._draw_modeLocation, this._lastMode);
+            gl.uniform1f(this._edgeCountLocation, this._lastEdgeCount);
+            gl.uniform1f(this._plugin_alpha_multiplierLocation, 1.0);
+            this.cameraBlockBindingPoint = 0;
+            this.cameraBlockTotem = globeProgramCache.getProgram(globe, CameraUniformBlockTotem);
+            const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+            gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
+            gl.useProgram(currentProgram);
+        }
+    }
+    draw(length, vao, edgeCount, alphaMultiplier, drawMode) {
+        const { gl, program, cameraBlockTotem, cameraBlockBindingPoint } = this;
+        // gl.disable(gl.DEPTH_TEST);
+        gl.useProgram(program);
+        if (drawMode !== this._lastMode) {
+            gl.uniform1i(this._draw_modeLocation, drawModeMap[drawMode]);
+            this._lastMode = drawMode;
+        }
+        if (edgeCount !== this._lastEdgeCount) {
+            gl.uniform1f(this._edgeCountLocation, edgeCount);
+            this._lastEdgeCount = edgeCount;
+        }
+        if (alphaMultiplier !== this._lastAlphaMultiplier) {
+            gl.uniform1f(this._plugin_alpha_multiplierLocation, alphaMultiplier);
+            this._lastAlphaMultiplier = alphaMultiplier;
+        }
+        const overdraw = drawModeMap[drawMode];
+        cameraBlockTotem.bind(cameraBlockBindingPoint);
+        gl.bindVertexArray(vao);
+        gl.drawArraysInstanced(gl[drawMode], 0, edgeCount + overdraw, length);
+        cameraBlockTotem.unbind(cameraBlockBindingPoint);
+        gl.bindVertexArray(null);
+        // gl.enable(gl.DEPTH_TEST);
+    }
+    free() {
+        noRegisterGlobeProgramCache.releaseProgram(this.globe, CameraUniformBlockTotem);
+        this.gl.deleteProgram(this.program);
+        this.program = null;
+    }
+    getVaoBuffer() {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const buffer = gl.createBuffer();
+        gl.bindVertexArray(vao);
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        const stride = ITEM_SIZE * 4;
+        let offset = 0;
+        gl.enableVertexAttribArray(0);
+        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, stride, offset);
+        offset += 2 * 4;
+        gl.enableVertexAttribArray(1);
+        gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
+        offset += 1 * 4;
+        gl.enableVertexAttribArray(2);
+        gl.vertexAttribPointer(2, 1, gl.FLOAT, false, stride, offset);
+        offset += 1 * 4;
+        gl.enableVertexAttribArray(3);
+        gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
+        offset += 4 * 4;
+        gl.enableVertexAttribArray(4);
+        gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
+        offset += 1 * 4;
+        gl.enableVertexAttribArray(5);
+        gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
+        gl.vertexAttribDivisor(0, 1);
+        gl.vertexAttribDivisor(1, 1);
+        gl.vertexAttribDivisor(2, 1);
+        gl.vertexAttribDivisor(3, 1);
+        gl.vertexAttribDivisor(4, 1);
+        gl.vertexAttribDivisor(5, 1);
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return {
+            vao,
+            buffer,
+        };
+    }
+    /**
+     * in vec2 center; // long, lat in radian
+in float start_angle; // the start of partial circle from bearing point
+in float tail_angle; // the rotation of the partial circle
+in vec4 color;
+in float radius; // in meter
+in float color_mode; // 0.0: constant, 1.0: fading, 2.0: hide
+     */
+    createVAO(centerObj, startAngleObj, tailAngleObj, colorObj, radiusObj, colorModeObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        {
+            const { buffer, stride, offset } = centerObj;
+            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, offset } = startAngleObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(1);
+            gl.vertexAttribPointer(1, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(1, 1);
+        }
+        {
+            const { buffer, stride, offset } = tailAngleObj;
+            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, offset } = colorObj;
+            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, offset } = radiusObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(4);
+            gl.vertexAttribPointer(4, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(4, 1);
+        }
+        {
+            const { buffer, stride, offset } = colorModeObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(5);
+            gl.vertexAttribPointer(5, 1, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(5, 1);
+        }
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    getBufferManagerAndVao({ capacity = 10, bufferType = "DYNAMIC_DRAW" } = {}) {
+        const { vao, buffer } = this.getVaoBuffer();
+        return {
+            bufferManager: new BufferManager(this.globe, this.gl, buffer, { capacity, bufferType }),
+            vao
+        };
+    }
+}
+export const programCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+});