@pirireis/webglobeplugins 1.0.2 → 1.0.4

package/{programs → webglobeplugins/programs}/totems/gpu-selection-uniform-block.js

@@ -1,132 +1,104 @@
-import { globeProgramCache } from "../programcache";
-// Loads mouse position to buffer
-// TODO implement it
+import { globeProgramCache } from "../programcache";
+// Loads mouse position to buffer
+// TODO implement it
 export const CameraUniformBlockString = `
 layout(std140) uniform GpuSelectionUniformBlock {
     vec2 mouse_pixel_position;
     vec2 mouse_radian_long_lat;
 }; // 11 lines
-`;
-
-
-
-export default class
-
-    CameraUniformBlockTotem {
-
-
-    constructor() {
-        this.id = "CameraUniformBlockTotem"
-        this.description = `Sets a uniform block and provides buffer for it. The following is the glsl uniform block:` + CameraUniformBlockString;
-        this.gl = null;
-        this.globe = null;
-        this.ubo = null;
-    }
-
-
-    init(globe, gl) {
-        this.gl = gl;
-        this.globe = globe;
-        this.ubo = this._createUBO();
-        this.traslateFloat32 = new Float32Array(3);
-        this.mapWHFloat32 = new Float32Array(2);
-        this.setGeometry();
-        this.resize();
-    }
-
-
-    _createUBO() {
-        const { gl } = this;
-        const ubo = gl.createBuffer();
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferData(gl.UNIFORM_BUFFER, 164, gl.STREAM_DRAW);
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, ubo);
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-        return ubo;
-    }
-
-
-    resize() {
-        const { gl, globe, ubo } = this;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferSubData(gl.UNIFORM_BUFFER, 152, new Float32Array([globe.api_ScrW(), globe.api_ScrH()]));
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-    }
-
-
-    setGeometry() {
-        const { gl, globe, ubo } = this;
-        const is3D = globe.api_GetCurrentGeometry() === 0;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        gl.bufferSubData(gl.UNIFORM_BUFFER, 140, new Float32Array([is3D]));
-    }
-
-    draw3D(projection, modelView, translate) {
-
-        const { gl, traslateFloat32, ubo, mapWHFloat32, globe } = this;
-        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
-        {   // view, projection, translate
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
-            traslateFloat32.set([translate.x, translate.y, translate.z], 0);
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
-        }
-        {
-            // zoom level
-            gl.bufferSubData(gl.UNIFORM_BUFFER, 160, new Float32Array([globe.api_GetCurrentLODWithDecimal()]));
-        }
-        {   // mapWH
-            if (globe.api_GetCurrentGeometry() === 1) {
-                const { width, height } = globe.api_GetCurrentWorldWH();
-                mapWHFloat32.set([width, height]);
-                gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
-            }
-        }
-        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
-    }
-
-
-    getUBO() {
-        return this.ubo;
-    }
-
-
-    bind(bindingPoint) {
-        const { gl, ubo } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
-
-    }
-
-    unbind(bindingPoint) {
-        const { gl } = this;
-        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
-    }
-
-
-    free() {
-        const { gl, ubo } = this;
-        gl.deleteBuffer(ubo);
-    }
-
-    readBuffer() {
-        const result = new Float32Array(41);
-        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, this.ubo);
-        this.gl.getBufferSubData(this.gl.UNIFORM_BUFFER, 0, result);
-        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, null);
-        return {
-            view: result.slice(0, 16),
-            projection: result.slice(16, 32),
-            translate: result.slice(32, 35),
-            is3D: result[35],
-            mapWH: result.slice(36, 38),
-            screenWH: result.slice(38, 40),
-            z_level: result[40]
-        }
-    }
-}
-
-
-export const CameraUniformBlockTotemCache = Object.freeze({
-    get: (globe) => { return globeProgramCache.getProgram(globe, CameraUniformBlockTotem) },
-    release: (globe) => { return globeProgramCache.releaseProgram(globe, CameraUniformBlockTotem) }
-});
+`;
+export default class CameraUniformBlockTotem {
+    constructor() {
+        this.id = "CameraUniformBlockTotem";
+        this.description = `Sets a uniform block and provides buffer for it. The following is the glsl uniform block:` + CameraUniformBlockString;
+        this.gl = null;
+        this.globe = null;
+        this.ubo = null;
+    }
+    init(globe, gl) {
+        this.gl = gl;
+        this.globe = globe;
+        this.ubo = this._createUBO();
+        this.traslateFloat32 = new Float32Array(3);
+        this.mapWHFloat32 = new Float32Array(2);
+        this.setGeometry();
+        this.resize();
+    }
+    _createUBO() {
+        const { gl } = this;
+        const ubo = gl.createBuffer();
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferData(gl.UNIFORM_BUFFER, 164, gl.STREAM_DRAW);
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, 0, ubo);
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+        return ubo;
+    }
+    resize() {
+        const { gl, globe, ubo } = this;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 152, new Float32Array([globe.api_ScrW(), globe.api_ScrH()]));
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+    }
+    setGeometry() {
+        const { gl, globe, ubo } = this;
+        const is3D = globe.api_GetCurrentGeometry() === 0;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        gl.bufferSubData(gl.UNIFORM_BUFFER, 140, new Float32Array([is3D]));
+    }
+    draw3D(projection, modelView, translate) {
+        const { gl, traslateFloat32, ubo, mapWHFloat32, globe } = this;
+        gl.bindBuffer(gl.UNIFORM_BUFFER, ubo);
+        { // view, projection, translate
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 0, modelView);
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 64, projection);
+            traslateFloat32.set([translate.x, translate.y, translate.z], 0);
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 128, traslateFloat32);
+        }
+        {
+            // zoom level
+            gl.bufferSubData(gl.UNIFORM_BUFFER, 160, new Float32Array([globe.api_GetCurrentLODWithDecimal()]));
+        }
+        { // mapWH
+            if (globe.api_GetCurrentGeometry() === 1) {
+                const { width, height } = globe.api_GetCurrentWorldWH();
+                mapWHFloat32.set([width, height]);
+                gl.bufferSubData(gl.UNIFORM_BUFFER, 144, mapWHFloat32);
+            }
+        }
+        gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+    }
+    getUBO() {
+        return this.ubo;
+    }
+    bind(bindingPoint) {
+        const { gl, ubo } = this;
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, ubo);
+    }
+    unbind(bindingPoint) {
+        const { gl } = this;
+        gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, null);
+    }
+    free() {
+        const { gl, ubo } = this;
+        gl.deleteBuffer(ubo);
+    }
+    readBuffer() {
+        const result = new Float32Array(41);
+        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, this.ubo);
+        this.gl.getBufferSubData(this.gl.UNIFORM_BUFFER, 0, result);
+        this.gl.bindBuffer(this.gl.UNIFORM_BUFFER, null);
+        return {
+            view: result.slice(0, 16),
+            projection: result.slice(16, 32),
+            translate: result.slice(32, 35),
+            is3D: result[35],
+            mapWH: result.slice(36, 38),
+            screenWH: result.slice(38, 40),
+            z_level: result[40]
+        };
+    }
+}
+export const CameraUniformBlockTotemCache = Object.freeze({
+    get: (globe) => { return globeProgramCache.getProgram(globe, CameraUniformBlockTotem); },
+    release: (globe) => { return globeProgramCache.releaseProgram(globe, CameraUniformBlockTotem); }
+});

package/{programs/totems/index.ts → webglobeplugins/programs/totems/index.js}

@@ -1,2 +1,2 @@
-import { CameraUniformBlockTotem, CameraUniformBlockString, CameraUniformBlockTotemCache } from "./camerauniformblock";
-export { CameraUniformBlockTotem, CameraUniformBlockString, CameraUniformBlockTotemCache };
+import { CameraUniformBlockTotem, CameraUniformBlockString, CameraUniformBlockTotemCache } from "./camerauniformblock";
+export { CameraUniformBlockTotem, CameraUniformBlockString, CameraUniformBlockTotemCache };

package/{programs → webglobeplugins/programs}/two-d/pixel-padding-for-compass.js

@@ -1,7 +1,7 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { noRegisterGlobeProgramCache } from "../programcache";
-const vertexCount = 720;
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { noRegisterGlobeProgramCache } from "../programcache";
+const vertexCount = 720;
 const vertexShaderSource = `#version 300 es
 ${CameraUniformBlockString}
 
