@pirireis/webglobeplugins 1.0.2 → 1.0.3

package/programs/point-on-globe/element-globe-surface-glow.js

@@ -1,31 +1,21 @@
-/**
- *        *
- *      *   *
- *    *   *   *
- *      *   *
- *        *
- */
-
-
-
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { PI, cartesian3DToGLPosition, circleLimpFromLongLatRadCenterCartesian3D_accurate } from "../../util/shaderfunctions/geometrytransformations";
-import { createProgram } from "../../util/webglobjectbuilders";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import { drawInstanced } from "../../util/gl-util/draw-options/methods";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-
-
-const uboBlockManager = new UniformBlockManager(
-    "FlexibleBlock",
-    [
-        { name: "u_color", type: "vec4" },
-        { name: "u_radius", type: "float" }
-    ],
-    1
-);
-
+/**
+ *        *
+ *      *   *
+ *    *   *   *
+ *      *   *
+ *        *
+ */
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { PI, cartesian3DToGLPosition, circleLimpFromLongLatRadCenterCartesian3D_accurate } from "../../util/shaderfunctions/geometrytransformations";
+import { createProgram } from "../../util/webglobjectbuilders";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { drawInstanced } from "../../util/gl-util/draw-options/methods";
+import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
+const uboBlockManager = new UniformBlockManager("FlexibleBlock", [
+    { name: "u_color", type: "vec4" },
+    { name: "u_radius", type: "float" }
+], 1);
 const vs = `#version 300 es
 ${PI}
 ${CameraUniformBlockString}
@@ -60,9 +50,7 @@ void main() {
 
         vColor = vec4(color.rgb, color.a * (1.0 - distance / radius));
     }
-}`;
-
-
+}`;
 const fs = `#version 300 es
 precision highp float;
 
