@pirireis/webglobeplugins 1.6.2 → 1.6.4

package/altitude-locator/plugin.js

@@ -195,6 +195,7 @@ class PointGlowLineToEarthPlugin {
     draw3D() {
         const { _pickableWrapper, _bufferOrchestrator, _drawRange, _pickerDisplayer } = this;
         const { globe, gl } = this;
+        const globeFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         this._hoverAgent();
         this.resize();
         const is3D = globe.api_GetCurrentGeometry() == 0;
@@ -203,7 +204,7 @@ class PointGlowLineToEarthPlugin {
             drawRange,
         };
         this._doDraw(drawOptionsPoint, is3D, drawRange);
-        _pickerDisplayer.drawColorTexture();
+        _pickerDisplayer.drawColorTexture(globeFBO);
         if (this._hoveredObjectId === -1) {
             return;
         }
@@ -242,6 +243,7 @@ class PointGlowLineToEarthPlugin {
     _doDraw(drawOptionsPoint, is3D, drawRange) {
         const { gl, _pickableWrapper, _pickerDisplayer } = this;
         const { program, vao, ubo, uboLine, vaoLine } = _pickableWrapper;
+        const globeFBO = this.gl.getParameter(gl.FRAMEBUFFER_BINDING);
         if (this._doesChanged()) {
             _pickerDisplayer.bindFBO();
             _pickerDisplayer.clearTextures();
@@ -262,7 +264,7 @@ class PointGlowLineToEarthPlugin {
                 ]));
                 program.draw(vaoLine, drawOptionsLine, uboLine);
             }
-            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            gl.bindFramebuffer(gl.FRAMEBUFFER, globeFBO);
             uboLine.update(new Map([
                 ["u_opacity", [this._opacity]]
             ]));

package/heatwave/heatwave.js

@@ -36,6 +36,7 @@ export class HeatWavePlugin {
     }
     drawHeat() {
         const gl = this.gl;
+        const globeFBO = this.gl.getParameter(gl.FRAMEBUFFER_BINDING);
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
         gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._coloredHeatTexture, 0);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
@@ -45,7 +46,7 @@ export class HeatWavePlugin {
         gl.viewport(0, 0, ...this._resolution);
         this.heatProgram.draw();
         gl.viewport(0, 0, currentWidth, currentHeight);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, globeFBO);
         gl.useProgram(currentProgram);
         this.globe.DrawRender();
     }

package/package.json

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

package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.js

@@ -404,6 +404,7 @@ export class TerrainPolygonSemiPlugin {
             return;
         }
         const gl = this.globe.gl;
+        const globeFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         const useDepth = this._useDepth();
         gl.enable(gl.BLEND);
         defaultblendfunction(gl);
@@ -446,9 +447,11 @@ export class TerrainPolygonSemiPlugin {
         // --- FIX END ---
         gl.frontFace(gl.CCW);
         if (this._pickerDisplayer && !this._options.pickablePause && !useDepth) {
-            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-            this._pickerDisplayer.drawColorTexture();
+            this._pickerDisplayer.drawColorTexture(globeFBO);
             this._selfSelect();
+            // Restore the globe FBO so edges (and any later globe rendering) draw to the
+            // visible target. drawColorTexture restores to the picker FBO internally.
+            gl.bindFramebuffer(gl.FRAMEBUFFER, globeFBO);
         }
         if (this._options.drawEdges) {
             this._program.draw(this._attributeLoader, this._drawRealEdgeArcs, this._uboForRealEdgeArcs);

package/tracks/point-heat-map/point-to-heat-map-flow.js

@@ -24,20 +24,22 @@ class PointHeatmapFlow {
         this._bindTextureToFramebuffer();
     }
     _bindTextureToFramebuffer() {
-        const { gl, densityTexture, framebuffer } = this;
+        const { gl, densityTexture, framebuffer, globe } = this;
+        const globeFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
         gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, densityTexture, 0);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, globeFBO);
     }
     draw(legendTexture, pointSize, opacity = 1.0) {
         const { gl, globe, framebuffer } = this;
+        const globeFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         if (this._drawDensityRequired || this._isVisionChanged()) {
             gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
             gl.clearColor(0, 0, 0, 0);
             gl.viewport(0, 0, Math.floor(globe.api_ScrW()), Math.floor(globe.api_ScrH()));
             gl.clear(gl.COLOR_BUFFER_BIT);
             this._drawDensity(pointSize);
-            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            gl.bindFramebuffer(gl.FRAMEBUFFER, globeFBO);
         }
         defaultblendfunction(gl);
         this._drawLegend(legendTexture, opacity);

package/tracks/point-tracks/plugin.js

@@ -295,6 +295,11 @@ class PointTracksPlugin {
             throw new Error("Plugin is unregistered, PointTracks Plugin");
         }
         this.resize();
+        // Save the framebuffer the globe is currently rendering into and pass it to the
+        // program so the final composite lands in the globe's render target. The globe may
+        // render to its own FBO (3D depth-buffered mode); forcing null would discard the
+        // output and break subsequent plugins.
+        const globeFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         _pickerDisplayer.bindFBO();
         _pickerDisplayer.clearTextures();
         if (this._focusParams.on) {
@@ -303,8 +308,7 @@ class PointTracksPlugin {
         else {
             _pointProgram.draw(_vao, _bufferOrchestrator.length, this._drawOptionsUBO, null);
         }
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-        _pickerDisplayer.drawColorTexture();
+        _pickerDisplayer.drawColorTexture(globeFBO);
         this._selfSelect();
     }
     resize() {

package/util/picking/picker-displayer.js

@@ -136,6 +136,7 @@ class PickerDisplayer {
     clearTextures() {
         const gl = this.gl;
         const saved = this._saveState();
+        const currentFrameBuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         try {
             this.bindFBO();
             // Clear Index Attachment (Attachment 1)
@@ -160,6 +161,7 @@ class PickerDisplayer {
         finally {
             this._restoreState(saved);
         }
+        gl.bindFramebuffer(gl.FRAMEBUFFER, currentFrameBuffer);
     }
     // call before drawing the scene with gl picker shader
     bindFBO() {
@@ -175,11 +177,11 @@ class PickerDisplayer {
         }
     }
     // call after drawing the scene with gl picker shader
-    drawColorTexture() {
+    drawColorTexture(targetFBO) {
         const gl = this.gl;
         const saved = this._saveState();
         try {
-            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            gl.bindFramebuffer(gl.FRAMEBUFFER, targetFBO);
             gl.disable(gl.DEPTH_TEST);
             this.displayer.draw(this.colorTexture);
         }
@@ -277,7 +279,7 @@ class PickerDisplayer {
         const { gl } = this;
         const pbo = gl.createBuffer();
         gl.bindBuffer(gl.PIXEL_PACK_BUFFER, pbo);
-        gl.bufferData(gl.PIXEL_PACK_BUFFER, sizeInBytes, gl.STREAM_READ);
+        gl.bufferData(gl.PIXEL_PACK_BUFFER, sizeInBytes, gl.STREAM_DRAW);
         gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
         this._pboSize = sizeInBytes;
         if (this._pbo !== undefined) {

package/vectorfield/wind/plugin-persistant.js

@@ -206,7 +206,6 @@ export default class WindPlugin {
     }
     setUseSpeedField(use) {
         if (this.particlePlugin) {
-            console.log("use speed field set to ", use);
             this.particlePlugin.setUseSpeedField(use);
         }
     }
@@ -228,7 +227,6 @@ export default class WindPlugin {
     set minSpeed(value) {
         this.options.minSpeed = value;
         if (this.particlePlugin) {
-            console.log("value", value);
             this.particlePlugin.setMinSpeedThreshold(value);
         }
     }

package/vectorfield/wind/plugin.js

@@ -372,7 +372,6 @@ export default class WindPlugin {
         // 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
         // wind plugin must restore it instead of forcing the default framebuffer (null).
-        this._prevFBO = null;
     }
     // Uniforms are loaded once, on initiation and when they are changed.
     set height(value) {
@@ -630,16 +629,17 @@ export default class WindPlugin {
             return true;
         }
     }
-    _draw() {
+    _draw(targetFBO) {
         const gl = this.gl;
         this._drawScreen();
         this._updateParticles();
-        gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, targetFBO);
     }
     // globe calls `draw3D` method on each frame
     draw3D(projMatrix, modelviewMatrix, transPos) {
         const gl = this.gl;
         if (this._doDraw()) {
+            const currentFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
             // 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).
@@ -652,7 +652,7 @@ export default class WindPlugin {
             if (depthTest)
                 gl.disable(gl.DEPTH_TEST);
             // if (gl.disable(gl.STENCIL_TEST); // 
-            this._draw();
+            this._draw(currentFBO);
             if (depthTest)
                 gl.enable(gl.DEPTH_TEST);
             // test visuals