@pirireis/webglobeplugins 0.16.7 → 0.17.1

package/{waveparticles → vectorfield/waveparticles}/plugin.js

@@ -1,11 +1,10 @@
-import { GlobeShellWiggle } from "../programs";
-import { defaultblendfunction } from "../util";
-import { vectorfield } from "../programs/index";
-import { pixelBasedMoveProgramCache } from "../programs/vectorfields/logics/pixelbased";
-import { drawRectangleParticlesProgramCache } from "../programs/vectorfields/logics/drawrectangleparticles";
-import { FadeAway } from "../programs";
-import { SeaWaveUbo } from "../programs/vectorfields/logics/ubo-new";
-const { PingPongBufferManager, WaveParticalUboManager } = vectorfield;
+import { BBOXGlobeShell } from "../../semiplugins/shell/bbox-renderer";
+import { defaultblendfunction } from "../../util/webglobe/gldefaultstates";
+import { PingPongBufferManager } from "../../programs/vectorfields/pingpongbuffermanager";
+import { pixelBasedMoveProgramCache } from "../../programs/vectorfields/logics/pixelbased";
+import { drawRectangleParticlesProgramCache } from "../../programs/vectorfields/logics/drawrectangleparticles";
+import { FadeAwayProgramCache } from "../../programs/helpers/fadeaway";
+import { SeaWaveUbo } from "../../programs/vectorfields/logics/ubo-new";
 /**
  * STEPS:
  * 1. move particle | buffers: read b1 write b2 | swap buffers b1 <-> b2
@@ -50,8 +49,8 @@ export default class Plugin {
         this.gl = gl;
         this.moveParticle = pixelBasedMoveProgramCache.getProgram(gl);
         this.drawParticle = drawRectangleParticlesProgramCache.getProgram(gl);
-        this.fadeAway = new FadeAway(gl);
-        this.globeShellWiggle = new GlobeShellWiggle(gl, globe, this._globeshellparameters);
+        this.fadeAway = FadeAwayProgramCache.get(gl);
+        this.globeShellWiggle = new BBOXGlobeShell(gl, globe, this._globeshellparameters);
         const inPositionLocation = this.moveParticle.getInPositionLocation();
         this.bufferManager = new PingPongBufferManager(gl, this._particleCount, inPositionLocation);
         this._rgVectorFieldTexture = this._createRGTexture();
@@ -122,8 +121,9 @@ export default class Plugin {
         }
         ;
         this._isFreed = true;
-        const { gl, fadeAway, globeShellWiggle, _rgVectorFieldTexture, bufferManager, waveUbo, _drawTextures, _frameBuffer } = this;
-        fadeAway.free();
+        const { gl, globeShellWiggle, _rgVectorFieldTexture, bufferManager, waveUbo, _drawTextures, _frameBuffer } = this;
+        this.fadeAway = null;
+        FadeAwayProgramCache.release(gl);
         globeShellWiggle.free();
         gl.deleteTexture(_rgVectorFieldTexture);
         // glProgramCache.releaseProgram(gl, MoveParticle);

package/{wind → vectorfield/wind}/index.js

@@ -1,5 +1,5 @@
 import WindPlugin from "./plugin";
 import createVectorFieldImage from "./vectorfieldimage";
 import imageToMagnitude, { imageToRadianAngle } from "./imagetovectorfieldandmagnitude";
-import { createImageFromBase64 } from "../util/webglobjectbuilders";
+import { createImageFromBase64 } from "../../util/webglobjectbuilders";
 export { createVectorFieldImage, imageToMagnitude, WindPlugin, createImageFromBase64, imageToRadianAngle };

package/{wind → vectorfield/wind}/plugin.js

@@ -1,9 +1,10 @@
 /**
  * Author: Toprak Nihat Deniz Ozturk
  */
-import * as util from "../util";
+import { createImageFromBase64, createProgramWrapper, createTexture, createBuffer, bindAttribute, bindFramebuffer, bindTexture, getColorRamp } from "../../util/webglobjectbuilders";
+import { defaultblendfunction } from "../../util/webglobe/gldefaultstates";
 import imageToMagnitude, { imageToRadianAngle } from "./imagetovectorfieldandmagnitude";
