@pirireis/webglobeplugins 1.0.2 → 1.0.3

package/programs/picking/pickable-polygon-renderer.js

@@ -1,33 +1,26 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { mercatorXYToGLPosition, cartesian3DToGLPosition, R_3D, R } from "../../util/shaderfunctions/geometrytransformations";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { drawArrays, DrawRangeIndexParams } from "../../util/gl-util/draw-options/methods";
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-
-
-const uniformBindingPoints = {
-    camera: 0,
-    flexible: 1
-};
-
-const uniformBlockManager = new UniformBlockManager(
-    "FlexibleBlock",
-    [
-        { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
-        { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_size", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_minimum_size", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_draw_mode", type: "int", value: new Int32Array([0]) }, // 0.0 for point, 1.0 for line
-        { name: "u_is_circle", type: "bool", value: new Float32Array([1.0]) },
-        { name: "u_dash_count", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_dash_opacity_multiplier", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_dash_phase", type: "float", value: new Float32Array([0.0]) },
-    ], uniformBindingPoints.flexible);
-
-
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, cartesian3DToGLPosition, R_3D, R } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { drawArrays, DrawRangeIndexParams } from "../../util/gl-util/draw-options/methods";
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
+const uniformBindingPoints = {
+    camera: 0,
+    flexible: 1
+};
+const uniformBlockManager = new UniformBlockManager("FlexibleBlock", [
+    { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
+    { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_size", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_minimum_size", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_draw_mode", type: "int", value: new Int32Array([0]) }, // 0.0 for point, 1.0 for line
+    { name: "u_is_circle", type: "bool", value: new Float32Array([1.0]) },
+    { name: "u_dash_count", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_dash_opacity_multiplier", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_dash_phase", type: "float", value: new Float32Array([0.0]) },
+], uniformBindingPoints.flexible);
 const vs = `#version 300 es
 ${R}
 ${R_3D}
@@ -78,8 +71,7 @@ void main() {
         default:
             break;
     }
-}`;
-
+}`;
 const fs = `#version 300 es
 precision highp float;
 precision highp int;
@@ -116,100 +108,77 @@ void main() {
             }
             break;
     }
-}`;
-
-
-class PointOnGlobeProgram {
-
-    constructor(globe) {
-
-        this.globe = globe;
-        this.gl = globe.gl;
-        this._isFreed = false;
-        this.program = createProgram(this.gl, vs, fs);
-
-        const { gl, program } = this;
-
-        // assign opacity
-
-
-        // assign attribute locations
-        gl.bindAttribLocation(program, 0, "pos3D");
-        gl.bindAttribLocation(program, 1, "pos2D");
-        gl.bindAttribLocation(program, 2, "rgba");
-        gl.bindAttribLocation(program, 3, "size");
-        // arrange camera uniform block
-
-
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
-        uniformBlockManager.assignBindingPoint(this.gl, this.program);
-        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
-
-        this._defaultUBO.update(new Map([
-            ["u_rgba", [1, 1, 1, 1]],
-            ["u_opacity", [1.0]],
-            ["u_size_multiplier", [1.0]],
-            ["u_size", [1.0]],
-            ["u_is_circle", [1.0]],
-        ]));
-    }
-
-
-    createUBO() {
-        const ubo = uniformBlockManager.createUBO(this.gl);
-        return ubo;
-    }
-
-    createVAO(pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
-
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-
-        attributeLoader(gl, pos3DBufferObj, 0, 3);
-        attributeLoader(gl, pos2DBufferObj, 1, 2);
-        attributeLoader(gl, rgbaBufferObj, 2, 4, { escapeValues: [-1, -1, -1, -1] });
-        attributeLoader(gl, sizeBufferObj, 3, 1, { escapeValues: [-1] });
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-    }
-
-
-    /**
-     * 
-     * @param {vertexArrayObject} vao 
-     * @param {DrawRangeIndexParams} drawOptions
-     */
-    draw(vao, drawOptions, ubo = null) {
-        const { gl, program } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        this.cameraBlockTotem.bind(uniformBindingPoints.camera);
-        ubo = ubo || this._defaultUBO;
-        ubo.bind();
-
-        drawArrays(gl, gl.POINTS, drawOptions);
-        ubo.unbind();
-        this.cameraBlockTotem.unbind(uniformBindingPoints.camera);
-        gl.bindVertexArray(null);
-    }
-
-    free() {
-        if (this._isFreed) return;
-        const { gl, globe } = this;
-        CameraUniformBlockTotemCache.release(globe);
-        gl.deleteProgram(this.program);
-        this._isFreed = true;
-    }
-}
-
-
-const PickableRendererProgramCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
-});
-
-export { PickableRendererProgramCache };
+}`;
+class PointOnGlobeProgram {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._isFreed = false;
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
+        // assign opacity
+        // assign attribute locations
+        gl.bindAttribLocation(program, 0, "pos3D");
+        gl.bindAttribLocation(program, 1, "pos2D");
+        gl.bindAttribLocation(program, 2, "rgba");
+        gl.bindAttribLocation(program, 3, "size");
+        // arrange camera uniform block
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
+        uniformBlockManager.assignBindingPoint(this.gl, this.program);
+        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
+        this._defaultUBO.update(new Map([
+            ["u_rgba", [1, 1, 1, 1]],
+            ["u_opacity", [1.0]],
+            ["u_size_multiplier", [1.0]],
+            ["u_size", [1.0]],
+            ["u_is_circle", [1.0]],
+        ]));
+    }
+    createUBO() {
+        const ubo = uniformBlockManager.createUBO(this.gl);
+        return ubo;
+    }
+    createVAO(pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        attributeLoader(gl, pos3DBufferObj, 0, 3);
+        attributeLoader(gl, pos2DBufferObj, 1, 2);
+        attributeLoader(gl, rgbaBufferObj, 2, 4, { escapeValues: [-1, -1, -1, -1] });
+        attributeLoader(gl, sizeBufferObj, 3, 1, { escapeValues: [-1] });
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    /**
+     *
+     * @param {vertexArrayObject} vao
+     * @param {DrawRangeIndexParams} drawOptions
+     */
+    draw(vao, drawOptions, ubo = null) {
+        const { gl, program } = this;
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        this.cameraBlockTotem.bind(uniformBindingPoints.camera);
+        ubo = ubo || this._defaultUBO;
+        ubo.bind();
+        drawArrays(gl, gl.POINTS, drawOptions);
+        ubo.unbind();
+        this.cameraBlockTotem.unbind(uniformBindingPoints.camera);
+        gl.bindVertexArray(null);
+    }
+    free() {
+        if (this._isFreed)
+            return;
+        const { gl, globe } = this;
+        CameraUniformBlockTotemCache.release(globe);
+        gl.deleteProgram(this.program);
+        this._isFreed = true;
+    }
+}
+const PickableRendererProgramCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
+});
+export { PickableRendererProgramCache };

