@pirireis/webglobeplugins 0.9.13 → 0.9.15

package/package.json

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

package/programs/index.js

@@ -3,7 +3,7 @@ import { GlobeShellWiggle } from "./globeshell/wiggle";
 import { CameraUniformBlockTotem, CameraUniformBlockString } from "./totems/index";
 import ArrowField from "./arrowfield";
 import { glProgramCache, globeProgramCache, noRegisterGlobeProgramCache } from "./programcache";
-import * as vectorfield from "./vectorfields";
+import * as vectorfield from "./vectorfields/index";
 import { FadeAway } from "./helpers";
 import * as rings from "./rings";
 export { Float2LegendWithRatio, GlobeShellWiggle, ArrowField, CameraUniformBlockTotem, CameraUniformBlockString, glProgramCache, globeProgramCache, noRegisterGlobeProgramCache, vectorfield, FadeAway, rings };

package/programs/line-on-globe/linestrip.js

@@ -1,6 +1,6 @@
 import { createProgram } from "../../util/webglobjectbuilders";
 import "../interface";
-import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems";
+import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/index";
 import { cartesian3DToGLPosition, mercatorXYToGLPosition, } from "../../util/shaderfunctions/geometrytransformations.js";
 import { noRegisterGlobeProgramCache } from "../programcache";
 import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";

package/programs/vectorfields/logics/drawrectangleparticles.js

@@ -88,17 +88,11 @@ class Logic {
         this.program = null;
     }
 }
-export default class {
-    constructor(gl) {
-        this.gl = gl;
-        this.logic = glProgramCache.getProgram(gl, Logic);
-    }
-    draw(bufferManager, vectorTexture, uboManager) {
-        this.logic.draw(bufferManager, vectorTexture, uboManager);
+export const drawRectangleParticlesProgramCache = Object.freeze({
+    getProgram: (gl) => {
+        return glProgramCache.getProgram(gl, Logic);
+    },
+    releaseProgram: (gl) => {
+        glProgramCache.releaseProgram(gl, Logic);
     }
-    free() {
-        glProgramCache.releaseProgram(this.gl, Logic);
-        this.logic = null;
-        this.gl = null;
-    }
-}
+});

package/programs/vectorfields/logics/index.js

@@ -1,4 +1,2 @@
-import PixelBasedMove from './pixelbased';
-import DrawRectangleParticles from './drawrectangleparticles';
 import { WaveParticalUboManager } from './ubo';
-export { PixelBasedMove, DrawRectangleParticles, WaveParticalUboManager };
+export { WaveParticalUboManager };

package/programs/vectorfields/logics/pixelbased.js

@@ -120,20 +120,11 @@ class Logic {
         return this.gl.getAttribLocation(this.program, 'in_position');
     }
 }
