more package movement for the separate renderers

benfry · benfry · commit e2e68512905c · 2015-06-21T22:24:49.000-04:00
diff --git a/core/src/processing/awt/PGraphicsJava2D.java b/core/src/processing/awt/PGraphicsJava2D.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.core;
+package processing.awt;
 
 import java.awt.*;
 import java.awt.font.TextAttribute;
@@ -32,6 +32,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import processing.core.*;
+
 
 /**
  * Subclass for PGraphics that implements the graphics API using Java2D.
@@ -1571,7 +1573,7 @@ protected void imageImpl(PImage who,
       cash = new ImageCache(); //who);
       setCache(who, cash);
       who.updatePixels();  // mark the whole thing for update
-      who.modified = true;
+      who.setModified();
     }
 
     // If image previously was tinted, or the color changed
@@ -1583,15 +1585,15 @@ protected void imageImpl(PImage who,
       who.updatePixels();
     }
 
-    if (who.modified) {
+    if (who.isModified()) {
       if (who.pixels == null) {
         // This might be a PGraphics that hasn't been drawn to yet.
         // Can't just bail because the cache has been created above.
         // https://github.com/processing/processing/issues/2208
         who.pixels = new int[who.width * who.height];
       }
       cash.update(who, tint, tintColor);
-      who.modified = false;
+      who.setModified(false);
     }
 
     g2.drawImage(((ImageCache) getCache(who)).image,
@@ -2030,7 +2032,7 @@ protected void textLineImpl(char buffer[], int start, int stop,
       // also changes global setting for antialiasing, but this is because it's
       // not possible to enable/disable them independently in some situations.
       g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                          textFont.smooth ?
+                          textFont.isSmooth() ?
                           RenderingHints.VALUE_ANTIALIAS_ON :
                           RenderingHints.VALUE_ANTIALIAS_OFF);
 
diff --git a/core/src/processing/awt/PSurfaceAWT.java b/core/src/processing/awt/PSurfaceAWT.java
@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.core;
+package processing.awt;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -32,6 +32,11 @@
 
 import javax.swing.JFrame;
 
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+import processing.core.PImage;
+import processing.core.PSurfaceNone;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
 
@@ -101,7 +106,7 @@ public PSurfaceAWT(PGraphics graphics) {
     canvas.addComponentListener(new ComponentAdapter() {
       @Override
       public void componentResized(ComponentEvent e) {
-        if (!sketch.looping) {
+        if (!sketch.isLooping()) {
           // make sure this is a real resize event, not just initial setup
           // https://github.com/processing/processing/issues/3310
           Dimension canvasSize = canvas.getSize();
@@ -792,16 +797,16 @@ public void placeWindow(int[] location, int[] editorLocation) {
   // needs to resize the frame, which will resize the canvas, and so on...
   @Override
   public void setSize(int wide, int high) {
-    if (PApplet.DEBUG) {
-      //System.out.format("frame visible %b, setSize(%d, %d) %n", frame.isVisible(), wide, high);
-      new Exception(String.format("setSize(%d, %d)", wide, high)).printStackTrace(System.out);
-    }
+//    if (PApplet.DEBUG) {
+//      //System.out.format("frame visible %b, setSize(%d, %d) %n", frame.isVisible(), wide, high);
+//      new Exception(String.format("setSize(%d, %d)", wide, high)).printStackTrace(System.out);
+//    }
 
     //if (wide == sketchWidth && high == sketchHeight) {  // doesn't work on launch
     if (wide == sketch.width && high == sketch.height) {
-      if (PApplet.DEBUG) {
-        new Exception("w/h unchanged " + wide + " " + high).printStackTrace(System.out);
-      }
+//      if (PApplet.DEBUG) {
+//        new Exception("w/h unchanged " + wide + " " + high).printStackTrace(System.out);
+//      }
       return;  // unchanged, don't rebuild everything
     }
 
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -2526,6 +2526,11 @@ synchronized public void noLoop() {
   }
 
 
+  public boolean isLooping() {
+    return looping;
+  }
+
+
   //////////////////////////////////////////////////////////////
 
 
diff --git a/core/src/processing/core/PConstants.java b/core/src/processing/core/PConstants.java
@@ -57,7 +57,7 @@ public interface PConstants {
   });
   */
 
-  static final String JAVA2D = "processing.core.PGraphicsJava2D";
+  static final String JAVA2D = "processing.awt.PGraphicsJava2D";
 
   static final String P2D = "processing.opengl.PGraphics2D";
   static final String P3D = "processing.opengl.PGraphics3D";
@@ -70,7 +70,7 @@ public interface PConstants {
 //  static final String E2D = PGraphicsDanger2D.class.getName();
 
   // Experimental JavaFX renderer; even better 2D performance
-  static final String FX2D = "processing.core.PGraphicsFX2D";
+  static final String FX2D = "processing.javafx.PGraphicsFX2D";
 
   static final String PDF = "processing.pdf.PGraphicsPDF";
   static final String SVG = "processing.svg.PGraphicsSVG";
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
@@ -560,6 +560,11 @@ public int getDefaultSize() {
   }
 
 
+  public boolean isSmooth() {
+    return smooth;
+  }
+
+
   public boolean isStream() {
     return stream;
   }
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.WeakHashMap;
 
+import processing.awt.PSurfaceAWT;
 import processing.opengl.PGL;
 import processing.opengl.PShader;
 
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
@@ -23,6 +23,7 @@
 
 package processing.core;
 
+import processing.awt.PGraphicsJava2D;
 import processing.data.*;
 
 import java.awt.Paint;
diff --git a/core/src/processing/core/PSurfaceNone.java b/core/src/processing/core/PSurfaceNone.java
@@ -28,12 +28,12 @@
  * class for other drawing surfaces. It includes the standard rendering loop.
  */
 public class PSurfaceNone implements PSurface {
-  PApplet sketch;
-  PGraphics graphics;
+  protected PApplet sketch;
+  protected PGraphics graphics;
 
-  Thread thread;
-  boolean paused;
-  Object pauseObject = new Object();
+  protected Thread thread;
+  protected boolean paused;
+  protected Object pauseObject = new Object();
 
   protected float frameRateTarget = 60;
   protected long frameRatePeriod = 1000000000L / 60L;
@@ -245,7 +245,7 @@ public void setFrameRate(float fps) {
   }
 
 
-  class AnimationThread extends Thread {
+  public class AnimationThread extends Thread {
 
     public AnimationThread() {
       super("Animation Thread");
diff --git a/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java b/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java
@@ -29,6 +29,7 @@
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
 
+import processing.awt.PGraphicsJava2D;
 import processing.core.*;
 
 
diff --git a/java/libraries/svg/src/processing/svg/PGraphicsSVG.java b/java/libraries/svg/src/processing/svg/PGraphicsSVG.java
@@ -30,6 +30,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMImplementation;
 
+import processing.awt.PGraphicsJava2D;
 import processing.core.*;
 
 

Original file line number	Diff line number	Diff line change
`@@ -2526,6 +2526,11 @@ synchronized public void noLoop() {`
`2526`	`2526`	`}`
`2527`	`2527`
`2528`	`2528`
	`2529`	`+ public boolean isLooping() {`
	`2530`	`+ return looping;`
	`2531`	`+ }`
	`2532`	`+`
	`2533`	`+`
`2529`	`2534`	`//////////////////////////////////////////////////////////////`
`2530`	`2535`
`2531`	`2536`
Original file line number	Diff line number	Diff line change
`@@ -560,6 +560,11 @@ public int getDefaultSize() {`
`560`	`560`	`}`
`561`	`561`
`562`	`562`
	`563`	`+ public boolean isSmooth() {`
	`564`	`+ return smooth;`
	`565`	`+ }`
	`566`	`+`
	`567`	`+`
`563`	`568`	`public boolean isStream() {`
`564`	`569`	`return stream;`
`565`	`570`	`}`