eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 22:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up some size() issues, making notes wrapping up the release

Browse Source
This commit is contained in:
benfry
2012-06-01 15:46:58 +00:00
parent 5e89f31610
commit 5e27d4cb82
7 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/processing/mode/java/preproc/PdePreprocessor.java
View File

@@ -183,8 +183,8 @@ public class PdePreprocessor {
}
public String[] initSketchSize(String code) throws SketchException {
String[] info = parseSketchSize(code, true);
public String[] initSketchSize(String code, boolean sizeWarning) throws SketchException {
String[] info = parseSketchSize(code, sizeWarning);
if (info != null) {
sizeStatement = info[0];
sketchWidth = info[1];
@@ -249,8 +249,11 @@ public class PdePreprocessor {
return null;
}
// Remove additional space 'round the renderer
matches[3] = matches[3].trim();
// if the renderer entry is empty, set it to null
if (matches[3].trim().length() == 0) {
if (matches[3].length() == 0) {
matches[3] = null;
}
return matches;
@@ -832,13 +835,25 @@ public class PdePreprocessor {
if ((mode == Mode.STATIC) || (mode == Mode.ACTIVE)) {
if (sketchWidth != null && !hasMethod("sketchWidth")) {
out.println(indent + "public int sketchWidth() { return " + sketchWidth + "; }");
// Only include if it's a number (a variable will be a problem)
if (PApplet.parseInt(sketchWidth, -1) != -1 || sketchWidth.equals("displayWidth")) {
out.println(indent + "public int sketchWidth() { return " + sketchWidth + "; }");
}
}
if (sketchHeight != null && !hasMethod("sketchHeight")) {
out.println(indent + "public int sketchHeight() { return " + sketchHeight + "; }");
// Only include if it's a number
if (PApplet.parseInt(sketchHeight, -1) != -1 || sketchHeight.equals("displayHeight")) {
out.println(indent + "public int sketchHeight() { return " + sketchHeight + "; }");
}
}
if (sketchRenderer != null && !hasMethod("sketchRenderer")) {
out.println(indent + "public String sketchRenderer() { return " + sketchRenderer + "; }");
// Only include if it's a known renderer (otherwise it might be a variable)
if (sketchRenderer.equals("P2D") ||
sketchRenderer.equals("P3D") ||
sketchRenderer.equals("OPENGL") ||
sketchRenderer.equals("JAVA2D")) {
out.println(indent + "public String sketchRenderer() { return " + sketchRenderer + "; }");
}
}
if (!hasMethod("main")) {