Merge pull request #7576 from processing/fix/fbo-saveCanvas

Fix saveCanvas for framebuffers
processing · Feb 24, 2025 · e9dbaa5 · e9dbaa5
2 parents 11196fd + 8207570
commit e9dbaa5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/image/image.js b/src/image/image.js
@@ -287,13 +287,13 @@ function image(p5, fn){
       const framebuffer = args[0];
       temporaryGraphics = this.createGraphics(framebuffer.width,
         framebuffer.height);
-      temporaryGraphics.pixelDensity(pixelDensity());
+      temporaryGraphics.pixelDensity(framebuffer.pixelDensity());
       framebuffer.loadPixels();
       temporaryGraphics.loadPixels();
       temporaryGraphics.pixels.set(framebuffer.pixels);
       temporaryGraphics.updatePixels();
 
-      htmlCanvas = temporaryGraphics.elt;
+      htmlCanvas = temporaryGraphics._renderer.canvas;
       args.shift();
     } else {
       htmlCanvas = this._curElement && this._curElement.elt;

diff --git a/test/unit/webgl/p5.Framebuffer.js b/test/unit/webgl/p5.Framebuffer.js
@@ -1,5 +1,23 @@
 import p5 from '../../../src/app.js';
 import { vi } from 'vitest';
+import * as fileSaver from 'file-saver';
+vi.mock('file-saver');
+
+expect.extend({
+  tobePng: (received) => {
+    if (received.type === 'image/png') {
+      return {
+        message: 'expect blob to have type image/png',
+        pass: true
+      }
+    } else {
+      return {
+        message: 'expect blob to have type image/png',
+        pass: false
+      }
+    }
+  }
+});
 
 suite('p5.Framebuffer', function() {
   let myp5;
@@ -640,4 +658,22 @@ suite('p5.Framebuffer', function() {
         );
       });
   });
+
+  suite('saveCanvas', function() {
+    test('should download a png file', async () => {
+      myp5.createCanvas(100, 100, myp5.WEBGL);
+      const fbo = myp5.createFramebuffer();
+      fbo.draw(() => myp5.background('red'));
+      myp5.saveCanvas(fbo);
+
+      await new Promise(res => setTimeout(res, 100));
+
+      expect(fileSaver.saveAs).toHaveBeenCalledTimes(1);
+      expect(fileSaver.saveAs)
+        .toHaveBeenCalledWith(
+          expect.tobePng(),
+          'untitled.png'
+        );
+    })
+  })
 });