make offscreen FX2D work, based on processing/processing#4698 from @GKFX

benfry · benfry · commit f7b8c29ccf32 · 2022-01-16T11:37:30.000-05:00
diff --git a/src/processing/javafx/PGraphicsFX2D.java b/src/processing/javafx/PGraphicsFX2D.java
@@ -33,6 +33,7 @@
 import java.util.Map;
 
 import javafx.scene.SnapshotParameters;
+import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.effect.BlendMode;
 import javafx.scene.image.PixelFormat;
@@ -112,7 +113,12 @@ public PGraphicsFX2D() { }
   //public void setPath(String path)
 
 
-  //public void setSize(int width, int height)
+  public void setSize(int width, int height) {
+    if (!primaryGraphics && context == null) {
+      context = new Canvas(width, height).getGraphicsContext2D();
+    }
+    super.setSize(width, height);
+  }
 
 
   //public void dispose()
@@ -157,6 +163,8 @@ public void endDraw() {
     if (!primaryGraphics) {
       // TODO this is probably overkill for most tasks...
       loadPixels();
+      // Make the image cache reload this.
+      modified = true;
     }
   }
 
@@ -2156,12 +2164,15 @@ public void loadPixels() {
         snapshotImage = new WritableImage(pixelWidth, pixelHeight);
       }
 
-      SnapshotParameters sp = null;
+      SnapshotParameters sp = new SnapshotParameters();
+      if (!primaryGraphics) {
+        // Alpha channel should not be made white (but only if offscreen)
+        sp.setFill(Color.TRANSPARENT);
+      }
       if (pixelDensity != 1) {
-        sp = new SnapshotParameters();
         sp.setTransform(Transform.scale(pixelDensity, pixelDensity));
       }
-      snapshotImage = ((PSurfaceFX) surface).canvas.snapshot(sp, snapshotImage);
+      snapshotImage = context.getCanvas().snapshot(sp, snapshotImage);
       PixelReader pr = snapshotImage.getPixelReader();
       pr.getPixels(0, 0, pixelWidth, pixelHeight, argbFormat, pixels, 0, pixelWidth);
 
diff --git a/todo.txt b/todo.txt
@@ -1,15 +1,17 @@
 1279 (4.0b4)
+o "Tint on FX2D now works properly, and improved JavaFX/Scenebuilder integration"
+o   https://github.com/processing/processing/pull/6051
+X   contains too many arbitrary changes (deleted lines, fields made public)
+X   uses new image cache object, not clear why
+X   cache mechanism would make memory run out
 
+contribs
+X make offscreen PGraphicsFX2D work (from @GKFX)
+X   https://github.com/processing/processing/issues/4638
+X   https://github.com/processing/processing/pull/4698
 
-possible additions for 4.x?
-_ Tint on FX2D now works properly, and improved JavaFX/Scenebuilder integration
-_   https://github.com/processing/processing/pull/6051
-_ make offscreen PGraphicsFX2D work
-_   https://github.com/processing/processing/issues/4638
-_   https://github.com/processing/processing/pull/4698
 
-
-api
+getting away from reliance on AWT
 _ better JavaFX-specific ways to handle loadImage()?
 _   https://github.com/processing/processing4/issues/56
 _ implement selectInput/Output/Folder methods in PSurfaceFX