@@ -74,94 +62,77 @@ out vec4 fragColor;
 void main() {
     fragColor = vColor;
     fragColor.a *= opacity;
-}`;
-
-
-class Logic {
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-
-        this._vaoCache = [];
-
-        this.program = createProgram(this.gl, vs, fs);
-
-        const { gl, program } = this;
-
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(program);
-        // set uniform locations
-        this._uniforms = {
-            edge_count_loc: gl.getUniformLocation(program, "edge_count"),
-            edge_count: 40,
-            opacity_loc: gl.getUniformLocation(program, "opacity"),
-            opacity: 1.0
-        };
-        // last values
-        gl.uniform1f(this._uniforms.edge_count_loc, this._uniforms.edge_count);
-        gl.uniform1f(this._uniforms.opacity_loc, this._uniforms.opacity);
-
-        gl.useProgram(currentProgram);
-        // assign attribute locations
-        gl.bindAttribLocation(program, 0, "pos3D");
-        gl.bindAttribLocation(program, 1, "radius");
-        gl.bindAttribLocation(program, 2, "color");
-        // camera uniform block
-        this.cameraUniformBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockBindingPoint = 0;
-        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
-        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
-
-        uboBlockManager.assignBindingPoint(this.gl, this.program);
-        this._defaultUBO = uboBlockManager.createUBO(this.gl);
-    }
-
-
-    createVAO(pos3DObj, radiusObj, colorObj) {
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        const divisor = 1;
-        gl.bindVertexArray(vao);
-
-        attributeLoader(gl, pos3DObj, 0, 3, { divisor });
-        attributeLoader(gl, radiusObj, 1, 1, { divisor, escapeValues: [-1] });
-        attributeLoader(gl, colorObj, 2, 4, { divisor, escapeValues: [-1, -1, -1, -1] });
-
-        gl.bindVertexArray(null);
-        this._vaoCache.push(vao);
-        return vao;
-    }
-
-
-    draw(vao, drawOptions, opacity = 1.0, ubo = null) {
-        const { gl, program } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        if (opacity !== this._uniforms.opacity) {
-            gl.uniform1f(this._uniforms.opacity_loc, opacity);
-            this._uniforms.opacity = opacity;
-        }
-        ubo = ubo || this._defaultUBO;
-        ubo.bind();
-        drawInstanced(gl, gl.TRIANGLE_FAN, drawOptions);
-        ubo.unbind();
-        gl.bindVertexArray(null);
-    }
-
-
-    free() {
-        if (this._isFreed) return;
-        CameraUniformBlockTotemCache.release(this.globe);
-        this.gl.deleteProgram(this.program);
-        for (const vao of this._vaoCache) this.gl.deleteVertexArray(vao);
-        this._isFreed = true;
-    }
-}
-
-
-const ElementGlobeSufaceGlowCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe)
-})
-
-export { ElementGlobeSufaceGlowCache };
+}`;
+class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._vaoCache = [];
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(program);
+        // set uniform locations
+        this._uniforms = {
+            edge_count_loc: gl.getUniformLocation(program, "edge_count"),
+            edge_count: 40,
+            opacity_loc: gl.getUniformLocation(program, "opacity"),
+            opacity: 1.0
+        };
+        // last values
+        gl.uniform1f(this._uniforms.edge_count_loc, this._uniforms.edge_count);
+        gl.uniform1f(this._uniforms.opacity_loc, this._uniforms.opacity);
+        gl.useProgram(currentProgram);
+        // assign attribute locations
+        gl.bindAttribLocation(program, 0, "pos3D");
+        gl.bindAttribLocation(program, 1, "radius");
+        gl.bindAttribLocation(program, 2, "color");
+        // camera uniform block
+        this.cameraUniformBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockBindingPoint = 0;
+        const cameraBlockIndex = gl.getUniformBlockIndex(program, "CameraUniformBlock");
+        gl.uniformBlockBinding(program, cameraBlockIndex, this.cameraBlockBindingPoint);
+        uboBlockManager.assignBindingPoint(this.gl, this.program);
+        this._defaultUBO = uboBlockManager.createUBO(this.gl);
+    }
+    createVAO(pos3DObj, radiusObj, colorObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        const divisor = 1;
+        gl.bindVertexArray(vao);
+        attributeLoader(gl, pos3DObj, 0, 3, { divisor });
+        attributeLoader(gl, radiusObj, 1, 1, { divisor, escapeValues: [-1] });
+        attributeLoader(gl, colorObj, 2, 4, { divisor, escapeValues: [-1, -1, -1, -1] });
+        gl.bindVertexArray(null);
+        this._vaoCache.push(vao);
+        return vao;
+    }
+    draw(vao, drawOptions, opacity = 1.0, ubo = null) {
+        const { gl, program } = this;
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        if (opacity !== this._uniforms.opacity) {
+            gl.uniform1f(this._uniforms.opacity_loc, opacity);
+            this._uniforms.opacity = opacity;
+        }
+        ubo = ubo || this._defaultUBO;
+        ubo.bind();
+        drawInstanced(gl, gl.TRIANGLE_FAN, drawOptions);
+        ubo.unbind();
+        gl.bindVertexArray(null);
+    }
+    free() {
+        if (this._isFreed)
+            return;
+        CameraUniformBlockTotemCache.release(this.globe);
+        this.gl.deleteProgram(this.program);
+        for (const vao of this._vaoCache)
+            this.gl.deleteVertexArray(vao);
+        this._isFreed = true;
+    }
+}
+const ElementGlobeSufaceGlowCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe)
+});
+export { ElementGlobeSufaceGlowCache };

package/programs/point-on-globe/element-point-glow.js

