@pirireis/webglobeplugins 1.0.2 → 1.0.3

package/util/programs/supersampletotextures.js

@@ -1,28 +1,17 @@
-import { createProgram } from '../webglobjectbuilders';
-export class SuperSampleTextureProgram {
-
-
-    constructor(gl, internalFormat = null, sourceFormat = null, sourceType = null, glslOutputType = "float", glslBand = "r") {
-
-        this._internalFormat = internalFormat || gl.R16F;
-        this._sourceFormat = sourceFormat || gl.RED;
-        this._sourceType = sourceType || gl.FLOAT;
-
-        this._glslOutputType = glslOutputType;
-        this._glslBand = glslBand;
-
-        this.gl = gl;
-
-        this._programWrapper = this._createProgramWrapper();
-
-        this._framebuffer = this.gl.createFramebuffer();
-    }
-
-
-    _createProgramWrapper() {
-
-        const { gl, _glslBand, _glslOutputType } = this;
-
+import { createProgram } from '../webglobjectbuilders';
+export class SuperSampleTextureProgram {
+    constructor(gl, internalFormat = null, sourceFormat = null, sourceType = null, glslOutputType = "float", glslBand = "r") {
+        this._internalFormat = internalFormat || gl.R16F;
+        this._sourceFormat = sourceFormat || gl.RED;
+        this._sourceType = sourceType || gl.FLOAT;
+        this._glslOutputType = glslOutputType;
+        this._glslBand = glslBand;
+        this.gl = gl;
+        this._programWrapper = this._createProgramWrapper();
+        this._framebuffer = this.gl.createFramebuffer();
+    }
+    _createProgramWrapper() {
+        const { gl, _glslBand, _glslOutputType } = this;
         const vertexShaderSource = `#version 300 es
         in vec2 a_position;
         out vec2 v_texCoord;
@@ -32,111 +21,89 @@ export class SuperSampleTextureProgram {
         void main() {
             gl_Position = vec4(a_position, 0.0, 1.0);
             v_texCoord = (u_bbox_matrix * vec4(a_position,0.0, 1.0)).xy;
-        }`;
-
+        }`;
         const fragmentShaderSource = `#version 300 es
         precision highp float;
-        in vec2 v_texCoord;`
-            + `out ${_glslOutputType} outColor;`
+        in vec2 v_texCoord;`
+            + `out ${_glslOutputType} outColor;`
             + `uniform sampler2D u_texture;
-        void main() {`
-            + `   outColor = texture(u_texture, v_texCoord).${_glslBand};`
-            + `}`;
-
-        const program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
-        const vao = gl.createVertexArray();
-        const positionBuffer = gl.createBuffer();
-        gl.bindVertexArray(vao);
-        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
-        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
-            -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);
-
-        const u_bbox_matrix = gl.getUniformLocation(program, "u_bbox_matrix");
-
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.uniformMatrix2fv(u_bbox_matrix, false, new Float32Array([
-            1, 0, 0, 0,
-            0, 1, 0, 0,
-            0, 0, 1, 0,
-            0, 0, 0, 1
-        ]));
-        gl.useProgram(program);
-        gl.useProgram(currentProgram);
-
-        return {
-            program,
-            vao,
-            u_texture: gl.getUniformLocation(program, "u_texture"),
-            u_bbox_matrix
-        };
-    }
-
-
-    createHigherResolutionTexture(targetWidth, targetHeight, sourceTexture) {
-
-        // save current state
-        const { gl, _internalFormat, _sourceFormat, _sourceType } = this;
-
-        const currentViewport = gl.getParameter(gl.VIEWPORT);
-
-
-        const resultTexture = gl.createTexture();
-
-        gl.bindTexture(gl.TEXTURE_2D, resultTexture);
-        gl.texImage2D(gl.TEXTURE_2D, 0, _internalFormat, targetWidth, targetHeight, 0, _sourceFormat, _sourceType, null);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-        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);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, this._framebuffer);
-        gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, resultTexture, 0);
-        gl.viewport(0, 0, targetWidth, targetHeight);
-        gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-        gl.bindTexture(gl.TEXTURE_2D, null);
-
-        this._draw(sourceTexture);
-
-
-        // restore previous state
-        this.gl.viewport(currentViewport[0], currentViewport[1], currentViewport[2], currentViewport[3]);
-
-        return resultTexture;
-    }
-
-
-    _draw(texture) {
-
-        const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
-        this.gl.useProgram(this._programWrapper.program);
-        this.gl.bindVertexArray(this._programWrapper.vao);
-        this.gl.activeTexture(this.gl.TEXTURE0);
-        this.gl.bindTexture(this.gl.TEXTURE_2D, texture);
-        this.gl.uniform1i(this._programWrapper.u_texture, 0);
-        this.gl.drawArrays(this.gl.TRIANGLE_FAN, 0, 4);
-        this.gl.bindVertexArray(null);
-        this.gl.useProgram(currentProgram);
-    }
-
-
-    setBBox(x0, y0, x1, y1) {
-        const { gl, _programWrapper } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        gl.uniformMatrix2fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
-            1 / (x1 - x0), 0, -x0 / (x1 - x0), 0,
-            0, 1 / (y1 - y0), -y0 / (y1 - y0), 0,
-            0, 0, 1, 0,
-            0, 0, 0, 1
-        ]));
-        gl.useProgram(currentProgram);
-
-    }
-}
+        void main() {`
+            + `   outColor = texture(u_texture, v_texCoord).${_glslBand};`
+            + `}`;
+        const program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
+        const vao = gl.createVertexArray();
+        const positionBuffer = gl.createBuffer();
+        gl.bindVertexArray(vao);
+        gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            -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);
+        const u_bbox_matrix = gl.getUniformLocation(program, "u_bbox_matrix");
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.uniformMatrix2fv(u_bbox_matrix, false, new Float32Array([
+            1, 0, 0, 0,
+            0, 1, 0, 0,
+            0, 0, 1, 0,
+            0, 0, 0, 1
+        ]));
+        gl.useProgram(program);
+        gl.useProgram(currentProgram);
+        return {
+            program,
+            vao,
+            u_texture: gl.getUniformLocation(program, "u_texture"),
+            u_bbox_matrix
+        };
+    }
+    createHigherResolutionTexture(targetWidth, targetHeight, sourceTexture) {
+        // save current state
+        const { gl, _internalFormat, _sourceFormat, _sourceType } = this;
+        const currentViewport = gl.getParameter(gl.VIEWPORT);
+        const resultTexture = gl.createTexture();
+        gl.bindTexture(gl.TEXTURE_2D, resultTexture);
+        gl.texImage2D(gl.TEXTURE_2D, 0, _internalFormat, targetWidth, targetHeight, 0, _sourceFormat, _sourceType, null);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+        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);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, this._framebuffer);
+        gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, resultTexture, 0);
+        gl.viewport(0, 0, targetWidth, targetHeight);
+        gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.bindTexture(gl.TEXTURE_2D, null);
+        this._draw(sourceTexture);
+        // restore previous state
+        this.gl.viewport(currentViewport[0], currentViewport[1], currentViewport[2], currentViewport[3]);
+        return resultTexture;
+    }
+    _draw(texture) {
+        const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
+        this.gl.useProgram(this._programWrapper.program);
+        this.gl.bindVertexArray(this._programWrapper.vao);
+        this.gl.activeTexture(this.gl.TEXTURE0);
+        this.gl.bindTexture(this.gl.TEXTURE_2D, texture);
+        this.gl.uniform1i(this._programWrapper.u_texture, 0);
+        this.gl.drawArrays(this.gl.TRIANGLE_FAN, 0, 4);
+        this.gl.bindVertexArray(null);
+        this.gl.useProgram(currentProgram);
+    }
+    setBBox(x0, y0, x1, y1) {
+        const { gl, _programWrapper } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        gl.uniformMatrix2fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
+            1 / (x1 - x0), 0, -x0 / (x1 - x0), 0,
+            0, 1 / (y1 - y0), -y0 / (y1 - y0), 0,
+            0, 0, 1, 0,
+            0, 0, 0, 1
+        ]));
+        gl.useProgram(currentProgram);
+    }
+}

package/util/programs/texturetoglobe.js

@@ -1,43 +1,36 @@
-import { createProgram } from "../webglobjectbuilders";
-import { pixelXYToCartesian2DPoint, pixelXYToCartesian3DPoint }
-    from "../shaderfunctions";
-import { latLongBboxtoPixelXYBbox } from "..";
-/** TODO:
- * 3d icin calistir
- */
-//TODO: DELETE THIS FILE. 
-
-class TextureToGlobeProgram {
-    constructor(gl, globe) {
-        this.globe = globe;
-        this.gl = gl;
-        this._is3D = true;
-        this._programWrapper = this._createProgramWrapper();
-        this._resizeHandler = this._resizeEventHandler.bind(this);
-        window.addEventListener('resize',
-            this._resizeHandler
-            , true);
-    }
-
-    _initUniforms() {
-
-        const { gl, _programWrapper } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        // set u_alpha
-        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
-            1, 0, 0,
-            0, 1, 0,
-            0, 0, 1]));
-        gl.uniform1f(_programWrapper.u_alpha, 1.0);
-        gl.uniform1f(_programWrapper.u_is3D, 1.0);
-        gl.uniform1f(_programWrapper.height, 0.0);
-        gl.useProgram(currentProgram);
-
-    }
-
-    _createProgramWrapper() {
-        const gl = this.gl;
+import { createProgram } from "../webglobjectbuilders";
+import { pixelXYToCartesian2DPoint, pixelXYToCartesian3DPoint } from "../shaderfunctions";
+import { latLongBboxtoPixelXYBbox } from "..";
+/** TODO:
+ * 3d icin calistir
+ */
+//TODO: DELETE THIS FILE. 
+class TextureToGlobeProgram {
+    constructor(gl, globe) {
+        this.globe = globe;
+        this.gl = gl;
+        this._is3D = true;
+        this._programWrapper = this._createProgramWrapper();
+        this._resizeHandler = this._resizeEventHandler.bind(this);
+        window.addEventListener('resize', this._resizeHandler, true);
+    }
+    _initUniforms() {
+        const { gl, _programWrapper } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        // set u_alpha
+        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
+            1, 0, 0,
+            0, 1, 0,
+            0, 0, 1
+        ]));
+        gl.uniform1f(_programWrapper.u_alpha, 1.0);
+        gl.uniform1f(_programWrapper.u_is3D, 1.0);
+        gl.uniform1f(_programWrapper.height, 0.0);
+        gl.useProgram(currentProgram);
+    }
+    _createProgramWrapper() {
+        const gl = this.gl;
         const vertexSource = `#version 300 es
             precision highp float;
 
