From c73b206731689b6e9a74eb6fe5557c2e88c88b25 Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Mon, 7 Apr 2014 21:44:50 -0400 Subject: [PATCH 1/6] Make OpenGL stuff available to PDE runtime on mac. --- build/build.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/build.xml b/build/build.xml index 60f2540b3..49f01bb41 100755 --- a/build/build.xml +++ b/build/build.xml @@ -517,6 +517,10 @@ + + + + From a1bdd2e2ed778a78797868183eaba86065f92771 Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Mon, 7 Apr 2014 21:55:21 -0400 Subject: [PATCH 2/6] Make OpenGL core classes available to PDE on Windows. --- build/windows/launcher/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index dc7d954f2..b58a1842c 100755 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -17,6 +17,12 @@ processing.app.Base lib/pde.jar core/library/core.jar + core/library/gluegen-rt.jar + core/library/gluegen-rt-natives-windows-amd64.jar + core/library/gluegen-rt-natives-windows-i586.jar + core/library/jogl-all-natives-windows-amd64.jar + core/library/jogl-all-natives-windows-i586.jar + core/library/core.jar lib/jna.jar lib/antlr.jar lib/ant.jar From 649477cf6c7c34cbcde30f51b1857738d368811d Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 8 Apr 2014 04:28:15 -0400 Subject: [PATCH 3/6] double entry --- build/windows/launcher/config.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index b58a1842c..ef906a3c8 100755 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -22,7 +22,6 @@ core/library/gluegen-rt-natives-windows-i586.jar core/library/jogl-all-natives-windows-amd64.jar core/library/jogl-all-natives-windows-i586.jar - core/library/core.jar lib/jna.jar lib/antlr.jar lib/ant.jar From ad19f1d80f17b044748ee57365e9f17027388b63 Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Tue, 8 Apr 2014 15:59:10 +0530 Subject: [PATCH 4/6] added accessor methods for editor status properties --- app/src/processing/app/Editor.java | 15 +++++++++++++++ app/src/processing/app/EditorStatus.java | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 3463555e0..d5f384c46 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -2551,6 +2551,21 @@ public abstract class Editor extends JFrame implements RunnerListener { } } + /** + * Returns the current notice message in the + * editor status bar. + */ + public String getStatusMessage(){ + return status.message; + } + + /** + * Returns the current mode of the editor status bar + * NOTICE, ERR or EDIT + */ + public int getStatusMode(){ + return status.mode; + } /** * Clear the status area. diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java index 4f006d580..2a317502e 100644 --- a/app/src/processing/app/EditorStatus.java +++ b/app/src/processing/app/EditorStatus.java @@ -36,11 +36,11 @@ public class EditorStatus extends JPanel { Color[] bgcolor; Color[] fgcolor; - static final int NOTICE = 0; - static final int ERR = 1; + public static final int NOTICE = 0; + public static final int ERR = 1; //static final int PROMPT = 2; //static final int EDIT = 3; - static final int EDIT = 2; + public static final int EDIT = 2; static final int YES = 1; static final int NO = 2; From a6c01affe90d4121d1ecf144cc2d8e21bb515aea Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 8 Apr 2014 08:54:57 -0700 Subject: [PATCH 5/6] Added related links to lerp() and PVector.lerp() --- core/src/processing/core/PApplet.java | 3 +++ core/src/processing/core/PGraphics.java | 1 + core/src/processing/core/PVector.java | 1 + 3 files changed, 5 insertions(+) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 86743a202..7efba35e5 100755 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -5261,6 +5261,8 @@ public class PApplet extends Applet * @param amt float between 0.0 and 1.0 * @see PGraphics#curvePoint(float, float, float, float, float) * @see PGraphics#bezierPoint(float, float, float, float, float) + * @see PVector#lerp(PVector, float) + * @see PGraphics#lerpColor(int, int, float) */ static public final float lerp(float start, float stop, float amt) { return start + (stop-start) * amt; @@ -15334,6 +15336,7 @@ public class PApplet extends Applet * @param amt between 0.0 and 1.0 * @see PImage#blendColor(int, int, int) * @see PGraphics#color(float, float, float, float) + * @see PApplet#lerp(float, float, float) */ public int lerpColor(int c1, int c2, float amt) { return g.lerpColor(c1, c2, amt); diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java index d108dffce..ce2a25f56 100644 --- a/core/src/processing/core/PGraphics.java +++ b/core/src/processing/core/PGraphics.java @@ -7637,6 +7637,7 @@ public class PGraphics extends PImage implements PConstants { * @param amt between 0.0 and 1.0 * @see PImage#blendColor(int, int, int) * @see PGraphics#color(float, float, float, float) + * @see PApplet#lerp(float, float, float) */ public int lerpColor(int c1, int c2, float amt) { return lerpColor(c1, c2, amt, colorMode); diff --git a/core/src/processing/core/PVector.java b/core/src/processing/core/PVector.java index ca25eb1db..1d2bd4b8a 100644 --- a/core/src/processing/core/PVector.java +++ b/core/src/processing/core/PVector.java @@ -880,6 +880,7 @@ public class PVector implements Serializable { * @brief Linear interpolate the vector to another vector * @param v the vector to lerp to * @param amt The amount of interpolation; some value between 0.0 (old vector) and 1.0 (new vector). 0.1 is very near the new vector. 0.5 is halfway in between. + * @see PApplet#lerp(float, float, float) */ public void lerp(PVector v, float amt) { x = PApplet.lerp(x,v.x,amt); From ee417dc726f791f9822d0acd976ba9536a60cdc7 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 8 Apr 2014 12:02:56 -0400 Subject: [PATCH 6/6] fix formatting to conventions --- app/src/processing/app/Editor.java | 9 +++++---- app/src/processing/app/EditorStatus.java | 8 +++----- core/todo.txt | 3 ++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index d5f384c46..907d260a9 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -2551,21 +2551,22 @@ public abstract class Editor extends JFrame implements RunnerListener { } } + /** - * Returns the current notice message in the - * editor status bar. + * Returns the current notice message in the editor status bar. */ public String getStatusMessage(){ return status.message; } + /** - * Returns the current mode of the editor status bar - * NOTICE, ERR or EDIT + * Returns the current mode of the editor status bar: NOTICE, ERR or EDIT. */ public int getStatusMode(){ return status.mode; } + /** * Clear the status area. diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java index 2a317502e..c99d45f31 100644 --- a/app/src/processing/app/EditorStatus.java +++ b/app/src/processing/app/EditorStatus.java @@ -36,11 +36,9 @@ public class EditorStatus extends JPanel { Color[] bgcolor; Color[] fgcolor; - public static final int NOTICE = 0; - public static final int ERR = 1; - //static final int PROMPT = 2; - //static final int EDIT = 3; - public static final int EDIT = 2; + static public final int NOTICE = 0; + static public final int ERR = 1; + static public final int EDIT = 2; static final int YES = 1; static final int NO = 2; diff --git a/core/todo.txt b/core/todo.txt index 33ad5e347..df3ebad7e 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -37,7 +37,8 @@ A https://github.com/processing/processing/issues/2416 A fix pixels[] array for video capture A https://github.com/processing/processing/issues/2424 - +_ tint() not working in PDF (regression from previous release) +_ https://github.com/processing/processing/issues/2428 _ XML.getChildren() fix _ https://github.com/processing/processing/issues/2367