diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 78d2854a4..8f63d81ca 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -665,11 +665,11 @@ public class PApplet extends Applet
handle(new Object[] { });
}
- public void handle(Object args[]) {
+ public void handle(Object oargs[]) {
for (int i = 0; i < count; i++) {
try {
//System.out.println(objects[i] + " " + args);
- methods[i].invoke(objects[i], args);
+ methods[i].invoke(objects[i], oargs);
} catch (Exception e) {
e.printStackTrace();
}
@@ -743,10 +743,10 @@ public class PApplet extends Applet
protected void registerWithArgs(RegisteredMethods meth,
- String name, Object o, Class args[]) {
+ String name, Object o, Class cargs[]) {
Class c = o.getClass();
try {
- Method method = c.getMethod(name, args);
+ Method method = c.getMethod(name, cargs);
meth.add(o, method);
} catch (Exception e) {
@@ -1028,7 +1028,7 @@ public class PApplet extends Applet
String irenderer, String ipath,
PApplet applet) {
if (irenderer.equals(P2D)) {
- throw new RuntimeException("P2D is not yet implemented, " +
+ throw new RuntimeException("P2D is not yet implemented, " +
"use JAVA2D or P3D instead.");
}
/*
@@ -1123,8 +1123,8 @@ public class PApplet extends Applet
* reference to the parent PApplet is included, which makes save() work
* without needing an absolute path.
*/
- public PImage createImage(int width, int height, int format) {
- PImage image = new PImage(width, height, format);
+ public PImage createImage(int wide, int high, int format) {
+ PImage image = new PImage(wide, high, format);
image.parent = this; // make save() work
return image;
}
@@ -1684,11 +1684,11 @@ public class PApplet extends Applet
mouseEvent = event;
int modifiers = event.getModifiers();
- if ((modifiers & MouseEvent.BUTTON1_MASK) != 0) {
+ if ((modifiers & InputEvent.BUTTON1_MASK) != 0) {
mouseButton = LEFT;
- } else if ((modifiers & MouseEvent.BUTTON2_MASK) != 0) {
+ } else if ((modifiers & InputEvent.BUTTON2_MASK) != 0) {
mouseButton = CENTER;
- } else if ((modifiers & MouseEvent.BUTTON3_MASK) != 0) {
+ } else if ((modifiers & InputEvent.BUTTON3_MASK) != 0) {
mouseButton = RIGHT;
}
// if running on macos, allow ctrl-click as right mouse
@@ -2058,14 +2058,21 @@ public class PApplet extends Applet
//////////////////////////////////////////////////////////////
- // controlling time and playing god
+ // controlling time (playing god)
/**
- * Delay for some amount of time. I'm not sure if this is even
- * helpful anymore, as the screen isn't updated before or after the
- * delay, meaning which means it just makes the app lock up
- * temporarily.
+ * The delay() function causes the program to halt for a specified time.
+ * Delay times are specified in thousandths of a second. For example,
+ * running delay(3000) will stop the program for three seconds and
+ * delay(500) will stop the program for a half-second. Remember: the
+ * display window is updated only at the end of draw(), so putting more
+ * than one delay() inside draw() will simply add them together and the new
+ * frame will be drawn when the total delay is over.
+ *
+ * I'm not sure if this is even helpful anymore, as the screen isn't
+ * updated before or after the delay, meaning which means it just
+ * makes the app lock up temporarily.
*/
public void delay(int napTime) {
if (frameCount == 0) return;
@@ -2089,8 +2096,8 @@ public class PApplet extends Applet
* setting, and will attempt to use maximum processor power to achieve
* maximum speed.
*/
- public void frameRate(float frameRateTarget) {
- this.frameRateTarget = frameRateTarget;
+ public void frameRate(float newRateTarget) {
+ this.frameRateTarget = newRateTarget;
}
@@ -2269,12 +2276,12 @@ public class PApplet extends Applet
* Launch a process using a platforms shell, and an array of
* args passed on the command line.
*/
- public Process open(String args[]) {
+ public Process open(String argv[]) {
try {
- return Runtime.getRuntime().exec(args);
+ return Runtime.getRuntime().exec(argv);
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException("Could not open " + join(args, ' '));
+ throw new RuntimeException("Could not open " + join(argv, ' '));
}
}
@@ -3701,7 +3708,7 @@ public class PApplet extends Applet
"added to your sketch and is readable.");
return null;
}
-
+
//font = Font.createFont(Font.TRUETYPE_FONT, openStream(name));
Method createFontMethod =
Font.class.getMethod("createFont",
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index 699992a48..8d5804b7b 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -4108,9 +4108,9 @@ public abstract class PGraphics extends PImage implements PConstants {
//////////////////////////////////////////////////////////////
- public void beginRaw(PGraphics raw) {
- this.raw = raw;
- raw.beginDraw();
+ public void beginRaw(PGraphics rawGraphics) {
+ this.raw = rawGraphics;
+ rawGraphics.beginDraw();
}
diff --git a/core/todo.txt b/core/todo.txt
index 879fc2395..637e02978 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -13,7 +13,17 @@ X http://dev.processing.org/bugs/show_bug.cgi?id=465
X fix from dave bollinger for the POSTERIZE filter
X http://dev.processing.org/bugs/show_bug.cgi?id=399
+_ no disk in drive error
+_ was this something that changed with the java updates?
+_ problem was the floppy drive.. gak
+_ http://dev.processing.org/bugs/show_bug.cgi?id=478
+
+_ textAlign(CENTER) with P3D and OPENGL produces messy result
+_ http://dev.processing.org/bugs/show_bug.cgi?id=475
+
_ java 1.5.0_10 breaks jogl
+_ rc1 update that will fix things
+_ https://jogl.dev.java.net/servlets/ProjectDocumentList?folderID=6624&;exp%20andFolder=6624&folderID=0
_ make sure the docs include "beginShape() cannot be nested"
@@ -235,6 +245,7 @@ _ sort issues will affect both
_ pixel operations are broken in opengl
_ get(), set(), copy(), blend(), loadPixels, updatePixels()
_ set(x, y, image) y reversed in openGL
+_ background(image) also broken
_ http://dev.processing.org/bugs/show_bug.cgi?id=91
_ also textMode(SCREEN)