@pirireis/webglobeplugins 0.16.4 → 0.17.0

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,9 @@
 /**
  * Author: Toprak Nihat Deniz Ozturk
  */
-import * as util from "../util";
+import { createImageFromBase64, createProgramWrapper, createTexture, createBuffer, bindAttribute, bindFramebuffer, bindTexture, getColorRamp } from "../../util/webglobjectbuilders";
 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
@@ -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();
@@ -665,16 +665,16 @@ export default class WindPlugin {
     }
     _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);
         // save the current screen as the background for the next frame
@@ -686,8 +686,8 @@ 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);
@@ -706,8 +706,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 +720,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);
@@ -763,12 +763,12 @@ export default class WindPlugin {
         const program = this.updateProgram;
         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;
@@ -873,11 +873,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 +897,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/attached-text-writer.js

@@ -9,7 +9,7 @@ import { isTextFont, opacityCheck } from "../util/check/typecheck";
  * This makes the code more readable and maintainable.
  *
  * With AttachedTextWriter the glue is created by user.
- * I observed that the users generally uses a wrapper around the plugin logic anyway. This wrapper can be used as the glue for plugin and attacked writer.
+ * I observed that the users generally uses a wrapper around the plugin logic anyway. This wrapper can be used as the glue for plugin and attached writer.
  */
 export class AttachedTextWriter {
     constructor(globe, { style = {
@@ -57,6 +57,14 @@ export class AttachedTextWriter {
         this._itemMap.set(key, item);
         this.globe.DrawRender();
     }
+    removeItem(item) {
+        const key = this.keyAdaptor ? this.keyAdaptor(item) : item;
+        if (this._itemMap.delete(key)) {
+            this.globe.DrawRender();
+            return true;
+        }
+        return false;
+    }
     // TODO: use item style 
     draw() {
         if (!this.doDraw) {

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/objectarraylabels/index.js

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