@@ -74,8 +67,7 @@ class TextureToGlobeProgram {
                 gl_PointSize = 100.0;
                 v_texcoord = a_position * 0.5 + 0.5; // need a check
             }
-            `;
-
+            `;
         const fragmentSource = `#version 300 es
             precision highp float;
 
@@ -91,114 +83,97 @@ class TextureToGlobeProgram {
                 // outColor.a *= u_alpha;
                 outColor = vec4(1.0, 0.0, 0.0, 0.5);
             }   
-            `;
-
-        const program = createProgram(gl, vertexSource, fragmentSource);
-        const vao = gl.createVertexArray();
-
-        const buffer = gl.createBuffer();
-        gl.bindVertexArray(vao);
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
-            0, 0,
-            1, 0,
-            1, 1,
-            0, 1
-        ]), gl.STATIC_DRAW);
-        const a_position = - gl.getAttribLocation(program, 'a_position');
-        gl.enableVertexAttribArray(a_position);
-        gl.vertexAttribPointer(a_position, 2, gl.FLOAT, false, 0, 0);
-        gl.bindVertexArray(null);
-
-        return {
-            program: program,
-            vao: vao,
-            u_model_view_matrix: gl.getUniformLocation(program, 'u_model_view_matrix'),
-            u_proj_matrix: gl.getUniformLocation(program, 'u_proj_matrix'),
-            u_transpos: gl.getUniformLocation(program, 'u_transpos'),
-            u_mapWH: gl.getUniformLocation(program, 'u_mapWH'),
-            u_scrWH: gl.getUniformLocation(program, 'u_scrWH'),
-            u_texture: gl.getUniformLocation(program, 'u_texture'),
-            u_bbox_matrix: gl.getUniformLocation(program, 'u_bbox_matrix'),
-            u_is3D: gl.getUniformLocation(program, 'u_is3D'),
-        };
-    }
-
-    draw(modelViewMatrix, projectionMatrix, transPos, texture) {
-        // console.log('draw')
-        const { gl, _programWrapper, _is3D } = this;
-        gl.useProgram(_programWrapper.program);
-        gl.bindVertexArray(_programWrapper.vao);
-        gl.uniformMatrix4fv(_programWrapper.u_model_view_matrix, false, modelViewMatrix);
-        gl.uniformMatrix4fv(_programWrapper.u_proj_matrix, false, projectionMatrix);
-        gl.uniform3f(_programWrapper.u_transpos, transPos.x, transPos.y, transPos.z);
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        gl.uniform1i(_programWrapper.u_texture, 0);
-        if (!_is3D) {
-            const mapWH = this.globe.api_GetCurrentWorldWH();
-            gl.uniform2f(_programWrapper.u_mapWH, mapWH.width, mapWH.height);
-        }
-
-        gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
-        gl.drawArrays(gl.POINTS, 0, 4);
-    }
-
-    setBBox(minx, maxx, miny, maxy) {
-        const { gl, _programWrapper } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
-            maxx - minx, 0, minx,
-            0, maxy - miny, miny,
-            0, 0, 1
-        ]));
-        gl.useProgram(currentProgram);
-    }
-
-    setLatLongBBox(minx, maxx, miny, maxy) {
-        const bboxMatrix = latLongBboxtoPixelXYBbox(minx, miny, maxx, maxy);
-        const { gl, _programWrapper } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, bboxMatrix);
-        gl.useProgram(currentProgram);
-    }
-
-
-    setScreenWH() {
-        const { gl, _programWrapper, globe } = this;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        gl.uniform2f(_programWrapper.u_scrWH, globe.api_ScrW(), globe.api_ScrH());
-        gl.useProgram(currentProgram);
-    }
-
-
-    resize() {
-        const { globe } = this;
-        this.setScreenWH();
-    }
-
-    setGeometry() {
-        const { gl, globe, _programWrapper } = this;
-        this._is3D = globe.api_GetCurrentGeometry() === 0;
-        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        gl.useProgram(_programWrapper.program);
-        gl.uniform1f(_programWrapper.u_is3D, this._is3D ? 1.0 : 0.0);
-        gl.useProgram(currentProgram);
-        this.resize();
-    }
-
-    free() {
-        window.removeEventListener('resize',
-            this._resizeHandler, true);
-    }
-
-    _resizeEventHandler() {
-        this.resize();
-    }
-
-}
-
-export { TextureToGlobeProgram };
+            `;
+        const program = createProgram(gl, vertexSource, fragmentSource);
+        const vao = gl.createVertexArray();
+        const buffer = gl.createBuffer();
+        gl.bindVertexArray(vao);
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            0, 0,
+            1, 0,
+            1, 1,
+            0, 1
+        ]), gl.STATIC_DRAW);
+        const a_position = -gl.getAttribLocation(program, 'a_position');
+        gl.enableVertexAttribArray(a_position);
+        gl.vertexAttribPointer(a_position, 2, gl.FLOAT, false, 0, 0);
+        gl.bindVertexArray(null);
+        return {
+            program: program,
+            vao: vao,
+            u_model_view_matrix: gl.getUniformLocation(program, 'u_model_view_matrix'),
+            u_proj_matrix: gl.getUniformLocation(program, 'u_proj_matrix'),
+            u_transpos: gl.getUniformLocation(program, 'u_transpos'),
+            u_mapWH: gl.getUniformLocation(program, 'u_mapWH'),
+            u_scrWH: gl.getUniformLocation(program, 'u_scrWH'),
+            u_texture: gl.getUniformLocation(program, 'u_texture'),
+            u_bbox_matrix: gl.getUniformLocation(program, 'u_bbox_matrix'),
+            u_is3D: gl.getUniformLocation(program, 'u_is3D'),
+        };
+    }
+    draw(modelViewMatrix, projectionMatrix, transPos, texture) {
+        // console.log('draw')
+        const { gl, _programWrapper, _is3D } = this;
+        gl.useProgram(_programWrapper.program);
+        gl.bindVertexArray(_programWrapper.vao);
+        gl.uniformMatrix4fv(_programWrapper.u_model_view_matrix, false, modelViewMatrix);
+        gl.uniformMatrix4fv(_programWrapper.u_proj_matrix, false, projectionMatrix);
+        gl.uniform3f(_programWrapper.u_transpos, transPos.x, transPos.y, transPos.z);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.uniform1i(_programWrapper.u_texture, 0);
+        if (!_is3D) {
+            const mapWH = this.globe.api_GetCurrentWorldWH();
+            gl.uniform2f(_programWrapper.u_mapWH, mapWH.width, mapWH.height);
+        }
+        gl.drawArrays(gl.TRIANGLE_FAN, 0, 4);
+        gl.drawArrays(gl.POINTS, 0, 4);
+    }
+    setBBox(minx, maxx, miny, maxy) {
+        const { gl, _programWrapper } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, new Float32Array([
+            maxx - minx, 0, minx,
+            0, maxy - miny, miny,
+            0, 0, 1
+        ]));
+        gl.useProgram(currentProgram);
+    }
+    setLatLongBBox(minx, maxx, miny, maxy) {
+        const bboxMatrix = latLongBboxtoPixelXYBbox(minx, miny, maxx, maxy);
+        const { gl, _programWrapper } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        gl.uniformMatrix3fv(_programWrapper.u_bbox_matrix, false, bboxMatrix);
+        gl.useProgram(currentProgram);
+    }
+    setScreenWH() {
+        const { gl, _programWrapper, globe } = this;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        gl.uniform2f(_programWrapper.u_scrWH, globe.api_ScrW(), globe.api_ScrH());
+        gl.useProgram(currentProgram);
+    }
+    resize() {
+        const { globe } = this;
+        this.setScreenWH();
+    }
+    setGeometry() {
+        const { gl, globe, _programWrapper } = this;
+        this._is3D = globe.api_GetCurrentGeometry() === 0;
+        const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
+        gl.useProgram(_programWrapper.program);
+        gl.uniform1f(_programWrapper.u_is3D, this._is3D ? 1.0 : 0.0);
+        gl.useProgram(currentProgram);
+        this.resize();
+    }
+    free() {
+        window.removeEventListener('resize', this._resizeHandler, true);
+    }
+    _resizeEventHandler() {
+        this.resize();
+    }
+}
+export { TextureToGlobeProgram };