-export default class {
-    constructor(gl) {
-        this.gl = gl;
-        this.logic = glProgramCache.getProgram(gl, Logic);
-    }
-    move(bufferManager, vectorTexture, uboManager) {
-        this.logic.move(bufferManager, vectorTexture, uboManager);
-    }
-    free() {
-        glProgramCache.releaseProgram(this.gl, Logic);
-        this.program = null;
-        this.gl = null;
+export const pixelBasedMoveProgramCache = Object.freeze({
+    getProgram: (gl) => {
+        return glProgramCache.getProgram(gl, Logic);
+    },
+    releaseProgram: (gl) => {
+        glProgramCache.releaseProgram(gl, Logic);
     }
-    getInPositionLocation() {
-        return this.logic.getInPositionLocation();
-    }
-}
+});

package/util/webglobjectbuilders.js

@@ -241,14 +241,7 @@ export function getColorRamp(colors) {
     canvas.height = 1;
     const gradient = ctx.createLinearGradient(0, 0, 256, 0);
     for (const stop in colors) {
-        // Ensure the stop is a valid number, although `addColorStop` can parse strings,
-        // explicit conversion is safer for object keys if they come from arbitrary sources.
-        const stopValue = parseFloat(stop);
-        if (isNaN(stopValue)) {
-            console.warn(`Invalid stop value for color ramp: ${stop}. Skipping.`);
-            continue;
-        }
-        gradient.addColorStop(stopValue, colors[stop]);
+        gradient.addColorStop(colors[stop][0], colors[stop][1]);
     }
     ctx.fillStyle = gradient;
     ctx.fillRect(0, 0, 256, 1);
@@ -328,18 +321,18 @@ export function getColorRampModed(values, thresholds, mode = "interpolated") {
  * @returns A Uint8Array representing the RGBA pixel data of the default 1x256 color ramp.
  */
 export function defaultColorRamp() {
-    const defaultRampColors = {
-        "0.0": '#5e4fa2',
-        "0.15": '#3288bd',
-        "0.20": '#66c2a5',
-        "0.25": '#66c2a5',
-        "0.3": '#abdda4',
-        "0.4": '#e6f598',
-        "0.5": '#fee08b',
-        "0.6": '#fdae61',
-        "0.7": '#f46d43',
-        "1.0": '#ff1e13'
-    };
+    const defaultRampColors = [
+        [0.0, '#5e4fa2'],
+        [0.15, '#3288bd'],
+        [0.20, '#66c2a5'],
+        [0.25, '#66c2a5'],
+        [0.3, '#abdda4'],
+        [0.4, '#e6f598'],
+        [0.5, '#fee08b'],
+        [0.6, '#fdae61'],
+        [0.7, '#f46d43'],
+        [1.0, '#ff1e13']
+    ];
     return getColorRamp(defaultRampColors);
 }
 /**

package/waveparticles/plugin.js

@@ -1,10 +1,10 @@
 import { GlobeShellWiggle } from "../programs";
 import { defaultblendfunction } from "../util";
-import { vectorfield } from "../programs";
+import { vectorfield } from "../programs/index";
+import { pixelBasedMoveProgramCache } from "../programs/vectorfields/logics/pixelbased";
+import { drawRectangleParticlesProgramCache } from "../programs/vectorfields/logics/drawrectangleparticles";
 import { FadeAway } from "../programs";
-const { PixelBasedMove, DrawRectangleParticles, PingPongBufferManager, WaveParticalUboManager } = vectorfield;
-const MoveParticle = PixelBasedMove;
-const DrawParticle = DrawRectangleParticles;
+const { PingPongBufferManager, WaveParticalUboManager } = vectorfield;
 /**
  * STEPS:
  * 1. move particle | buffers: read b1 write b2 | swap buffers b1 <-> b2
@@ -47,8 +47,8 @@ export default class Plugin {
     init(globe, gl) {
         this.globe = globe;
         this.gl = gl;
-        this.moveParticle = new MoveParticle(gl);
-        this.drawParticle = new DrawParticle(gl);
+        this.moveParticle = pixelBasedMoveProgramCache.getProgram(gl);
+        this.drawParticle = drawRectangleParticlesProgramCache.getProgram(gl);
         this.fadeAway = new FadeAway(gl);
         this.globeShellWiggle = new GlobeShellWiggle(gl, globe, this._globeshellparameters);
         const inPositionLocation = this.moveParticle.getInPositionLocation();
@@ -142,16 +142,21 @@ export default class Plugin {
     }
     // TODO: free all resources
     free() {
-        const { gl, fadeAway, globeShellWiggle, _rgVectorFieldTexture, bufferManager, waveUbo, _drawTextures, _frameBuffer } = this;
+        if (this._isFreed) {
+            console.warn("WaveParticle plugin is already freed");
+            return;
+        }
+        ;
         this._isFreed = true;
+        const { gl, fadeAway, globeShellWiggle, _rgVectorFieldTexture, bufferManager, waveUbo, _drawTextures, _frameBuffer } = this;
         fadeAway.free();
         globeShellWiggle.free();
         gl.deleteTexture(_rgVectorFieldTexture);
         // glProgramCache.releaseProgram(gl, MoveParticle);
-        this.moveParticle.free();
+        pixelBasedMoveProgramCache.getProgram(gl);
         this.moveParticle = null;
         // glProgramCache.releaseProgram(gl, DrawParticle);
-        this.drawParticle.free();
+        drawRectangleParticlesProgramCache.getProgram(gl);
         this.drawParticle = null;
         bufferManager.free();
         waveUbo.free();