@pirireis/webglobeplugins 0.10.8-alpha → 0.10.10-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.10.8-alpha",
+    "version": "0.10.10-alpha",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",

package/util/heatwavedatamanager/texture-point-sampler.js

@@ -122,6 +122,7 @@ export class TexturePointSampler {
         const { posIndex, callback } = pointObject;
         if (posIndex === -1 || !this._isReady || this._ratio < 0 || this._ratio > 1) {
             callback(null, null, null);
+            return;
         }
         const data0 = this._textures[0][posIndex];
         if (this._textureCount === 1) {

package/waveparticles/plugin.js

@@ -16,7 +16,7 @@ const { PingPongBufferManager, WaveParticalUboManager } = vectorfield;
  */
 const MAX_PIXELS_ON_DIMENSION = 2200;
 export default class Plugin {
-    constructor(id, { dataWidth, dataHeight, fadeOpacity = 0.83, opacity = 0.75, minLon = -180, minLat = -90, maxLon = 180, maxLat = 90, escapeValue = -9999, patricleCount = 8000, flipY = true, drawTextureMaxPixelOnDimension = MAX_PIXELS_ON_DIMENSION } = {}) {
+    constructor(id, { dataWidth, dataHeight, fadeOpacity = 0.83, opacity = 0.75, minLon = -180, minLat = -90, maxLon = 180, maxLat = 90, patricleCount = 8000, flipY = true, drawTextureMaxPixelOnDimension = MAX_PIXELS_ON_DIMENSION } = {}) {
         this.id = id;
         this.globe = null;
         this.gl = null;
@@ -34,7 +34,6 @@ export default class Plugin {
         this._particleCount = patricleCount;
         this._dataWidth = dataWidth;
         this._dataHeight = dataHeight;
-        this._escapeValue = escapeValue;
         this._drawTextureMaxPixelOnDimension = drawTextureMaxPixelOnDimension;
         this._globeshellparameters = {
             minLon,
@@ -61,25 +60,8 @@ export default class Plugin {
         this._frameBuffer = gl.createFramebuffer();
         this.setBBox(this._globeshellparameters);
         this.setOpacity(this._opacity);
-        this.setEscapeValue(this._escapeValue);
         this.____drawIndex = 0;
     }
-    _createDrawTexture() {
-        const gl = this.gl;
-        const texture = gl.createTexture();
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        // gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 2200, 2200, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, this._drawTextureResolution.width, this._drawTextureResolution.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, 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.bindTexture(gl.TEXTURE_2D, null);
-        return texture;
-    }
-    _step() {
-        this._stepIndex = (this._stepIndex + 1) % this._fullCycleStepCount;
-    }
     draw3D() {
         if (this._isFreed)
             return;
@@ -132,19 +114,6 @@ export default class Plugin {
         }
         this._fullCycleStepCount = value;
     }
-    _createRGTexture() {
-        const { gl, _dataWidth, _dataHeight, } = this;
-        const texture = gl.createTexture();
-        // R32F
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RG32F, _dataWidth, _dataHeight, 0, gl.RG, gl.FLOAT, null);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-        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.bindTexture(gl.TEXTURE_2D, null);
-        return texture;
-    }
     // TODO: free all resources
     free() {
         if (this._isFreed) {
@@ -196,52 +165,6 @@ export default class Plugin {
         this.waveUbo.updateSingle("drop_rate", new Float32Array([value]));
         ;
     }
-    setEscapeValue(value) {
-        if (typeof value !== 'number') {
-            console.error("escape value must be a number");
-            return;
-        }
-        this._escapeValue = value;
-        this.waveUbo.updateSingle("escape_value", value);
-    }
-    __readAndWriteTextureData() {
-        const { gl, _rgVectorFieldTexture, _dataWidth, _dataHeight } = this;
-        // Step 1: Bind the texture to a framebuffer
-        // Step 2: Read the texture data into a Float32Array
-        gl.bindTexture(gl.TEXTURE_2D, _rgVectorFieldTexture);
-        const textureData = new Float32Array(_dataWidth * _dataHeight * 2); // RG32F has 2 components per pixel
-        gl.readPixels(0, 0, _dataWidth, _dataHeight, gl.RG, gl.FLOAT, textureData);
-        gl.bindTexture(gl.TEXTURE_2D, null);
-        // Step 3: Create a new texture and write the data back
-        // Step 4: Clean up
-        gl.deleteTexture(this._rgVectorFieldTexture);
-        // Replace the old texture with the new one
-        this._rgVectorFieldTexture = this._createRGTexture();
-        this.setVectorFieldData(textureData);
-    }
-    _drawTextureSizeFromBbox({ minLon, minLat, maxLon, maxLat }) {
-        let horizon;
-        if (minLon > 0 && maxLon < 0) {
-            horizon = 360 - minLon + maxLon;
-        }
-        else {
-            horizon = maxLon - minLon;
-        }
-        const vertical = maxLat - minLat;
-        let width, height;
-        if (horizon > vertical) {
-            width = this._drawTextureMaxPixelOnDimension;
-            height = Math.floor(this._drawTextureMaxPixelOnDimension * vertical / horizon);
-        }
-        else {
-            height = this._drawTextureMaxPixelOnDimension;
-            width = Math.floor(this._drawTextureMaxPixelOnDimension * horizon / vertical);
-        }
-        return {
-            width,
-            height
-        };
-    }
     setDrawTextureMaxPixelOnDimension(value) {
         this._drawTextureMaxPixelOnDimension = value;
         this._drawTextureResolution = this._drawTextureSizeFromBbox(this._globeshellparameters);
@@ -273,13 +196,14 @@ export default class Plugin {
         this.globeShellWiggle.setOpacity(value);
     }
     setParticleDimensions(tail, wing) {
-        if (0 < tail || 0 < wing) {
-            console.error("tail and wing must be greater than 0");
-        }
-        else {
+        if (0 < tail && 0 < wing) {
             this.waveUbo.updateSingle("tail_wing_base_limp", new Float32Array([tail, wing]));
             ;
         }
+        else {
+            console.error("tail and wing must be positive numbers");
+            return;
+        }
     }
     setParticleColor(color) {
         if (color.length !== 3) {
@@ -296,4 +220,71 @@ export default class Plugin {
         this.waveUbo.updateSingle("draw_texture_size", new Float32Array([this._drawTextureResolution.width, this._drawTextureResolution.height]));
         this._drawTextures = [this._createDrawTexture(), this._createDrawTexture()];
     }
+    __readAndWriteTextureData() {
+        const { gl, _rgVectorFieldTexture, _dataWidth, _dataHeight } = this;
+        // Step 1: Bind the texture to a framebuffer
+        // Step 2: Read the texture data into a Float32Array
+        gl.bindTexture(gl.TEXTURE_2D, _rgVectorFieldTexture);
+        const textureData = new Float32Array(_dataWidth * _dataHeight * 2); // RG32F has 2 components per pixel
+        gl.readPixels(0, 0, _dataWidth, _dataHeight, gl.RG, gl.FLOAT, textureData);
+        gl.bindTexture(gl.TEXTURE_2D, null);
+        // Step 3: Create a new texture and write the data back
+        // Step 4: Clean up
+        gl.deleteTexture(this._rgVectorFieldTexture);
+        // Replace the old texture with the new one
+        this._rgVectorFieldTexture = this._createRGTexture();
+        this.setVectorFieldData(textureData);
+    }
+    _drawTextureSizeFromBbox({ minLon, minLat, maxLon, maxLat }) {
+        let horizon;
+        if (minLon > 0 && maxLon < 0) {
+            horizon = 360 - minLon + maxLon;
+        }
+        else {
+            horizon = maxLon - minLon;
+        }
+        const vertical = maxLat - minLat;
+        let width, height;
+        if (horizon > vertical) {
+            width = this._drawTextureMaxPixelOnDimension;
+            height = Math.floor(this._drawTextureMaxPixelOnDimension * vertical / horizon);
+        }
+        else {
+            height = this._drawTextureMaxPixelOnDimension;
+            width = Math.floor(this._drawTextureMaxPixelOnDimension * horizon / vertical);
+        }
+        return {
+            width,
+            height
+        };
+    }
+    _createRGTexture() {
+        const { gl, _dataWidth, _dataHeight, } = this;
+        const texture = gl.createTexture();
+        // R32F
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RG32F, _dataWidth, _dataHeight, 0, gl.RG, gl.FLOAT, null);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+        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.bindTexture(gl.TEXTURE_2D, null);
+        return texture;
+    }
+    _createDrawTexture() {
+        const gl = this.gl;
+        const texture = gl.createTexture();
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        // gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 2200, 2200, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, this._drawTextureResolution.width, this._drawTextureResolution.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, 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.bindTexture(gl.TEXTURE_2D, null);
+        return texture;
+    }
+    _step() {
+        this._stepIndex = (this._stepIndex + 1) % this._fullCycleStepCount;
+    }
 }