@@ -57,8 +57,7 @@ void main(){
     v_rgba.a *= plugin_opacity;
     gl_PointSize = 10.0;
 }
-`
-
+`;
 const fragmentShaderSource = `#version 300 es
 precision highp float;
 in vec4 v_rgba;
@@ -66,98 +65,85 @@ out vec4 color;
 void main(){
     color = v_rgba;
 }
-`
-
-
-class Logic {
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-        this._lastOpacity = 1;
-        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
-        const { gl, program } = this;
-        gl.bindAttribLocation(program, 0, "screen_coordinate");
-        gl.bindAttribLocation(program, 1, "pixel_radius_small_ratio");
-        gl.bindAttribLocation(program, 2, "pixel_radius_big_ratio");
-        gl.bindAttribLocation(program, 3, "rgba");
-        this._opacityLocation = gl.getUniformLocation(program, "plugin_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 = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-    }
-
-
-    draw(vao, length, opacity) {
-        const { globe, gl, program, cameraBlockTotem, cameraBlockBindingPoint, _opacityLocation } = this;
-        if (globe.api_GetCurrentGeometry() === 0) return;
-        gl.useProgram(program);
-        cameraBlockTotem.bind(cameraBlockBindingPoint);
-        if (opacity !== this._lastOpacity) {
-            this._lastOpacity = opacity;
-            gl.uniform1f(_opacityLocation, opacity);
-        }
-        gl.bindVertexArray(vao);
-        gl.drawArraysInstanced(gl.LINES, 0, vertexCount, length);
-        gl.bindVertexArray(null);
-        cameraBlockTotem.unbind(cameraBlockBindingPoint);
-    }
-
-    createVAO(screenCoordsBufferObj, pixelRadiusRatioSmallBufferObj, pixelRadiusRatioBigBufferObj, rgbaBufferObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-        {
-            const { buffer, stride = 0, offset = 0 } = screenCoordsBufferObj;
-            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 } = pixelRadiusRatioSmallBufferObj;
-            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 = 0, offset = 0 } = pixelRadiusRatioBigBufferObj;
-            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 } = rgbaBufferObj;
-            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-            gl.enableVertexAttribArray(3);
-            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
-            gl.vertexAttribDivisor(3, 1);
-        }
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-
-    }
-
-
-
-
-    free() {
-        const { globe } = this;
-        CameraUniformBlockTotemCache.release(globe);
-    }
-}
-
-
-
-export const PixelPaddingForFlatCompassCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
-})
+`;
+class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._lastOpacity = 1;
+        this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
+        const { gl, program } = this;
+        gl.bindAttribLocation(program, 0, "screen_coordinate");
+        gl.bindAttribLocation(program, 1, "pixel_radius_small_ratio");
+        gl.bindAttribLocation(program, 2, "pixel_radius_big_ratio");
+        gl.bindAttribLocation(program, 3, "rgba");
+        this._opacityLocation = gl.getUniformLocation(program, "plugin_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 = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
+    }
+    draw(vao, length, opacity) {
+        const { globe, gl, program, cameraBlockTotem, cameraBlockBindingPoint, _opacityLocation } = this;
+        if (globe.api_GetCurrentGeometry() === 0)
+            return;
+        gl.useProgram(program);
+        cameraBlockTotem.bind(cameraBlockBindingPoint);
+        if (opacity !== this._lastOpacity) {
+            this._lastOpacity = opacity;
+            gl.uniform1f(_opacityLocation, opacity);
+        }
+        gl.bindVertexArray(vao);
+        gl.drawArraysInstanced(gl.LINES, 0, vertexCount, length);
+        gl.bindVertexArray(null);
+        cameraBlockTotem.unbind(cameraBlockBindingPoint);
+    }
+    createVAO(screenCoordsBufferObj, pixelRadiusRatioSmallBufferObj, pixelRadiusRatioBigBufferObj, rgbaBufferObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        {
+            const { buffer, stride = 0, offset = 0 } = screenCoordsBufferObj;
+            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 } = pixelRadiusRatioSmallBufferObj;
+            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 = 0, offset = 0 } = pixelRadiusRatioBigBufferObj;
+            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 } = rgbaBufferObj;
+            gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+            gl.enableVertexAttribArray(3);
+            gl.vertexAttribPointer(3, 4, gl.FLOAT, false, stride, offset);
+            gl.vertexAttribDivisor(3, 1);
+        }
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    free() {
+        const { globe } = this;
+        CameraUniformBlockTotemCache.release(globe);
+    }
+}
+export const PixelPaddingForFlatCompassCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+});

package/{programs → webglobeplugins/programs}/util.js

@@ -1,19 +1,14 @@
-
-
-function longlatbbox2normalbbox({ minLon = -180, maxLon = 180, minLat = -90, maxLat = 90 } = {}) {
-    // x
-    const horOffset = (minLon) * Math.PI / 180;
-    const horSize = (maxLon - minLon) * Math.PI / 180;
-    // y
-    const vertOffset = (90 - maxLat) * Math.PI / 180;
-    const vertSize = (maxLat - minLat) * Math.PI / 180;
-
-    const result = {
-        bboxOffsetRad: new Float32Array([horOffset, vertOffset]),
-        bboxSizeRad: new Float32Array([horSize, vertSize])
-    };
-    return result;
-}
-
-
-export { longlatbbox2normalbbox }
+function longlatbbox2normalbbox({ minLon = -180, maxLon = 180, minLat = -90, maxLat = 90 } = {}) {
+    // x
+    const horOffset = (minLon) * Math.PI / 180;
+    const horSize = (maxLon - minLon) * Math.PI / 180;
+    // y
+    const vertOffset = (90 - maxLat) * Math.PI / 180;
+    const vertSize = (maxLat - minLat) * Math.PI / 180;
+    const result = {
+        bboxOffsetRad: new Float32Array([horOffset, vertOffset]),
+        bboxSizeRad: new Float32Array([horSize, vertSize])
+    };
+    return result;
+}
+export { longlatbbox2normalbbox };

package/{programs/vectorfields/logics/constants.ts → webglobeplugins/programs/vectorfields/logics/constants.js}

@@ -1,5 +1,4 @@
-const UBO_BINDING_POINTS = {
-    SEAWAVE: 0,
-}
-
-export { UBO_BINDING_POINTS };
+const UBO_BINDING_POINTS = {
+    SEAWAVE: 0,
+};
+export { UBO_BINDING_POINTS };