finish cleaning PGraphicsJava2D

core/api.txt

@@ -247,19 +247,6 @@
   public PStyle getStyle()
   public void getStyle(PStyle)
 
-  public void colorMode(int mode)
-  public void colorMode(int mode, float max)
-  public void colorMode(int mode, float mx, float my, float mz);
-  public void colorMode(int mode, float mx, float my, float mz, float ma);
-
-  protected void colorCalc(int rgb)
-  protected void colorCalc(int rgb, float alpha)
-  protected void colorCalc(float gray)
-  protected void colorCalc(float gray, float alpha)
-  protected void colorCalc(float x, float y, float z)
-  protected void colorCalc(float x, float y, float z, float a)
-  protected void colorCalcARGB(int argb, float alpha)
-
   public void strokeCap(int cap)
   public void strokeJoin(int join)
   public void strokeWeight(float weight)

core/src/processing/core/PGraphics.java

@@ -3898,6 +3898,7 @@ public class PGraphics extends PImage implements PConstants {
     strokeAlpha = calcAlpha;
   }
 
+  
 
   //////////////////////////////////////////////////////////////
 

core/src/processing/core/PGraphics3D.java

@@ -3387,23 +3387,7 @@ public class PGraphics3D extends PGraphics {
   
   // STYLE
   
-  // All methods are inherited from PGraphics.
-
-
-  
-  //////////////////////////////////////////////////////////////
-  
-  // COLOR MODE
-  
-  // All methods are inherited from PGraphics.
-
-  
-
-  //////////////////////////////////////////////////////////////
-  
-  // COLOR CALC
-  
-  // All methods are inherited from PGraphics.
+  // pushStyle(), popStyle(), style() and getStyle() inherited. 
 
 
   
@@ -3825,6 +3809,8 @@ public class PGraphics3D extends PGraphics {
 
   // BACKGROUND
 
+  // Base background() variations inherited from PGraphics.
+  
 
   protected void backgroundImpl(PImage image) {
     System.arraycopy(image.pixels, 0, pixels, 0, pixels.length);
@@ -3885,7 +3871,7 @@ public class PGraphics3D extends PGraphics {
   
   //////////////////////////////////////////////////////////////
 
-  // BEGINRAW/ENDRAW
+  // BEGIN/END RAW
 
   // beginRaw, endRaw() both inherited.
 

core/todo.txt

@@ -59,6 +59,21 @@ o   although set() with alpha is a little different..
 o resizing opengl applet likely to cause big trouble
 o   componentlistener should prolly only do size() command outside of draw
 
+point()
+X java2d - if strokeWeight is 1, do screenX/Y and set()
+X   if strokeWeight larger, should work ok with line()
+X   no, use an ellipse if strokeWeight is larger
+X gl points not working again
+X   need to implement point() as actual gl points
+X   this means adding points to the pipeline
+X point() doesn't work with some graphics card setups
+X   particularly with opengl and java2d
+X   http://dev.processing.org/bugs/show_bug.cgi?id=121
+X point() issues
+o   point() being funneled through beginShape is terribly slow
+X     go the other way 'round
+X   sometimes broken, could be a problem with java 1.5? (was using win2k)
+
 api changes
 setMainDrawingSurface() -> setPrimarySurface()
 mainDrawingSurface = primarySurface;
@@ -89,6 +104,8 @@ smooth is now part of PGraphics, moved out of PImage
 imageMode has been removed from PImage, too awkward
 raw must handle points, lines, triangles, and textures
 
+um, this is gross: getMatrix((PMatrix2D) null)
+
 _ no changing point sizes when using beginShape(POINTS)
 _   this is an opengl restriction, should we stick with it elsewhere?
 _   and changing stroke weight in general (with lines/shapes)
@@ -260,30 +277,6 @@ _ PPolygon no longer in use and PLine is a mess
 _   make a version of PGraphics3 that uses it for more accurate rendering?
 
 
-point() [1.0]
-_ java2d - if strokeWeight is 1, do screenX/Y and set()
-_   if strokeWeight larger, should work ok with line()
-_   no, use an ellipse if strokeWeight is larger
-_ gl points not working again
-_   need to implement point() as actual gl points
-_   this means adding points to the pipeline
-_ point() doesn't work with some graphics card setups
-_   particularly with opengl and java2d
-_   http://dev.processing.org/bugs/show_bug.cgi?id=121
-_ point() issues
-_   point() being funneled through beginShape is terribly slow
-_     go the other way 'round
-_   sometimes broken, could be a problem with java 1.5? (was using win2k)
-noStroke();
-colorMode(RGB, 100);  
-for(int i=0; i<100; i++) {  
-  for(int j=0; j<100; j++) {  
-    stroke(i, j, 0);  
-    point(i, j);  
-  }  
-}  
-
-
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .