@pirireis/webglobeplugins 0.15.35 → 0.16.0

package/programs/globeshell/wiggle/object.js

@@ -1,66 +1,93 @@
-import { globeProgramCache } from '../../programcache';
-import GlobeShellProgram from './logic';
-export default class GlobeShell {
-    constructor(gl, globe, { minLon = -180, maxLon = 180, minLat = -90, maxLat = 90, height = 0, u_opacity = 1, wiggleInKM = 0, wiggleSpeed = 0,
-    // eastWestTied, Not implemented yet
-     } = {}) {
-        this.gl = gl;
-        this.globe = globe;
-        this.program = globeProgramCache.getProgram(globe, GlobeShellProgram);
-        this.shellBlockManager = this.program.getShellBlockBufferManager();
-        this.update = this.shellBlockManager.update.bind(this.shellBlockManager);
-        this.innerTime = 0;
-        this.setBBox({ minLon, maxLon, minLat, maxLat });
-        this.setOpacity(u_opacity);
-        this.setHeight(height);
-        this.setWiggle({ wiggleSpeed, wiggleInKM });
-    }
-    setTexture(texture) {
-        this.texture = texture;
-        this.globe.DrawRender();
-    }
-    setHeight(height) {
-        this.shellBlockManager.update({ height });
-        this.globe.DrawRender();
-    }
-    setOpacity(opacity) {
-        this.shellBlockManager.update({ opacity });
-        this.globe.DrawRender();
-    }
-    setBBox({ minLon = -180, maxLon = 180, minLat = -90, maxLat = 90 } = {}) {
-        this.bbox = { minLon, maxLon, minLat, maxLat };
-        // 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 offset_rad = new Float32Array([horOffset, vertOffset]);
-        const size_rad = new Float32Array([horSize, vertSize]);
-        this.shellBlockManager.update({ gridSizeRad: size_rad, gridOffsetRad: offset_rad });
-        this.globe.DrawRender();
-    }
-    setWiggle({ wiggleSpeed = null, wiggleInKM = null }) {
-        if (wiggleInKM !== null)
-            this.wiggleInKM = wiggleInKM;
-        if (wiggleSpeed !== null)
-            this.wiggleSpeed = wiggleSpeed;
-        this.shellBlockManager.update({ wiggleInKM });
-    }
-    /**
-     *
-     * @param {*} program  modelView, projection, translate, mapWH, scrWH, should be set before calling this function
-     */
-    draw() {
-        this.program.draw(this.texture, this.shellBlockManager);
-        if (this.wiggleInKM > 0 && this.wiggleSpeed > 0) {
-            this.innerTime += this.wiggleSpeed;
-            this.shellBlockManager.update({ innerTime: this.innerTime });
-            this.globe.DrawRender();
-        }
-    }
-    free() {
-        globeProgramCache.releaseProgram(this.globe, GlobeShellProgram);
-        this.shellBlockManager.free();
-    }
-}
+
+import { globeProgramCache } from '../../programcache';
+import GlobeShellProgram from './logic';
+
+export default class GlobeShell {
+    constructor(gl, globe,
+        {
+            minLon = -180,
+            maxLon = 180,
+            minLat = -90,
+            maxLat = 90,
+            height = 0,
+            u_opacity = 1,
+            wiggleInKM = 0,
+            wiggleSpeed = 0,
+            // eastWestTied, Not implemented yet
+        } = {}) {
+        this.gl = gl;
+        this.globe = globe;
+        this.program = globeProgramCache.getProgram(globe, GlobeShellProgram);
+        this.shellBlockManager = this.program.getShellBlockBufferManager()
+        this.update = this.shellBlockManager.update.bind(this.shellBlockManager);
+        this.innerTime = 0;
+        this.setBBox({ minLon, maxLon, minLat, maxLat })
+        this.setOpacity(u_opacity);
+        this.setHeight(height);
+        this.setWiggle({ wiggleSpeed, wiggleInKM });
+    }
+
+
+    setTexture(texture) {
+        this.texture = texture;
+        this.globe.DrawRender();
+    }
+
+
+
+    setHeight(height) {
+        this.shellBlockManager.update({ height });
+        this.globe.DrawRender();
+    }
+
+    setOpacity(opacity) {
+        this.shellBlockManager.update({ opacity });
+        this.globe.DrawRender();
+    }
+
+    setBBox({ minLon = -180, maxLon = 180, minLat = -90, maxLat = 90 } = {}) {
+        this.bbox = { minLon, maxLon, minLat, maxLat };
+        // 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 offset_rad = new Float32Array([horOffset, vertOffset]);
+        const size_rad = new Float32Array([horSize, vertSize]);
+        this.shellBlockManager.update({ gridSizeRad: size_rad, gridOffsetRad: offset_rad });
+        this.globe.DrawRender();
+    }
+
+    setWiggle({ wiggleSpeed = null, wiggleInKM = null }) {
+        if (wiggleInKM !== null) this.wiggleInKM = wiggleInKM;
+        if (wiggleSpeed !== null) this.wiggleSpeed = wiggleSpeed;
+        this.shellBlockManager.update({ wiggleInKM });
+
+    }
+
+
+    /**
+     * 
+     * @param {*} program  modelView, projection, translate, mapWH, scrWH, should be set before calling this function
+     */
+    draw() {
+        this.program.draw(
+            this.texture,
+            this.shellBlockManager,
+        );
+        if (this.wiggleInKM > 0 && this.wiggleSpeed > 0) {
+            this.innerTime += this.wiggleSpeed;
+            this.shellBlockManager.update({ innerTime: this.innerTime });
+            this.globe.DrawRender();
+        }
+    }
+
+
+    free() {
+        globeProgramCache.releaseProgram(this.globe, GlobeShellProgram);
+        this.shellBlockManager.free();
+    }
+
+}

package/programs/helpers/blender/index.js

@@ -1 +0,0 @@
-"use strict";

package/programs/helpers/blender/program.js

@@ -1,7 +1,10 @@
-import { createProgram } from "../util";
-/**
- * Blends two float32textures with given ratio.
- */
+import { createProgram } from "../util";
+
+
+/**
+ * Blends two float32textures with given ratio.
+ */
+
 const vertexShader = `#version 300 es
 in vec2 a_position;
 out vec2 v_texCoord;
@@ -9,7 +12,8 @@ void main() {
     gl_Position = vec4(a_position, 0.0, 1.0);
     v_texCoord = a_position * 0.5 + 0.5;
 }
-`;
+`;
+
 const fragmentShader = `#version 300 es
 uniform sampler2D u_texture0;
 uniform sampler2D u_texture1;
@@ -21,56 +25,67 @@ void main() {
     vec4 color1 = texture(u_texture1, v_texCoord);
     outColor = mix(color0, color1, u_ratio);
 }
-`;
-export default class BlenderProgram {
-    constructor(gl) {
-        this.gl = gl;
-        this.programWrapper = this._createProgramWrapper();
-    }
-    _craeteProgramWrapper() {
-        const gl = this.gl;
-        const program = createProgram(gl, vertexShader, fragmentShader);
-        this.vao = gl.createVertexArray();
-        gl.bindVertexArray(this.vao);
-        this._buffer = gl.createBuffer();
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
-            -1, -1,
-            1, -1,
-            -1, 1,
-            -1, 1,
-            1, -1,
-            1, 1,
-        ]), gl.STATIC_DRAW);
-        gl.enableVertexAttribArray(0);
-        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return { program, uniforms: { u_texture0: gl.getUniformLocation(program, 'u_texture0'), u_texture1: gl.getUniformLocation(program, 'u_texture1'), u_ratio: gl.getUniformLocation(program, 'u_ratio') } };
-    }
-    draw(ratio, texture0, texture1) {
-        const gl = this.gl;
-        gl.useProgram(this.programWrapper.program);
-        gl.bindVertexArray(this.vao);
-        gl.activeTexture(gl.TEXTURE1);
-        gl.bindTexture(gl.TEXTURE_2D, texture1);
-        gl.uniform1i(this.programWrapper.uniforms.u_texture1, 1);
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, texture0);
-        gl.uniform1i(this.programWrapper.uniforms.u_texture0, 0);
-        gl.uniform1f(this.programWrapper.uniforms.u_ratio, ratio);
-        gl.drawArrays(gl.TRIANGLES, 0, 6);
-        gl.bindVertexArray(null);
-    }
-    createFloat32Texture(width, height) {
-        const gl = this.gl;
-        const texture = gl.createTexture();
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, width, height, 0, gl.RED, gl.FLOAT, null);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
-        return texture;
-    }
-}
+`;
+
+export default class BlenderProgram {
+    constructor(gl) {
+        this.gl = gl;
+        this.programWrapper = this._createProgramWrapper();
+    }
+
+
+
+    _craeteProgramWrapper() {
+
+        const gl = this.gl;
+
+        const program = createProgram(gl, vertexShader, fragmentShader);
+
+        this.vao = gl.createVertexArray();
+        gl.bindVertexArray(this.vao);
+        this._buffer = gl.createBuffer();
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            -1, -1,
+            1, -1,
+            -1, 1,
+            -1, 1,
+            1, -1,
+            1, 1,
+        ]), gl.STATIC_DRAW);
+        gl.enableVertexAttribArray(0);
+        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return { program, uniforms: { u_texture0: gl.getUniformLocation(program, 'u_texture0'), u_texture1: gl.getUniformLocation(program, 'u_texture1'), u_ratio: gl.getUniformLocation(program, 'u_ratio') } };
+    }
+
+    draw(ratio, texture0, texture1) {
+        const gl = this.gl;
+        gl.useProgram(this.programWrapper.program);
+        gl.bindVertexArray(this.vao);
+        gl.activeTexture(gl.TEXTURE1);
+        gl.bindTexture(gl.TEXTURE_2D, texture1);
+        gl.uniform1i(this.programWrapper.uniforms.u_texture1, 1);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, texture0);
+        gl.uniform1i(this.programWrapper.uniforms.u_texture0, 0);
+        gl.uniform1f(this.programWrapper.uniforms.u_ratio, ratio);
+        gl.drawArrays(gl.TRIANGLES, 0, 6);
+        gl.bindVertexArray(null);
+    }
+
+    createFloat32Texture(width, height) {
+        const gl = this.gl;
+        const texture = gl.createTexture();
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, width, height, 0, gl.RED, gl.FLOAT, null);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+        return texture;
+    }
+}
+
+

package/programs/helpers/fadeaway/index.js

@@ -1,2 +1,3 @@
-import FadeAway from './object';
-export default FadeAway;
+import FadeAway from './object';
+
+export default FadeAway;

package/programs/helpers/fadeaway/logic.js

@@ -1,4 +1,6 @@
-import { createProgram } from "../../../util";
+import { createProgram } from "../../../util";
+
+
 const vertexShaderSource = `#version 300 es
 precision highp float; 
 in vec2 a_position;
@@ -7,7 +9,8 @@ void main() {
     gl_Position = vec4(a_position, 0.0, 1.0);
     v_texCoord = a_position * 0.5 + vec2(0.5);
 }
-`;
+`;
+
 const fragmentShaderSource = `#version 300 es
 precision highp float;
 uniform float opacity;
@@ -23,47 +26,51 @@ void main() {
     }
     outColor = vec4(color.rgb, color.a * opacity);
 }
-`;
-export default class FadeAwayProgram {
-    constructor(gl) {
-        this.gl = gl;
-        this.program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
-        this.vao = gl.createVertexArray();
-        gl.bindVertexArray(this.vao);
-        this._buffer = gl.createBuffer();
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
-            -1, -1,
-            1, -1,
-            -1, 1,
-            -1, 1,
-            1, -1,
-            1, 1,
-        ]), gl.STATIC_DRAW);
-        gl.enableVertexAttribArray(0);
-        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        this.uniforms = {
-            u_texture: gl.getUniformLocation(this.program, 'u_texture'),
-            opacity: gl.getUniformLocation(this.program, 'opacity')
-        };
-    }
-    draw(texture, opacity) {
-        const { gl, vao, uniforms, program } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        gl.uniform1f(uniforms.opacity, opacity);
-        gl.uniform1i(uniforms.u_texture, 0);
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        gl.drawArrays(gl.TRIANGLES, 0, 6);
-        gl.bindVertexArray(null);
-    }
-    free() {
-        const { gl, vao, _buffer, program } = this;
-        gl.deleteVertexArray(vao);
-        gl.deleteProgram(program);
-        gl.deleteBuffer(_buffer);
-    }
-}
+`
+
+export default class FadeAwayProgram {
+    constructor(gl) {
+        this.gl = gl;
+        this.program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
+        this.vao = gl.createVertexArray();
+        gl.bindVertexArray(this.vao);
+        this._buffer = gl.createBuffer();
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            -1, -1,
+            1, -1,
+            -1, 1,
+            -1, 1,
+            1, -1,
+            1, 1,
+        ]), gl.STATIC_DRAW);
+        gl.enableVertexAttribArray(0);
+        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+
+        this.uniforms = {
+            u_texture: gl.getUniformLocation(this.program, 'u_texture'),
+            opacity: gl.getUniformLocation(this.program, 'opacity')
+        };
+    }
+
+    draw(texture, opacity) {
+        const { gl, vao, uniforms, program } = this;
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        gl.uniform1f(uniforms.opacity, opacity);
+        gl.uniform1i(uniforms.u_texture, 0);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.drawArrays(gl.TRIANGLES, 0, 6);
+        gl.bindVertexArray(null);
+    }
+
+    free() {
+        const { gl, vao, _buffer, program } = this;
+        gl.deleteVertexArray(vao);
+        gl.deleteProgram(program);
+        gl.deleteBuffer(_buffer);
+    }
+}   

