tacking the other direction on offscreen

benfry · benfry · commit 6ebef4a2688c · 2015-04-19T14:21:15.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -1679,6 +1679,9 @@ protected PGraphics makeGraphics(int w, int h,
       pg.setPrimary(primary);
       if (path != null) pg.setPath(path);
 //      pg.setQuality(sketchQuality());
+      if (!primary) {
+        surface.initImage(pg, w, h);
+      }
       pg.setSize(w, h);
 
       // everything worked, return it
diff --git a/core/src/processing/core/PSurface.java b/core/src/processing/core/PSurface.java
@@ -103,6 +103,9 @@ public Frame initFrame(PApplet sketch, Color backgroundColor,
 
   public void setSize(int width, int height);
 
+  // create pixel buffer (pulled out for offscreen graphics)
+  public void initImage(PGraphics gr, int wide, int high);
+
   public void setSmooth(int level);
 
   public void setFrameRate(float fps);
diff --git a/core/src/processing/core/PSurfaceAWT.java b/core/src/processing/core/PSurfaceAWT.java
@@ -203,7 +203,8 @@ public void addNotify() {
     protected synchronized void render() {
       if (!EventQueue.isDispatchThread()) {
         //throw new IllegalStateException("render() called outside the EDT");
-        System.err.println("render() called outside the EDT");
+        //System.err.println("render() called outside the EDT");
+        new Exception("render() called outside the EDT").printStackTrace();
       }
 //      if (canvas == null) {
 //        removeListeners(this);
@@ -739,6 +740,18 @@ public void setSize(int wide, int high) {
 //      frame.setLocationRelativeTo(null);
 //    }
 
+    initImage(graphics, wide, high);
+
+    //throw new RuntimeException("implement me, see readme.md");
+    sketch.width = wide;
+    sketch.height = high;
+
+    // set PGraphics variables for width/height/pixelWidth/pixelHeight
+    graphics.setSize(wide, high);
+  }
+
+
+  public void initImage(PGraphics gr, int wide, int high) {
     GraphicsConfiguration gc = canvas.getGraphicsConfiguration();
     // If not realized (off-screen, i.e the Color Selector Tool), gc will be null.
     if (gc == null) {
@@ -749,15 +762,8 @@ public void setSize(int wide, int high) {
 
     // Formerly this was broken into separate versions based on offscreen or
     // not, but we may as well create a compatible image; it won't hurt, right?
-    int factor = graphics.pixelFactor;
-    graphics.image = gc.createCompatibleImage(wide * factor, high * factor);
-
-    //throw new RuntimeException("implement me, see readme.md");
-    sketch.width = wide;
-    sketch.height = high;
-
-    // sets internal variables for width/height/pixelWidth/pixelHeight
-    graphics.setSize(wide, high);
+    int factor = gr.pixelFactor;
+    gr.image = gc.createCompatibleImage(wide * factor, high * factor);
   }
 
 
diff --git a/core/src/processing/opengl/PSurfaceLWJGL.java b/core/src/processing/opengl/PSurfaceLWJGL.java
@@ -415,6 +415,11 @@ public void setSize(int width, int height) {
   }
 
 
+  public void initImage(PGraphics gr, int wide, int high) {
+    // TODO not sure yet how to implement [fry]
+  }
+
+
   @Override
   public void setSmooth(int level) {
     System.err.println("set smooth " + level);