-import { TexturePointSampler } from "../util/heatwavedatamanager/texture-point-sampler";
+import { TexturePointSampler } from "../../heatwave/texture-point-sampler";
 /**
  * Shader Dökümanı:
  * * Vektör alan haritasında kaçış değeri
@@ -111,7 +112,6 @@ void main() {
 
     // take EPSG:4236 distortion into account for calculating where the particle moved
     // float distortion = 1.0; //cos(radians(pos.y * 180.0 - 90.0));
-    // vec2 offset = vec2(velocity.x / distortion, -velocity.y) * 0.0001 * u_speed_factor;
     vec2 offset = vec2(velocity.x, velocity.y) * 0.0001 * u_speed_factor;
 
     // update particle position, wrapping around the date line
@@ -415,7 +415,7 @@ export default class WindPlugin {
         if (this.gl == null) {
             return;
         }
-        this.colorRampTexture = util.createTexture(this.gl, this.gl.LINEAR, util.getColorRamp(colors), 16, 16);
+        this.colorRampTexture = createTexture(this.gl, this.gl.LINEAR, getColorRamp(colors), 16, 16);
     }
     setColorRampDefault() {
         const { uMax, uMin, vMax, vMin } = this.windData;
@@ -452,8 +452,8 @@ export default class WindPlugin {
                 values[i]
             ]);
         }
-        const colorRamp = util.getColorRamp(colors);
-        this.colorRampTexture = util.createTexture(gl, gl.LINEAR, colorRamp, 16, 16);
+        const colorRamp = getColorRamp(colors);
+        this.colorRampTexture = createTexture(gl, gl.LINEAR, colorRamp, 16, 16);
         this._rampMax = maxVelocity;
         this._loadRampMax();
     }
@@ -468,8 +468,8 @@ export default class WindPlugin {
             particleState[i] = Math.floor(Math.random() * 256); // randomize the initial particle positions
         }
         // textures to hold the particle state for the current and the next frame
-        this.particleStateTexture0 = util.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
-        this.particleStateTexture1 = util.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
+        this.particleStateTexture0 = createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
+        this.particleStateTexture1 = createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(this.updateProgram.program);
         gl.uniform1f(this.updateProgram.u_wind_res, this.particleStateResolution);
@@ -482,7 +482,7 @@ export default class WindPlugin {
         const particleIndices = new Float32Array(this._numParticles);
         for (let i = 0; i < this._numParticles; i++)
             particleIndices[i] = i;
-        this.particleIndexBuffer = util.createBuffer(gl, particleIndices);
+        this.particleIndexBuffer = createBuffer(gl, particleIndices);
     }
     get numParticles() {
         return this._numParticles;
@@ -504,7 +504,7 @@ export default class WindPlugin {
         const windDataMeta = this._windDataMeta;
         const gl = this.gl;
         this.windData = windData;
-        this.windTexture = util.createTexture(gl, gl.LINEAR, windData.image);
+        this.windTexture = createTexture(gl, gl.LINEAR, windData.image);
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
         gl.useProgram(this.updateProgram.program);
         gl.uniform2f(this.updateProgram.u_wind_res, windDataMeta.width, windDataMeta.height);
@@ -532,7 +532,7 @@ export default class WindPlugin {
      * @param {Array} windData.bbox - bounding box [minLon, minLat, maxLon, maxLat]
      */
     setWindDataWithImageBase64(windData) {
-        const image = util.createImageFromBase64(windData.image);
+        const image = createImageFromBase64(windData.image);
         image.onload = () => {
             windData.image = image;
             this.setWind(windData);
@@ -543,14 +543,14 @@ export default class WindPlugin {
      * @returns
      */
     getTexturePointSampler(type = `magnitude`) {
-        if (type == `magnitude`) {
+        if (type === `magnitude`) {
             if (!this.texturePointSampler) {
                 this._createTexturePointSampler();
                 this._setCoorcinatesDataCalculatorData();
             }
             return this.texturePointSampler;
         }
-        else if (type == `angle`) {
+        else if (type === `angle`) {
             if (!this.texturePointSamplerAngle) {
                 this._createTexturePointSamplerAngle();
                 this._setCoorcinatesDataCalculatorData();
@@ -638,12 +638,12 @@ export default class WindPlugin {
     // globe calls `draw3D` method on each frame
     draw3D(projMatrix, modelviewMatrix, transPos) {
         const gl = this.gl;
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-        this.transPos.set([transPos.x, transPos.y, transPos.z], 0);
-        this.projMatrix = projMatrix;
-        this.modelviewMatrix = modelviewMatrix;
-        gl.activeTexture(gl.TEXTURE0);
         if (this._doDraw()) {
+            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            this.transPos.set([transPos.x, transPos.y, transPos.z], 0);
+            this.projMatrix = projMatrix;
+            this.modelviewMatrix = modelviewMatrix;
+            gl.activeTexture(gl.TEXTURE0);
             const depthTest = gl.isEnabled(gl.DEPTH_TEST);
             if (depthTest)
                 gl.disable(gl.DEPTH_TEST);
@@ -651,32 +651,31 @@ export default class WindPlugin {
             this._draw();
             if (depthTest)
                 gl.enable(gl.DEPTH_TEST);
+            // test visuals
+            // gl.viewport(0, 0, 100, 100);
+            // this._drawTexture(this.windTexture, 1.0);
+            // gl.viewport(0, 100, 100, 100);
+            // this._drawTexture(this.particleStateTexture0, 1.0);
+            // gl.viewport(0, 200, 100, 100);
+            // this._drawTexture(this.colorRampTexture, 1.0);
+            this._resetMachineStates();
+            this.globe.DrawRender();
         }
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-        // test visuals
-        // gl.viewport(0, 0, 100, 100);
-        // this._drawTexture(this.windTexture, 1.0);
-        // gl.viewport(0, 100, 100, 100);
-        // this._drawTexture(this.particleStateTexture0, 1.0);
-        // gl.viewport(0, 200, 100, 100);
-        // this._drawTexture(this.colorRampTexture, 1.0);
-        this._resetMachineStates();
-        this.globe.DrawRender();
     }
     _drawScreen() {
         const { gl, globe } = this;
-        util.bindTexture(gl, this.windTexture, 0);
-        util.bindTexture(gl, this.particleStateTexture0, 1);
+        bindTexture(gl, this.windTexture, 0);
+        bindTexture(gl, this.particleStateTexture0, 1);
         // draw the screen into a temporary framebuffer to retain it as the background on the next frame
-        util.bindFramebuffer(gl, this.framebuffer, this.screenTexture);
+        bindFramebuffer(gl, this.framebuffer, this.screenTexture);
         gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
         gl.enable(gl.BLEND);
         gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA); // non-premultiplied alpha
         this._drawTexture(this.backgroundTexture, this._fadeOpacity);
         this._drawParticles();
-        util.bindFramebuffer(gl, null);
+        bindFramebuffer(gl, null);
         this._drawTexture(this.screenTexture, 1.0);
-        gl.disable(gl.BLEND);
+        // gl.disable(gl.BLEND);
         // save the current screen as the background for the next frame
         const temp = this.backgroundTexture;
         this.backgroundTexture = this.screenTexture;
@@ -686,11 +685,13 @@ export default class WindPlugin {
         const gl = this.gl;
         const program = this.screenProgram;
         gl.useProgram(program.program);
-        util.bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
-        util.bindTexture(gl, texture, 2);
+        bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
+        bindTexture(gl, texture, 2);
         gl.uniform1i(program.u_screen, 2);
         gl.uniform1f(program.u_opacity, opacity);
         gl.drawArrays(gl.TRIANGLES, 0, 6);
+        gl.bindTexture(gl.TEXTURE_2D, null);
+        gl.activeTexture(gl.TEXTURE0);
     }
     _loadRampMax() {
         const { gl } = this;
@@ -706,8 +707,8 @@ export default class WindPlugin {
         const { gl, projMatrix, modelviewMatrix, transPos } = this;
         const program = this.drawSphereProgram;
         gl.useProgram(program.program);
-        util.bindAttribute(gl, this.particleIndexBuffer, program.a_index, 1);
-        util.bindTexture(gl, this.colorRampTexture, 2);
+        bindAttribute(gl, this.particleIndexBuffer, program.a_index, 1);
+        bindTexture(gl, this.colorRampTexture, 2);
         gl.uniform1i(program.u_wind, 0);
         gl.uniform1i(program.u_particles, 1);
         gl.uniform1i(program.u_color_ramp, 2);
@@ -720,8 +721,8 @@ export default class WindPlugin {
         const { gl, transPos, projMatrix, globe } = this;
         const program = this.drawFlatProgram;
         gl.useProgram(program.program);
-        util.bindAttribute(gl, this.particleIndexBuffer, program.a_index, 1);
-        util.bindTexture(gl, this.colorRampTexture, 2);
+        bindAttribute(gl, this.particleIndexBuffer, program.a_index, 1);
+        bindTexture(gl, this.colorRampTexture, 2);
         gl.uniform1i(program.u_wind, 0);
         gl.uniform1i(program.u_particles, 1);
         gl.uniform1i(program.u_color_ramp, 2);
@@ -761,25 +762,38 @@ export default class WindPlugin {
     _updateParticles() {
         const gl = this.gl;
         const program = this.updateProgram;
+        gl.disable(gl.BLEND);
         gl.useProgram(program.program);
         gl.viewport(0, 0, this.particleStateResolution, this.particleStateResolution);
-        util.bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
+        bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
         gl.uniform1i(program.u_wind, 0);
         gl.uniform1i(program.u_particles, 1);
-        util.bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
+        bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
         gl.uniform1f(program.u_rand_seed, Math.random());
-        util.bindFramebuffer(gl, this.framebuffer, this.particleStateTexture1);
+        bindFramebuffer(gl, this.framebuffer, this.particleStateTexture1);
         gl.drawArrays(gl.TRIANGLES, 0, 6);
         // swap the particle state textures so the new one becomes the current one
         const temp = this.particleStateTexture0;
         this.particleStateTexture0 = this.particleStateTexture1;
         this.particleStateTexture1 = temp;
+        // Add this line to restore the viewport
+        gl.viewport(0, 0, this.globe.api_ScrW(), this.globe.api_ScrH());
     }
     _resetMachineStates() {
         const { gl, globe } = this;
-        // gl.disable(gl.DEPTH_TEST);
-        // gl.disable(gl.STENCIL_TEST);
+        // Unbind all textures
+        for (let i = 0; i < 3; i++) {
+            gl.activeTexture(gl.TEXTURE0 + i);
+            gl.bindTexture(gl.TEXTURE_2D, null);
+        }
         gl.activeTexture(gl.TEXTURE0);
+        // Unbind buffers
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+        gl.bindVertexArray(null); // Add this line
+        gl.enable(gl.BLEND);
+        defaultblendfunction(gl);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
         gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
     }
     _loadHeight() {
@@ -873,11 +887,11 @@ export default class WindPlugin {
         // console.log("init wind plugin")
         this.globe = globe;
         this.gl = gl;
-        this.drawSphereProgram = util.createProgramWrapper(gl, drawSphereVert, drawFrag);
-        this.screenProgram = util.createProgramWrapper(gl, quadVert, screenFrag);
-        this.updateProgram = util.createProgramWrapper(gl, quadVert, updateFrag);
-        this.drawFlatProgram = util.createProgramWrapper(gl, drawFlatVert, drawFrag);
-        this.quadBuffer = util.createBuffer(gl, new Float32Array([0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1]));
+        this.drawSphereProgram = createProgramWrapper(gl, drawSphereVert, drawFrag);
+        this.screenProgram = createProgramWrapper(gl, quadVert, screenFrag);
+        this.updateProgram = createProgramWrapper(gl, quadVert, updateFrag);
+        this.drawFlatProgram = createProgramWrapper(gl, drawFlatVert, drawFrag);
+        this.quadBuffer = createBuffer(gl, new Float32Array([0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1]));
         this.framebuffer = gl.createFramebuffer();
         this._loadFadeOpacity();
         this._loadSpeedFactor();
@@ -897,8 +911,8 @@ export default class WindPlugin {
         const { gl, globe } = this;
         const emptyPixels = new Uint8Array(globe.api_ScrW() * globe.api_ScrH() * 4);
         // screen textures to hold the drawn screen for the previous and the current frame
-        this.backgroundTexture = util.createTexture(gl, gl.LINEAR, emptyPixels, globe.api_ScrW(), globe.api_ScrH());
-        this.screenTexture = util.createTexture(gl, gl.LINEAR, emptyPixels, globe.api_ScrW(), globe.api_ScrH());
+        this.backgroundTexture = createTexture(gl, gl.LINEAR, emptyPixels, globe.api_ScrW(), globe.api_ScrH());
+        this.screenTexture = createTexture(gl, gl.LINEAR, emptyPixels, globe.api_ScrW(), globe.api_ScrH());
         gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
     }
     // globe calls this `free` on plugin object unregistration

package/write-text/context-text3.js

@@ -1,4 +1,3 @@
-// @ts-ignore
 import { CSZMode } from "@pirireis/webglobe";
 import { isTextFont, opacityCheck } from "../util/check/typecheck";
 /**

package/write-text/context-text4.js

@@ -103,8 +103,9 @@ export class ContextTextWriter4 {
             }, style.zMode === CSZMode.Z_MSL);
             textFont.size = sizeMultiplier * textSize;
             textFont.position = position;
-            if (x !== null && y !== null)
+            if (x !== null && y !== null) {
                 globe.api_DrawContextTextMultiLine(text, textFont, o, { x: x + xOffset, y: y - yOffset }, angleIsOn, angle);
+            }
         }
         textFont.size = textSize;
     }

package/write-text/objectarraylabels/index.js

@@ -0,0 +1,2 @@
+import ObjectArrayLabels from "./objectarraylabels";
+export default ObjectArrayLabels;

package/Math/tessellation/tessellation-algorithm.js

@@ -1,67 +0,0 @@
-"use strict";
-/**
- * @input
- * A series of points defining a polygon
- * @output
- * A series of triangles that fill the polygon
- *
- * @steps
- * @1. cut
- * @2. sort
- * @3. connect
- *
- * @cut
- * @1. find tile cuts on the arcs, tag: enum vertex {pillar, corner},
- * @2. find inner cuts on the arcs
- *
- * @sorter
- * sort by
- * @1 y coordinate, then x coordinate
- * @2
- *
- *
- * @connect
- *
- * 1. Pick two rows from the top
- * 2. Go left to right
- * 3. Compeare x values to connect point closest to it
- *
- * @smartConnect
- *
- * if hit from left to right, take a break
- * if hit a concave edge, fonnect all the points until jump over to the following point of the concave
- *
- * that way I can calculate polygons with holes
- *
- * That raises a division
- *
- * instead of dividing into triangles
- * divide into convex polygons
- *
- * convex save points and zoom level of convex shape.
- * populate middle points when on zoom level increase
- *
- * @Future
- *
- * 1. cut is ready.
- * WEBMercator(DEM data) to globe:
- *   cutting with tileXY coordinates base and convert back to longlat and vector3
- *   solves
- * 2. connect looks promising. Can run on triangle approach as well
- *
- * Solving a polygon
- *   in a single shot
- *   without dividing into triangles
- *   takes all the arcs to be cut in single go.
- *   To continue following questions arise:
- *   how to match points in a row?
- *    Cut arcs in two if they have Z limits
- *    cut by parallel lines,
- *    sort by x
- *    if 2
- *   How to handle points in between rows?
- *
- *
- */
-class PartialTesselation {
-}

package/arrowfield/index.js

@@ -1,3 +0,0 @@
-import ArrowField from "./plugin";
-import { centigradePlus90ToRadians } from "./adaptor";
-export { ArrowField, centigradePlus90ToRadians };

package/bearing-line/index.js

@@ -1,2 +0,0 @@
-import BearingLinePlugin from "./plugin";
-export { BearingLinePlugin };