package/programs/helpers/fadeaway/object.js

@@ -1,14 +1,20 @@
-import { glProgramCache } from "../../programcache";
-import FadeAwayProgram from "./logic";
-export default class FadeAway {
-    constructor(gl) {
-        this.gl = gl;
-        this.program = glProgramCache.getProgram(gl, FadeAwayProgram);
-    }
-    draw(sourceTexture, opacity) {
-        this.program.draw(sourceTexture, opacity);
-    }
-    free() {
-        glProgramCache.releaseProgram(FadeAwayProgram);
-    }
-}
+
+import { glProgramCache } from "../../programcache";
+import FadeAwayProgram from "./logic";
+
+export default class FadeAway {
+
+    constructor(gl) {
+        this.gl = gl;
+        this.program = glProgramCache.getProgram(gl, FadeAwayProgram);
+    }
+
+    draw(sourceTexture, opacity) {
+        this.program.draw(sourceTexture, opacity);
+    }
+
+
+    free() {
+        glProgramCache.releaseProgram(FadeAwayProgram);
+    }
+}

package/programs/helpers/index.js

@@ -1,2 +1,2 @@
-import FadeAway from './fadeaway';
-export { FadeAway };
+import FadeAway from './fadeaway';
+export { FadeAway };

package/programs/index.js

@@ -1,9 +1,21 @@
-import { Float2LegendWithRatio } from "./float2legendwithratio";
-import { GlobeShellWiggle } from "./globeshell/wiggle";
-import { CameraUniformBlockTotem, CameraUniformBlockString } from "./totems/index";
-import ArrowField from "./arrowfield";
-import { glProgramCache, globeProgramCache, noRegisterGlobeProgramCache } from "./programcache";
-import * as vectorfield from "./vectorfields/index";
-import { FadeAway } from "./helpers";
-import * as rings from "./rings";
-export { Float2LegendWithRatio, GlobeShellWiggle, ArrowField, CameraUniformBlockTotem, CameraUniformBlockString, glProgramCache, globeProgramCache, noRegisterGlobeProgramCache, vectorfield, FadeAway, rings };
+import { Float2LegendWithRatio } from "./float2legendwithratio";
+import { GlobeShellWiggle } from "./globeshell/wiggle";
+import { CameraUniformBlockTotem, CameraUniformBlockString } from "./totems/index";
+import ArrowField from "./arrowfield";
+import { glProgramCache, globeProgramCache, noRegisterGlobeProgramCache } from "./programcache";
+import * as vectorfield from "./vectorfields/index";
+import { FadeAway } from "./helpers";
+import * as rings from "./rings";
+export {
+    Float2LegendWithRatio,
+    GlobeShellWiggle,
+    ArrowField,
+    CameraUniformBlockTotem,
+    CameraUniformBlockString,
+    glProgramCache,
+    globeProgramCache,
+    noRegisterGlobeProgramCache,
+    vectorfield,
+    FadeAway,
+    rings
+};