@pirireis/webglobeplugins 1.5.3 → 1.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.5.3",
+    "version": "1.5.5",
     "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,6 +263,7 @@ 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/tools/icon-factory/icon-factory.js

@@ -70,7 +70,6 @@ export class IconFactory {
         if (!(combinationsMap instanceof Map)) {
             throw new Error('combinationsMap must be a Map instance.');
         }
-        console.log("combinationMap", combinationsMap);
         if (combinationsMap !== this.combinationMap) {
             this.combinationMap = combinationsMap;
             const baseSize = this.printer.baseSize;

package/tools/icon-factory/parts/png-blob-map.js

@@ -56,8 +56,7 @@ export class PngBlobMapPart {
             img.onload = () => resolve(img);
             img.onerror = () => {
                 this.imageCache.delete(src);
-                console.error(`Failed to load base64 image for src: ${src.slice(0, 64)}...`);
-                reject(new Error(`Failed to load base64 image for src: ${src.slice(0, 64)}...`));
+                reject(new Error(`Failed to load base64 image`));
             };
             img.src = src;
         });
@@ -70,11 +69,26 @@ export class PngBlobMapPart {
     }
     async printPart(partInput, targetCanvas, partDestination) {
         const source = this.getBase64Source(partInput);
-        const img = await this.loadImage(source);
         const ctx = targetCanvas.getContext("2d");
         if (!ctx) {
             throw new Error("Failed to get 2D context from target canvas.");
         }
+        let img;
+        try {
+            img = await this.loadImage(source);
+        }
+        catch {
+            // draw Red Pixels to indicate broken image
+            ctx.fillStyle = "red";
+            ctx.fillRect(partDestination.x, partDestination.y, partDestination.width, partDestination.height);
+            return;
+        }
+        if (img.naturalWidth === 0 || img.naturalHeight === 0) {
+            // draw Red Pixels to indicate broken image
+            ctx.fillStyle = "red";
+            ctx.fillRect(partDestination.x, partDestination.y, partDestination.width, partDestination.height);
+            return;
+        }
         const { x, y, width, height } = partDestination;
         ctx.drawImage(img, 0, 0, img.width, img.height, x, y, width, height);
     }

package/tools/icon-factory/parts/url-image.js

@@ -35,11 +35,26 @@ export class UrlImagePart {
     }
     async printPart(partInput, targetCanvas, partDestination) {
         const url = this.getUrl(partInput);
-        const img = await this.loadImage(url);
         const ctx = targetCanvas.getContext('2d');
         if (!ctx) {
             throw new Error('Failed to get 2D context from target canvas.');
         }
+        let img;
+        try {
+            img = await this.loadImage(url);
+        }
+        catch {
+            // draw Red Pixels to indicate broken image
+            ctx.fillStyle = "red";
+            ctx.fillRect(partDestination.x, partDestination.y, partDestination.width, partDestination.height);
+            return;
+        }
+        if (img.naturalWidth === 0 || img.naturalHeight === 0) {
+            // draw Red Pixels to indicate broken image
+            ctx.fillStyle = "red";
+            ctx.fillRect(partDestination.x, partDestination.y, partDestination.width, partDestination.height);
+            return;
+        }
         const { x, y, width, height } = partDestination;
         ctx.drawImage(img, 0, 0, img.width, img.height, // Source rectangle (entire image)
         x, y, // Destination start point on the target canvas

package/tracks/timetracks/plugin-line-strip.js

@@ -182,20 +182,27 @@ export default class TimeTrackMultiColorPlugin {
     draw3D(projMatrix, modelviewMatrix, transPos) {
         if (!this._ready)
             return;
-        const { _headTime, _tailTime, program, _transporArr, globe } = this;
+        const { _headTime, _tailTime, program, _transporArr, globe, gl } = this;
         this.pointProgram?.draw();
         _transporArr.set([transPos.x, transPos.y, transPos.z], 0);
         const geomType = globe.api_GetCurrentGeometry();
+        // 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 targetFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
         if (geomType === 0) {
-            program.draw(_headTime, _tailTime, projMatrix, modelviewMatrix, _transporArr);
+            program.draw(_headTime, _tailTime, projMatrix, modelviewMatrix, _transporArr, null, targetFBO);
         }
         else if (geomType === 1) {
             const { width, height } = globe.api_GetCurrentWorldWH();
-            program.draw(_headTime, _tailTime, projMatrix, modelviewMatrix, _transporArr, [width, height]);
+            program.draw(_headTime, _tailTime, projMatrix, modelviewMatrix, _transporArr, [width, height], targetFBO);
         }
         else {
             console.error("Unknown geometry type", geomType);
         }
+        // Restore the globe's framebuffer in case any internal step changed it.
+        gl.bindFramebuffer(gl.FRAMEBUFFER, targetFBO);
     }
     resize(width, height) {
         const { program, globe } = this;

package/tracks/timetracks/program-line-strip.js

@@ -533,7 +533,7 @@ void main() {
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, _width, _height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
         gl.bindTexture(gl.TEXTURE_2D, null);
     }
-    draw(u_head_time, u_tail_time, uProjectionMatrix, uModelViewMatrix, uTranslate, u_mapWH = null) {
+    draw(u_head_time, u_tail_time, uProjectionMatrix, uModelViewMatrix, uTranslate, u_mapWH = null, targetFBO = null) {
         const { gl, _lineProgram, _blurProgram, _blurRepetition } = this;
         this._resetTexture();
         gl.enable(gl.BLEND);
@@ -576,7 +576,10 @@ void main() {
             gl.drawArrays(gl.TRIANGLES, 0, 6);
         }
         // combine  
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        // Composite into the globe's render target (targetFBO) instead of forcing the
+        // default framebuffer. The globe may render to its own FBO in 3D depth-buffered
+        // mode, so forcing null would discard the output and break subsequent plugins.
+        gl.bindFramebuffer(gl.FRAMEBUFFER, targetFBO);
         gl.useProgram(this._combineProgram.program);
         gl.bindVertexArray(this._combineProgram.vao);
         gl.activeTexture(gl.TEXTURE1);

package/vectorfield/wind/plugin.js

@@ -369,6 +369,10 @@ export default class WindPlugin {
         this.lastdatas = [[], [], { x: 0, y: 0, z: 0 }];
         this._drawParticles = this._drawParticlesSphere;
         this._lastLOD = 0;
+        // 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) {
@@ -633,13 +637,16 @@ export default class WindPlugin {
         const gl = this.gl;
         this._drawScreen();
         this._updateParticles();
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
     }
     // globe calls `draw3D` method on each frame
     draw3D(projMatrix, modelviewMatrix, transPos) {
         const gl = this.gl;
         if (this._doDraw()) {
-            gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            // 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);
             this.transPos.set([transPos.x, transPos.y, transPos.z], 0);
             this.projMatrix = projMatrix;
             this.modelviewMatrix = modelviewMatrix;
@@ -673,7 +680,7 @@ export default class WindPlugin {
         gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA); // non-premultiplied alpha
         this._drawTexture(this.backgroundTexture, this._fadeOpacity);
         this._drawParticles();
-        bindFramebuffer(gl, null);
+        bindFramebuffer(gl, this._prevFBO);
         this._drawTexture(this.screenTexture, 1.0);
         // gl.disable(gl.BLEND);
         // save the current screen as the background for the next frame
@@ -793,7 +800,10 @@ export default class WindPlugin {
         gl.bindVertexArray(null); // Add this line
         gl.enable(gl.BLEND);
         defaultblendfunction(gl);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        // Restore the framebuffer the globe was rendering into before draw3D was called.
+        // Forcing null here would clobber the globe's FBO in 3D depth-buffered mode and
+        // break subsequent plugins (e.g. arc-plugin, plugin-line-strip).
+        gl.bindFramebuffer(gl.FRAMEBUFFER, this._prevFBO);
         gl.viewport(0, 0, globe.api_ScrW(), globe.api_ScrH());
     }
     _loadHeight() {