@@ -1,28 +1,22 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import { drawArrays } from "../../util/gl-util/draw-options/methods";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-import { singularity } from "../../shaders/fragment-toy/singularity";
-import { firework } from "../../shaders/fragment-toy/firework";
-
-
-const cameraBlockBindingPoint = 0;
-const flexibleBlockBindingPoint = 1;
-
-const uniformBlockManager = new UniformBlockManager(
-    "FlexibleBlock",
-    [
-        { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
-        { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_size", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_minimumSize", type: "float", value: new Float32Array([25.0]) },
-        { name: "u_phase", type: "float", value: new Float32Array([1.0]) },
-    ], flexibleBlockBindingPoint);
-
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { drawArrays } from "../../util/gl-util/draw-options/methods";
+import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
+import { singularity } from "../../shaders/fragment-toy/singularity";
+import { firework } from "../../shaders/fragment-toy/firework";
+const cameraBlockBindingPoint = 0;
+const flexibleBlockBindingPoint = 1;
+const uniformBlockManager = new UniformBlockManager("FlexibleBlock", [
+    { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
+    { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_size", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_minimumSize", type: "float", value: new Float32Array([25.0]) },
+    { name: "u_phase", type: "float", value: new Float32Array([1.0]) },
+], flexibleBlockBindingPoint);
 const vs = `#version 300 es
 precision highp float;
 
@@ -59,9 +53,7 @@ void main() {
     vColor = (color.r == -1.0) ? u_rgba : color;
     vColor.a *= u_opacity;
 
-}`;
-
-
+}`;
 const fs = `#version 300 es
 precision highp float;
 
@@ -96,89 +88,63 @@ void main() {
     // fragColor = singularity(gl_PointCoord, u_phase);
 
     fragColor.a *= smoothstep(0.0, 1.1, ( 0.4 * u_opacity + center_alpha +  circle_alpha+ outer_circle_alpha)); 
-}`;
-
-class Logic {
-
-    constructor(globe) {
-        this.globe = globe;
-        this.gl = globe.gl;
-
-        this.program = createProgram(this.gl, vs, fs);
-
-        const { gl, program } = this;
-
-
-        gl.bindAttribLocation(program, 0, "pos3D");
-        gl.bindAttribLocation(program, 1, "pos2D");
-        gl.bindAttribLocation(program, 2, "color");
-        gl.bindAttribLocation(program, 3, "size");
-        // assign uniform block
-
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockTotem.assignBindingPoint(program, cameraBlockBindingPoint);
-
-        uniformBlockManager.assignBindingPoint(this.gl, this.program);
-        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
-    }
-
-
-    createVAO(pos3DBuffer, pos2DBuffer, colorBuffer, sizeBuffer) {
-
-        const { gl } = this;
-
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-
-        attributeLoader(gl, pos3DBuffer, 0, 3);
-        attributeLoader(gl, pos2DBuffer, 1, 2);
-        attributeLoader(gl, colorBuffer, 2, 4, { escapeValues: [-1, -1, -1, -1] });
-        attributeLoader(gl, sizeBuffer, 3, 1, { escapeValues: [-1] });
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-
-        return vao;
-    }
-
-
-    createUBO() {
-        const ubo = uniformBlockManager.createUBO(this.gl);
-        return ubo;
-    }
-
-    draw(vao, drawOptions, ubo = null) {
-        const { gl, program, cameraBlockTotem } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        cameraBlockTotem.bind(cameraBlockBindingPoint);
-
-        ubo = ubo || this._defaultUBO;
-
-        ubo.bind();
-        drawArrays(gl, gl.POINTS, drawOptions);
-        ubo.unbind();
-
-        gl.bindVertexArray(null);
-        cameraBlockTotem.unbind(cameraBlockBindingPoint);
-        this.globe.DrawRender();
-    }
-
-
-
-    // for singleton cache interation
-
-    free() {
-        if (this._isFreed) return;
-        CameraUniformBlockTotemCache.release(this.globe);
-        this.gl.deleteProgram(this.program);
-        this._isFreed = true;
-    }
-}
-
-const ElementPointGlowProgramCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
-    release: globe => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
-});
-
-export { ElementPointGlowProgramCache };
+}`;
+class Logic {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
+        gl.bindAttribLocation(program, 0, "pos3D");
+        gl.bindAttribLocation(program, 1, "pos2D");
+        gl.bindAttribLocation(program, 2, "color");
+        gl.bindAttribLocation(program, 3, "size");
+        // assign uniform block
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem.assignBindingPoint(program, cameraBlockBindingPoint);
+        uniformBlockManager.assignBindingPoint(this.gl, this.program);
+        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
+    }
+    createVAO(pos3DBuffer, pos2DBuffer, colorBuffer, sizeBuffer) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        attributeLoader(gl, pos3DBuffer, 0, 3);
+        attributeLoader(gl, pos2DBuffer, 1, 2);
+        attributeLoader(gl, colorBuffer, 2, 4, { escapeValues: [-1, -1, -1, -1] });
+        attributeLoader(gl, sizeBuffer, 3, 1, { escapeValues: [-1] });
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    createUBO() {
+        const ubo = uniformBlockManager.createUBO(this.gl);
+        return ubo;
+    }
+    draw(vao, drawOptions, ubo = null) {
+        const { gl, program, cameraBlockTotem } = this;
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        cameraBlockTotem.bind(cameraBlockBindingPoint);
+        ubo = ubo || this._defaultUBO;
+        ubo.bind();
+        drawArrays(gl, gl.POINTS, drawOptions);
+        ubo.unbind();
+        gl.bindVertexArray(null);
+        cameraBlockTotem.unbind(cameraBlockBindingPoint);
+        this.globe.DrawRender();
+    }
+    // for singleton cache interation
+    free() {
+        if (this._isFreed)
+            return;
+        CameraUniformBlockTotemCache.release(this.globe);
+        this.gl.deleteProgram(this.program);
+        this._isFreed = true;
+    }
+}
+const ElementPointGlowProgramCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, Logic),
+    release: globe => noRegisterGlobeProgramCache.releaseProgram(globe, Logic)
+});
+export { ElementPointGlowProgramCache };