From 4ec2eed0fceb07b8330070dd20f282e9bf7d3300 Mon Sep 17 00:00:00 2001 From: benfry Date: Tue, 28 Sep 2004 05:09:35 +0000 Subject: [PATCH] fixes based on library work.. also properly load qtjava --- build/windows/launcher/launcher.cpp | 29 ++------------------------ build/windows/launcher/processing.exe | Bin 33645 -> 34229 bytes core/PApplet.java | 9 ++++++-- todo.txt | 10 +++++++-- 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp index 309c8a400..f5f1e6b53 100644 --- a/build/windows/launcher/launcher.cpp +++ b/build/windows/launcher/launcher.cpp @@ -127,31 +127,6 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) } } } - /* - // there's a bug in the QTJAVA installer, that sets this - // to a bad value if no java has been installed. grr. - // as a result, it's better just to ignore it. - // keep this code around since may be re-enabled later - if (getenv("QTJAVA") != NULL) { - strcpy(env_qtjava, getenv("QTJAVA")); - if (env_qtjava[0] == '\"') { - // starting quote in qtjava.. almost always - env_qtjava++; - - int len = strlen(env_qtjava); - if (env_qtjava[len-1] == '\"') { - env_qtjava[len-1] = 0; - } else { - // a starting quote but no ending quote.. - } - } - int last = strlen(env_qtjava); - env_qtjava[last++] = ';'; - env_qtjava[last] = 0; - } else { - env_qtjava[0] = 0; - } - */ // NO! put quotes around contents of cp, because %s might have spaces in it. // don't put quotes in it, because it's setting the environment variable @@ -163,7 +138,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) //"'" "%s" - //"%s" + "%s" //"%s" //"%s\\lib\\comm.jar;" @@ -185,7 +160,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) // the first three %s args //local_jre_installed ? "java\\lib\\rt.jar;java\\lib\\jaws.jar;" : "", local_jre_installed ? "java\\lib\\rt.jar;" : "", - //qtjava_path, + qtjava_path, //env_classpath, // the next several %s args diff --git a/build/windows/launcher/processing.exe b/build/windows/launcher/processing.exe index 3b8622f9d21687d4e731b39623daa98b08fe4f77..a71b0c227206a3687103b42d8be801efc61e0d47 100755 GIT binary patch delta 7998 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 t5>>D7L*j_Bx&R3sFx0A+gkL){6D0{)`0*3 diff --git a/core/PApplet.java b/core/PApplet.java index e8f88a3cb..c1c682c61 100644 --- a/core/PApplet.java +++ b/core/PApplet.java @@ -264,6 +264,8 @@ public class PApplet extends Applet // maybe start should also be used as the method for kicking // the thread on, instead of doing it inside paint() public void stop() { + //finished = true; + if (thread != null) { thread = null; } @@ -597,6 +599,7 @@ public class PApplet extends Applet } if (THREAD_DEBUG) println(Thread.currentThread().getName() + " thread finished"); + //stop(); // call to shutdown libs? } @@ -1058,7 +1061,7 @@ public class PApplet extends Applet * only works for applets, but eventually should be implemented * for applications as well, using code from PdeBase. */ - void link(String here) { + public void link(String here) { if (!online) { System.err.println("Can't open " + here); System.err.println("link() only works inside a web browser"); @@ -1074,7 +1077,7 @@ public class PApplet extends Applet } } - void link(String here, String there) { + public void link(String here, String there) { if (!online) { System.err.println("Can't open " + here); System.err.println("link() only works inside a web browser"); @@ -3899,10 +3902,12 @@ public class PApplet extends Applet int anything = System.in.read(); if (anything == EXTERNAL_STOP) { finished = true; + //stop(); //thread = null; // kill self } } catch (IOException e) { // not tested (needed?) but seems correct + //stop(); finished = true; //thread = null; } diff --git a/todo.txt b/todo.txt index c639f89de..272f8856e 100644 --- a/todo.txt +++ b/todo.txt @@ -238,22 +238,28 @@ X find serial example from tom igoe, include with new examples X remove sketchbook -> libraries until it works X serial_setup.command is missing from osx distribution X fix the note in the readme about it +X properly import qtjava from processing.exe -_ properly import qtjava from processing.exe +_ fix the default network, camera, serial examples with casey -_ figure out what to include for examples/libraries +X figure out what to include for examples/libraries _ let's not call it 'expert', let's just say w/o java _ "draw" is not highlighted as a keyword.. other keywords? _ draw(), PGraphics(), NO_DEPTH_TEST, PMovie(), PMovie.repeat() _ PClient(), PClient.available(), PClient.read(), _ PServer(), PServer.dispose(), PServer.write(), attach(), length +_ sketches no longer require a "data" folder ...................................................................... +_ run library destroy after hitting 'stop' +_ quicktime audio doesn't stop after hitting 'stop' +_ weirdness external stop not calling stop(), just finished = true + _ properly handle non-ascii chars in p5 folder name _ or at least warn the user to install somehwere else _ track down the cause of the processing.exe not starting bugs