@pirireis/webglobeplugins 1.5.5 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.5.5",
+    "version": "1.6.1",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",
@@ -15,4 +15,4 @@
     "peerDependencies": {
         "@pirireis/webglobe": "6.2.51^"
     }
-}
+}

package/semiplugins/shape-on-terrain/arc-plugin.js

@@ -263,7 +263,6 @@ export class ArcOnTerrainPlugin {
             indexes: null
         };
         program.draw(_attributeLoader, drawOptions, this._opacity, _arcUBOHandler);
-        console.log("draw3d arc");
         gl.enable(gl.DEPTH_TEST);
     }
     _buildArcs(subSetIDs = null) {

package/vectorfield/waveparticles/plugin.js

@@ -69,6 +69,10 @@ export default class Plugin {
     _ableToUseSpeedField = false;
     _initialSpeedFieldData = null;
     __adaptiveOpacity = 1;
+    // Holds the framebuffer the globe was rendering into when draw3D was called.
+    // The globe may render to its own FBO (e.g. for depth-buffered 3D mode), so the
+    // plugin must restore it instead of forcing the default framebuffer (null).
+    _prevFBO = null;
     constructor(id, options) {
         this.id = id;
         this.options = { ...this.options, ...options };
@@ -116,7 +120,6 @@ export default class Plugin {
         }
         if (this.options.useSpeedTexture) {
             this.waveUbo.updateSingle("use_magnitude_field", new Float32Array([1]));
-            console.log("use speed texture");
             if (this._initialSpeedFieldData) {
                 this.setSpeedField(this._initialSpeedFieldData);
                 this._initialSpeedFieldData = null;
@@ -142,9 +145,13 @@ export default class Plugin {
     draw3D() {
         if (this._isFreed)
             return;
-        const { gl, moveParticle, drawParticle, bufferManager, globeShellWiggle, waveUbo, fadeAway, _rgVectorFieldTexture } = this;
+        const { gl, moveParticle, drawParticle, bufferManager, globeShellWiggle, waveUbo, fadeAway, _rgVectorFieldTexture, globe } = this;
         if (!gl || !bufferManager || !globeShellWiggle || !waveUbo || !fadeAway || !_rgVectorFieldTexture)
             return;
+        // Save the framebuffer the globe is currently rendering into and restore it
+        // when we are done. The globe may render to its own FBO (3D depth-buffered
+        // mode), so we must not force the default framebuffer (null).
+        this._prevFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         gl.disable(gl.DEPTH_TEST);
         switch (this._stepIndex) {
             case 0:
@@ -158,8 +165,8 @@ export default class Plugin {
                 gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
                 gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._drawTextures[this.____drawIndex], 0);
                 drawParticle.draw(bufferManager, _rgVectorFieldTexture, waveUbo, this._colorFieldTexture, this._speedFieldTexture);
-                gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-                gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
+                gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
+                gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
                 break;
             case 2:
                 gl.viewport(0, 0, this._drawTextureResolution.width, this._drawTextureResolution.height);
@@ -168,15 +175,17 @@ export default class Plugin {
                 gl.blendFunc(gl.ONE, gl.ZERO);
                 gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._drawTextures[1 - this.____drawIndex], 0);
                 fadeAway.draw(this._drawTextures[this.____drawIndex], this.options.fadeOpacity);
-                gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+                gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
                 defaultblendfunction(gl);
-                gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
+                gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
                 break;
         }
         globeShellWiggle.setTexture(this._drawTextures[this.____drawIndex]);
         globeShellWiggle.draw();
         this._step();
         gl.enable(gl.DEPTH_TEST);
+        // Restore the globe's framebuffer in case any internal step changed it.
+        gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
     }
     setCycleStepCount(value) {
         if (value < 3) {
@@ -339,7 +348,6 @@ export default class Plugin {
             console.error("Speed field data length does not match the specified dataWidth and dataHeight.");
             return;
         }
-        console.log(data);
         gl.bindTexture(gl.TEXTURE_2D, this._speedFieldTexture);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, this.options.flipY);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, this.options.dataWidth, this.options.dataHeight, 0, gl.RED, gl.FLOAT, data);
@@ -357,7 +365,6 @@ export default class Plugin {
         this.waveUbo?.updateSingle("min_magnitude_threshold", new Float32Array([value]));
     }
     setMaxSpeedThreshold(value) {
-        console.log("setMaxSpeedThreshold called with value:", value);
         this.options.maxSpeedThreshold = value;
         this.waveUbo?.updateSingle("max_magnitude_threshold", new Float32Array([value]));
     }

package/vectorfield/wind/plugin.js

@@ -425,7 +425,6 @@ export default class WindPlugin {
         const { uMax, uMin, vMax, vMin } = this.windData;
         const maxSpeed = Math.sqrt(uMax * uMax + vMax * vMax);
         const minSpeed = Math.sqrt(uMin * uMin + vMin * vMin);
-        // console.log("maxSpeed", maxSpeed, "minSpeed", minSpeed);
         this._rampMax = maxSpeed > minSpeed ? maxSpeed : minSpeed;
         this._loadRampMax();
         this.setColorRamp(defaultRampColors);
@@ -482,7 +481,6 @@ export default class WindPlugin {
         gl.useProgram(this.drawFlatProgram.program);
         gl.uniform1f(this.drawFlatProgram.u_particles_res, this.particleStateResolution);
         gl.useProgram(currentProgram);
-        // console.log("numParticles", this._numParticles);
         const particleIndices = new Float32Array(this._numParticles);
         for (let i = 0; i < this._numParticles; i++)
             particleIndices[i] = i;
@@ -596,7 +594,6 @@ export default class WindPlugin {
         };
     }
     _loadBoundingBoxData(minX, minY, maxX, maxY) {
-        // console.log("minX", minX, "minY", minY, "maxX", maxX, "maxY", maxY)
         const gl = this.gl;
         const bboxMatrix = new Float32Array([
             maxX - minX, 0, 0,
@@ -703,7 +700,6 @@ export default class WindPlugin {
     _loadRampMax() {
         const { gl } = this;
         const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
-        // console.log("load ramp max", this._rampMax);
         gl.useProgram(this.drawSphereProgram.program);
         gl.uniform1f(this.drawSphereProgram.u_color_ramp_max, this._rampMax);
         gl.useProgram(this.drawFlatProgram.program);
@@ -894,7 +890,6 @@ export default class WindPlugin {
     }
     // globe plugin init methodu
     init(globe, gl) {
-        // console.log("init wind plugin")
         this.globe = globe;
         this.gl = gl;
         this.drawSphereProgram = createProgramWrapper(gl, drawSphereVert, drawFrag);