package/programs/picking/pickable-renderer.js

@@ -1,34 +1,26 @@
-import { createProgram } from "../../util/webglobjectbuilders";
-import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
-import { mercatorXYToGLPosition, cartesian3DToGLPosition, R_3D, R } from "../../util/shaderfunctions/geometrytransformations";
-import { noRegisterGlobeProgramCache } from "../programcache";
-import { drawArrays } from "../../util/gl-util/draw-options/methods"; //DrawRangeIndexParams 
-
-import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
-import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
-
-
-const uniformBindingPoints = {
-    camera: 0,
-    flexible: 1
-};
-
-const uniformBlockManager = new UniformBlockManager(
-    "FlexibleBlock",
-    [
-        { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
-        { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_size", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_minimum_size", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_draw_mode", type: "int", value: new Int32Array([0]) }, // 0.0 for point, 1.0 for line
-        { name: "u_is_circle", type: "bool", value: new Float32Array([1.0]) },
-        { name: "u_dash_count", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_dash_opacity_multiplier", type: "float", value: new Float32Array([1.0]) },
-        { name: "u_dash_phase", type: "float", value: new Float32Array([0.0]) },
-    ], uniformBindingPoints.flexible);
-
-
+import { createProgram } from "../../util/webglobjectbuilders";
+import { CameraUniformBlockTotemCache, CameraUniformBlockString } from "../totems";
+import { mercatorXYToGLPosition, cartesian3DToGLPosition, R_3D, R } from "../../util/shaderfunctions/geometrytransformations";
+import { noRegisterGlobeProgramCache } from "../programcache";
+import { drawArrays } from "../../util/gl-util/draw-options/methods"; //DrawRangeIndexParams 
+import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
+import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
+const uniformBindingPoints = {
+    camera: 0,
+    flexible: 1
+};
+const uniformBlockManager = new UniformBlockManager("FlexibleBlock", [
+    { name: "u_rgba", type: "vec4", value: new Float32Array([1, 1, 1, 1]) },
+    { name: "u_opacity", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_size_multiplier", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_size", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_minimum_size", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_draw_mode", type: "int", value: new Int32Array([0]) }, // 0.0 for point, 1.0 for line
+    { name: "u_is_circle", type: "bool", value: new Float32Array([1.0]) },
+    { name: "u_dash_count", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_dash_opacity_multiplier", type: "float", value: new Float32Array([1.0]) },
+    { name: "u_dash_phase", type: "float", value: new Float32Array([0.0]) },
+], uniformBindingPoints.flexible);
 const vs = `#version 300 es
 ${R}
 ${R_3D}
@@ -79,8 +71,7 @@ void main() {
         default:
             break;
     }
-}`;
-
+}`;
 const fs = `#version 300 es
 precision highp float;
 precision highp int;
@@ -117,100 +108,77 @@ void main() {
             }
             break;
     }
-}`;
-
-
-class PointOnGlobeProgram {
-
-    constructor(globe) {
-
-        this.globe = globe;
-        this.gl = globe.gl;
-        this._isFreed = false;
-        this.program = createProgram(this.gl, vs, fs);
-
-        const { gl, program } = this;
-
-        // assign opacity
-
-
-        // assign attribute locations
-        gl.bindAttribLocation(program, 0, "pos3D");
-        gl.bindAttribLocation(program, 1, "pos2D");
-        gl.bindAttribLocation(program, 2, "rgba");
-        gl.bindAttribLocation(program, 3, "size");
-        // arrange camera uniform block
-
-
-        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
-        this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
-        uniformBlockManager.assignBindingPoint(this.gl, this.program);
-        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
-
-        this._defaultUBO.update(new Map([
-            ["u_rgba", [1, 1, 1, 1]],
-            ["u_opacity", [1.0]],
-            ["u_size_multiplier", [1.0]],
-            ["u_size", [1.0]],
-            ["u_is_circle", [1.0]],
-        ]));
-    }
-
-
-    createUBO() {
-        const ubo = uniformBlockManager.createUBO(this.gl);
-        return ubo;
-    }
-
-    createVAO(pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
-
-        const { gl } = this;
-        const vao = gl.createVertexArray();
-        gl.bindVertexArray(vao);
-
-        attributeLoader(gl, pos3DBufferObj, 0, 3);
-        attributeLoader(gl, pos2DBufferObj, 1, 2);
-        attributeLoader(gl, rgbaBufferObj, 2, 4, { escapeValues: [-1, -1, -1, -1] });
-        attributeLoader(gl, sizeBufferObj, 3, 1, { escapeValues: [-1] });
-
-        gl.bindVertexArray(null);
-        gl.bindBuffer(gl.ARRAY_BUFFER, null);
-        return vao;
-    }
-
-
-    /**
-     * 
-     * @param {vertexArrayObject} vao 
-     * @param {DrawRangeIndexParams} drawOptions
-     */
-    draw(vao, drawOptions, ubo = null) {
-        const { gl, program } = this;
-        gl.useProgram(program);
-        gl.bindVertexArray(vao);
-        this.cameraBlockTotem.bind(uniformBindingPoints.camera);
-        ubo = ubo || this._defaultUBO;
-        ubo.bind();
-
-        drawArrays(gl, gl.POINTS, drawOptions);
-        ubo.unbind();
-        this.cameraBlockTotem.unbind(uniformBindingPoints.camera);
-        gl.bindVertexArray(null);
-    }
-
-    free() {
-        if (this._isFreed) return;
-        const { gl, globe } = this;
-        CameraUniformBlockTotemCache.release(globe);
-        gl.deleteProgram(this.program);
-        this._isFreed = true;
-    }
-}
-
-
-const PickableRendererProgramCache = Object.freeze({
-    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
-    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
-});
-
-export { PickableRendererProgramCache };
+}`;
+class PointOnGlobeProgram {
+    constructor(globe) {
+        this.globe = globe;
+        this.gl = globe.gl;
+        this._isFreed = false;
+        this.program = createProgram(this.gl, vs, fs);
+        const { gl, program } = this;
+        // assign opacity
+        // assign attribute locations
+        gl.bindAttribLocation(program, 0, "pos3D");
+        gl.bindAttribLocation(program, 1, "pos2D");
+        gl.bindAttribLocation(program, 2, "rgba");
+        gl.bindAttribLocation(program, 3, "size");
+        // arrange camera uniform block
+        this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
+        this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
+        uniformBlockManager.assignBindingPoint(this.gl, this.program);
+        this._defaultUBO = uniformBlockManager.createUBO(this.gl);
+        this._defaultUBO.update(new Map([
+            ["u_rgba", [1, 1, 1, 1]],
+            ["u_opacity", [1.0]],
+            ["u_size_multiplier", [1.0]],
+            ["u_size", [1.0]],
+            ["u_is_circle", [1.0]],
+        ]));
+    }
+    createUBO() {
+        const ubo = uniformBlockManager.createUBO(this.gl);
+        return ubo;
+    }
+    createVAO(pos3DBufferObj, pos2DBufferObj, rgbaBufferObj, sizeBufferObj) {
+        const { gl } = this;
+        const vao = gl.createVertexArray();
+        gl.bindVertexArray(vao);
+        attributeLoader(gl, pos3DBufferObj, 0, 3);
+        attributeLoader(gl, pos2DBufferObj, 1, 2);
+        attributeLoader(gl, rgbaBufferObj, 2, 4, { escapeValues: [-1, -1, -1, -1] });
+        attributeLoader(gl, sizeBufferObj, 3, 1, { escapeValues: [-1] });
+        gl.bindVertexArray(null);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return vao;
+    }
+    /**
+     *
+     * @param {vertexArrayObject} vao
+     * @param {DrawRangeIndexParams} drawOptions
+     */
+    draw(vao, drawOptions, ubo = null) {
+        const { gl, program } = this;
+        gl.useProgram(program);
+        gl.bindVertexArray(vao);
+        this.cameraBlockTotem.bind(uniformBindingPoints.camera);
+        ubo = ubo || this._defaultUBO;
+        ubo.bind();
+        drawArrays(gl, gl.POINTS, drawOptions);
+        ubo.unbind();
+        this.cameraBlockTotem.unbind(uniformBindingPoints.camera);
+        gl.bindVertexArray(null);
+    }
+    free() {
+        if (this._isFreed)
+            return;
+        const { gl, globe } = this;
+        CameraUniformBlockTotemCache.release(globe);
+        gl.deleteProgram(this.program);
+        this._isFreed = true;
+    }
+}
+const PickableRendererProgramCache = Object.freeze({
+    get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, PointOnGlobeProgram),
+    release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, PointOnGlobeProgram)
+});
+export { PickableRendererProgramCache };