From 3b82919d3e08358d60c6ed450dbb9ae786486316 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 2 Jan 2012 00:32:34 -0500 Subject: [PATCH 1/4] Fresh start without too many jars --- .gitignore | 1 + bin/processing-commander | 13 + bin/prochome-check | 13 + build.xml | 29 ++ build/.gitkeep | 0 lib/amd64 | 1 + lib/x86_64/mbh-processing-practice.jar | Bin 0 -> 5065 bytes sketchbook/WaveGradient/WaveGradient.pde | 42 +++ sketchbook/libraries/.gitkeep | 0 sketchbook/modes/.gitkeep | 0 sketchbook/tools/.gitkeep | 0 .../processing/ProcessingRunner.java | 272 ++++++++++++++++++ 12 files changed, 371 insertions(+) create mode 100644 .gitignore create mode 100755 bin/processing-commander create mode 100755 bin/prochome-check create mode 100644 build.xml create mode 100644 build/.gitkeep create mode 120000 lib/amd64 create mode 100644 lib/x86_64/mbh-processing-practice.jar create mode 100644 sketchbook/WaveGradient/WaveGradient.pde create mode 100644 sketchbook/libraries/.gitkeep create mode 100644 sketchbook/modes/.gitkeep create mode 100644 sketchbook/tools/.gitkeep create mode 100644 src/com/meatballhat/processing/ProcessingRunner.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b468b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.class diff --git a/bin/processing-commander b/bin/processing-commander new file mode 100755 index 0000000..373a5e5 --- /dev/null +++ b/bin/processing-commander @@ -0,0 +1,13 @@ +#!/bin/bash +TOP="$(dirname $(dirname $(readlink -f -- "$0")))" + +CP="$CLASSPATH" +CP="$TOP/lib/$(uname -a)/mbh-processing-practice.jar:$CP" +for procjar in "lib/core" "lib/pde" "java/lib/tools" "java/lib/rt" +do + CP="$PROCESSING_HOME/$procjar.jar:$CP" +done + +test -n "$DEBUG" && echo "DEBUG:CP=$CP" + +java -cp "$CP" com.meatballhat.processing.ProcessingRunner "$@" diff --git a/bin/prochome-check b/bin/prochome-check new file mode 100755 index 0000000..3932b0c --- /dev/null +++ b/bin/prochome-check @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ -z "$PROCESSING_HOME" ]; then + cat >&2 < + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/.gitkeep b/build/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/lib/amd64 b/lib/amd64 new file mode 120000 index 0000000..4c36ca9 --- /dev/null +++ b/lib/amd64 @@ -0,0 +1 @@ +x86_64/ \ No newline at end of file diff --git a/lib/x86_64/mbh-processing-practice.jar b/lib/x86_64/mbh-processing-practice.jar new file mode 100644 index 0000000000000000000000000000000000000000..efc670e695fea9df21961956bd458a8618955f45 GIT binary patch literal 5065 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 G_V<4#h5F(E literal 0 HcmV?d00001 diff --git a/sketchbook/WaveGradient/WaveGradient.pde b/sketchbook/WaveGradient/WaveGradient.pde new file mode 100644 index 0000000..67b728a --- /dev/null +++ b/sketchbook/WaveGradient/WaveGradient.pde @@ -0,0 +1,42 @@ +/** + * Wave Gradient + * by Ira Greenberg. + * + * Generate a gradient along a sin() wave. + */ + +float angle = 0; +float px = 0, py = 0; +float amplitude = 30; +float frequency = 0; +float fillGap = 2.5; +color c; + +int colorRange = 255; +int ncycles = 500; + +void setup() { + size(640, 360); + background(200); + noLoop(); +} + +void draw() { + for (int i =- ncycles; i < height+ncycles; i++){ + // Reset angle to 0, so waves stack properly + angle = 0; + // Increasing frequency causes more gaps + frequency+=.01; + for (float j = 0; j < width+ncycles; j++){ + py = i + sin(radians(angle)) * amplitude; + angle += frequency; + c = color(abs(py-i)*colorRange/amplitude, colorRange-abs(py-i)*colorRange/amplitude, j*((colorRange * 1.0)/(width+(int)(ncycles * 0.66)))); + // Hack to fill gaps. Raise value of fillGap if you increase frequency + for (int filler = 0; filler < fillGap; filler++){ + set(int(j-filler), int(py)-filler, c); + set(int(j), int(py), c); + set(int(j+filler), int(py)+filler, c); + } + } + } +} diff --git a/sketchbook/libraries/.gitkeep b/sketchbook/libraries/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/sketchbook/modes/.gitkeep b/sketchbook/modes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/sketchbook/tools/.gitkeep b/sketchbook/tools/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/com/meatballhat/processing/ProcessingRunner.java b/src/com/meatballhat/processing/ProcessingRunner.java new file mode 100644 index 0000000..981afc9 --- /dev/null +++ b/src/com/meatballhat/processing/ProcessingRunner.java @@ -0,0 +1,272 @@ +package com.meatballhat.processing; + + +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; + +import processing.app.Base; +import processing.app.Preferences; +import processing.app.SketchException; +import processing.app.RunnerListener; +import processing.app.Sketch; +import processing.core.PApplet; +import processing.mode.java.runner.*; + + +public class ProcessingRunner implements processing.app.RunnerListener { + static final String helpArg = "--help"; + static final String preprocArg = "--preprocess"; + static final String buildArg = "--build"; + static final String runArg = "--run"; + static final String presentArg = "--present"; + static final String sketchArg = "--sketch="; + static final String outputArg = "--output="; + static final String exportAppletArg = "--export-applet"; + static final String exportApplicationArg = "--export-application"; + static final String platformArg = "--platform="; + static final String bitsArg = "--bits="; + static final String preferencesArg = "--preferences="; + + static final int HELP = -1; + static final int PREPROCESS = 0; + static final int BUILD = 1; + static final int RUN = 2; + static final int PRESENT = 3; + static final int EXPORT_APPLET = 4; + static final int EXPORT_APPLICATION = 5; + + Sketch sketch; + + static public void main(String[] args) { + // Do this early so that error messages go to the console + Base.setCommandLine(); + // init the platform so that prefs and other native code is ready to go + Base.initPlatform(); + // make sure a full JDK is installed + Base.initRequirements(); + // run static initialization that grabs all the prefs + //Preferences.init(null); + // launch command line handler + new ProcessingRunner(args); + } + + public ProcessingRunner(String[] args) { + String sketchFolder = null; + String pdePath = null; // path to the .pde file + String outputPath = null; + String preferencesPath = null; + int platformIndex = PApplet.platform; // default to this platform + int platformBits = 0; + int mode = HELP; + + for (String arg : args) { + if (arg.length() == 0) { + // ignore it, just the crappy shell script + + } else if (arg.equals(helpArg)) { + // mode already set to HELP + + } else if (arg.equals(buildArg)) { + mode = BUILD; + + } else if (arg.equals(runArg)) { + mode = RUN; + + } else if (arg.equals(presentArg)) { + mode = PRESENT; + + } else if (arg.equals(preprocArg)) { + mode = PREPROCESS; + + } else if (arg.equals(exportAppletArg)) { + mode = EXPORT_APPLET; + + } else if (arg.equals(exportApplicationArg)) { + mode = EXPORT_APPLICATION; + + } else if (arg.startsWith(platformArg)) { + String platformStr = arg.substring(platformArg.length()); + platformIndex = Base.getPlatformIndex(platformStr); + if (platformIndex == -1) { + complainAndQuit(platformStr + " should instead be " + + "'windows', 'macosx', or 'linux'."); + } + } else if (arg.startsWith(sketchArg)) { + sketchFolder = arg.substring(sketchArg.length()); + File sketchy = new File(sketchFolder); + File pdeFile = new File(sketchy, sketchy.getName() + ".pde"); + pdePath = pdeFile.getAbsolutePath(); + + } else if (arg.startsWith(preferencesArg)) { + preferencesPath = arg.substring(preferencesArg.length()); + + } else if (arg.startsWith(outputArg)) { + outputPath = arg.substring(outputArg.length()); + + } else { + complainAndQuit("I don't know anything about " + arg + "."); + } + } + + if ((outputPath == null) && + (mode == PREPROCESS || mode == BUILD || + mode == RUN || mode == PRESENT)) { + complainAndQuit("An output path must be specified when using " + + preprocArg + ", " + buildArg + ", " + + runArg + ", or " + presentArg + "."); + } + + if (mode == HELP) { + printCommandLine(System.out); + System.exit(0); + } + + // --present --platform=windows "--sketch=/Applications/Processing 0148/examples/Basics/Arrays/Array" --output=test-build + + File outputFolder = new File(outputPath); + if (!outputFolder.exists()) { + if (!outputFolder.mkdirs()) { + complainAndQuit("Could not create the output folder."); + } + } + + // run static initialization that grabs all the prefs + // (also pass in a prefs path if that was specified) + Preferences.init(preferencesPath); + + if (sketchFolder == null) { + complainAndQuit("No sketch path specified."); + + } else if (outputPath.equals(pdePath)) { + complainAndQuit("The sketch path and output path cannot be identical."); + + } else if (!pdePath.toLowerCase().endsWith(".pde")) { + complainAndQuit("Sketch path must point to the main .pde file."); + + } else { + //Sketch sketch = null; + boolean success = false; + + try { + sketch = new Sketch(null, pdePath); + if (mode == PREPROCESS) { + success = true; // FIXME sketch.preprocess(new File(outputPath)) != null; + + } else if (mode == BUILD) { + success = true; // FIXME sketch.build(outputPath) != null; + + } else if (mode == RUN || mode == PRESENT) { + String className = "BUSTED"; // FIXME sketch.build(outputPath); + if (className != null) { + success = true; + Runner runner = new Runner(null, null); // FIXME new Runner(this, sketch); + runner.launch(true); // FIXME runner.launch(className, mode == PRESENT); + + } else { + success = false; + } + + } else if (mode == EXPORT_APPLET) { + if (outputPath != null) { + success = true; // FIXME sketch.exportApplet(outputPath); + } else { + String target = sketchFolder + File.separatorChar + "applet"; + success = true; // FIXME sketch.exportApplet(target); + } + } else if (mode == EXPORT_APPLICATION) { + if (outputPath != null) { + success = true; // FIXME sketch.exportApplication(outputPath, platformIndex, platformBits); + } else { + //String sketchFolder = + // pdePath.substring(0, pdePath.lastIndexOf(File.separatorChar)); + outputPath = + sketchFolder + File.separatorChar + + "application." + Base.getPlatformName(platformIndex); + success = true; // FIXME sketch.exportApplication(outputPath, platformIndex, platformBits); + } + } + System.exit(success ? 0 : 1); + + } catch (SketchException re) { + statusError(re); + + } catch (IOException e) { + e.printStackTrace(); + System.exit(1); + } + } + } + + public void statusNotice(String message) { + System.err.println(message); + } + + public void statusError(String message) { + System.err.println(message); + } + + public void statusError(Exception exception) { + if (exception instanceof SketchException) { + SketchException re = (SketchException) exception; + + // format the runner exception like emacs + //blah.java:2:10:2:13: Syntax Error: This is a big error message + String filename = sketch.getCode(re.getCodeIndex()).getFileName(); + int line = re.getCodeLine(); + int column = re.getCodeColumn(); + if (column == -1) column = 0; + // TODO if column not specified, should just select the whole line. + System.err.println(filename + ":" + + line + ":" + column + ":" + + line + ":" + column + ":" + " " + re.getMessage()); + } else { + exception.printStackTrace(); + } + } + + static void complainAndQuit(String lastWords) { + printCommandLine(System.err); + System.err.println(lastWords); + System.exit(1); + } + + static void printCommandLine(PrintStream out) { + out.println("Processing " + Base.VERSION_NAME + " rocks the console."); + out.println(); + out.println("--help Show this help text."); + out.println(); + out.println("--sketch= Specify the sketch folder (required)"); + out.println("--output= Specify the output folder (required and"); + out.println(" cannot be the same as the sketch folder.)"); + out.println(); + out.println("--preprocess Preprocess a sketch into .java files."); + out.println("--build Preprocess and compile a sketch into .class files."); + out.println("--run Preprocess, compile, and run a sketch."); + out.println("--present Preprocess, compile, and run a sketch full screen."); + out.println(); + out.println("--export-applet Export an applet."); + out.println("--export-application Export an application."); + out.println("--platform Specify the platform (export to application only)."); + out.println(" Should be one of 'windows', 'macosx', or 'linux'."); + out.println("--bits Must be specified if libraries are used that are"); + out.println(" 32- or 64-bit specific such as the OpenGL library."); + out.println(" Otherwise specify 0 or leave it out."); + out.println(); + out.println("--preferences= Specify a preferences file to use. Required if the"); + out.println(" sketch uses libraries found in your sketchbook folder."); + } + + public void startIndeterminate() { + } + + public void stopIndeterminate() { + } + + public void statusHalt() { + } + + public boolean isHalted() { + return false; + } +} From 04e8529e4149fb551266a9544b1bcba4d9782d9f Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 2 Jan 2012 00:52:00 -0500 Subject: [PATCH 2/4] Minor cleanup, mostly... --- .gitignore | 1 + bin/processing-commander | 10 +++- bin/prochome-check | 6 +-- lib/preferences.txt.stub | 67 +++++++++++++++++++++++++ lib/x86_64/mbh-processing-practice.jar | Bin 5065 -> 5078 bytes 5 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 lib/preferences.txt.stub diff --git a/.gitignore b/.gitignore index 6b468b6..ec6e61a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.class +lib/preferences.txt diff --git a/bin/processing-commander b/bin/processing-commander index 373a5e5..78b1e46 100755 --- a/bin/processing-commander +++ b/bin/processing-commander @@ -1,8 +1,16 @@ #!/bin/bash +set -e + TOP="$(dirname $(dirname $(readlink -f -- "$0")))" +$TOP/bin/prochome-check >/dev/null + +if [ ! -f "$TOP/lib/preferences.txt" ]; then + cp "$TOP/lib/preferences.txt.stub" "$TOP/lib/preferences.txt" +fi + CP="$CLASSPATH" -CP="$TOP/lib/$(uname -a)/mbh-processing-practice.jar:$CP" +CP="$TOP/lib/$(uname -m)/mbh-processing-practice.jar:$CP" for procjar in "lib/core" "lib/pde" "java/lib/tools" "java/lib/rt" do CP="$PROCESSING_HOME/$procjar.jar:$CP" diff --git a/bin/prochome-check b/bin/prochome-check index 3932b0c..bb39dc2 100755 --- a/bin/prochome-check +++ b/bin/prochome-check @@ -2,9 +2,9 @@ if [ -z "$PROCESSING_HOME" ]; then cat >&2 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 delta 4279 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 z Date: Mon, 2 Jan 2012 00:57:53 -0500 Subject: [PATCH 3/4] Not tracking jar changes anymore (whoops.) --- lib/amd64 | 1 - lib/x86_64/mbh-processing-practice.jar | Bin 5078 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 120000 lib/amd64 delete mode 100644 lib/x86_64/mbh-processing-practice.jar diff --git a/lib/amd64 b/lib/amd64 deleted file mode 120000 index 4c36ca9..0000000 --- a/lib/amd64 +++ /dev/null @@ -1 +0,0 @@ -x86_64/ \ No newline at end of file diff --git a/lib/x86_64/mbh-processing-practice.jar b/lib/x86_64/mbh-processing-practice.jar deleted file mode 100644 index e10e11be0e491c0c3bdf961817b68691f1b8ddf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5078 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 W=pKlO`1^<}7theefMe?KZ~p^$>hd-K From a863dc99fc5e1967264c286f2adf2b27b50585ef Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 2 Jan 2012 01:11:50 -0500 Subject: [PATCH 4/4] Abandoning the architecture nonsense now that jars are not tracked. --- .gitignore | 1 + bin/processing-commander | 3 +-- build.xml | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ec6e61a..3df404d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.class +lib/* lib/preferences.txt diff --git a/bin/processing-commander b/bin/processing-commander index 78b1e46..89b50d8 100755 --- a/bin/processing-commander +++ b/bin/processing-commander @@ -2,7 +2,6 @@ set -e TOP="$(dirname $(dirname $(readlink -f -- "$0")))" - $TOP/bin/prochome-check >/dev/null if [ ! -f "$TOP/lib/preferences.txt" ]; then @@ -10,7 +9,7 @@ if [ ! -f "$TOP/lib/preferences.txt" ]; then fi CP="$CLASSPATH" -CP="$TOP/lib/$(uname -m)/mbh-processing-practice.jar:$CP" +CP="$TOP/lib/mbh-processing-practice.jar:$CP" for procjar in "lib/core" "lib/pde" "java/lib/tools" "java/lib/rt" do CP="$PROCESSING_HOME/$procjar.jar:$CP" diff --git a/build.xml b/build.xml index a46bfcb..2f860ad 100644 --- a/build.xml +++ b/build.xml @@ -1,16 +1,15 @@ - + - + - +