diff --git a/processing/app/KjcEngine.java b/processing/app/KjcEngine.java index da9a80eb4..1ebaeee74 100644 --- a/processing/app/KjcEngine.java +++ b/processing/app/KjcEngine.java @@ -773,6 +773,13 @@ public class KjcEngine extends PdeEngine { } } }); + /* + window.addFocusListener(new FocusAdapter() { + public void focusLost(FocusEvent e) { + System.out.println(e); + window.toFront(); + }}); + */ } else { window = new Frame(editor.sketchName); // gonna use ugly windows instead diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index 781f2f82a..663504260 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -331,13 +331,24 @@ public class PdeEditor extends Panel { // windowActivated doesn't seem to do much, so focus listener better presentationWindow.addFocusListener(new FocusAdapter() { public void focusGained(FocusEvent e) { + //System.out.println("focusGained: " + e); //if (frame != null) frame.toFront(); // editor to front try { + //System.out.println("moving to front"); engine.window.toFront(); } catch (Exception ex) { } } }); + /* + presentationWindow.addWindowListener(new WindowAdapter() { + public void windowActivated(WindowEvent e) { + //System.out.println(e); + //PdeEditorConsole.systemOut.println(e); + } + }); + * + /* Document doc = textarea.document; //System.out.println(doc); diff --git a/processing/build/shared/revisions.txt b/processing/build/shared/revisions.txt index db433beec..93e4b745d 100644 --- a/processing/build/shared/revisions.txt +++ b/processing/build/shared/revisions.txt @@ -4,6 +4,18 @@ for older releases will be super crusty. caution: the beverage you're about to enjoy is extremely hot. +ABOUT REV 0055 - + +- sort functions for arrays of ints, floats, doubles or Strings + + here's how it works for floats: +float a[] = { 3.4, 3.6, 2, 0, 7.1 }; +sort(a); +for (int i = 0; i < a.length; i++) { + println(a[i]); +} + + ABOUT REV 0054 - 11 april 2003 [ ok, so 53 was a bit of a dog ] diff --git a/processing/build/windows/dist/Proce55ing.exe b/processing/build/windows/dist/Proce55ing.exe index 372481d63..b926191d5 100755 Binary files a/processing/build/windows/dist/Proce55ing.exe and b/processing/build/windows/dist/Proce55ing.exe differ diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat index ac2715f7d..6a31a1a4d 100755 --- a/processing/build/windows/dist/run.bat +++ b/processing/build/windows/dist/run.bat @@ -3,4 +3,4 @@ REM --- if you need more ram, change the 64m (which means REM --- 64 megabytes) to something higher. -java -ms64m -mx64m -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar;lib\comm.jar PdeBase +java -ms64m -mx64m -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar;lib\comm.jar;c:\winnt\system32\qtjava.zip;c:\windows\system32\qtjava.zip PdeBase diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp index ec836a6c8..a56a2e9de 100644 --- a/processing/build/windows/launcher/launcher.cpp +++ b/processing/build/windows/launcher/launcher.cpp @@ -119,14 +119,16 @@ BOOL CLauncherApp::InitInstance() */ sprintf(cp, - "-cp \"" - "%s\\lib;" - "%s\\lib\\build;" - "%s\\lib\\pde.jar;" + "-cp \"" + "%s\\lib;" + "%s\\lib\\build;" + "%s\\lib\\pde.jar;" "%s\\lib\\kjc.jar;" "%s\\lib\\oro.jar;" "%s\\lib\\comm.jar;" - "\" ", + "C:\\WINNT\\system32\\QTJava.zip;" + "C:\\WINDOWS\\system32\\QTJava.zip;" + "\" ", loaddir, loaddir, loaddir, loaddir, loaddir, loaddir); //sprintf(cp, "-cp "); diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh index f68681e53..c89b222cd 100755 --- a/processing/build/windows/make.sh +++ b/processing/build/windows/make.sh @@ -58,11 +58,23 @@ fi cd bagel -CLASSPATH=../build/windows/work/java/lib/rt.jar:../build/windows/work/java/lib/ext/comm.jar +if test -d /cygdrive/c/WINNT +then + # windows 2000 or nt + QT_JAVA_PATH=/cygdrive/c/WINNT/system32/QTJava.zip +else + # other versions of windows, including xp + QT_JAVA_PATH=/cygdrive/c/WINDOWS/system32/QTJava.zip +fi +# another alternative +#QT_JAVA_PATH=../build/shared/lib/qtjava.zip + +CLASSPATH=../build/windows/work/java/lib/rt.jar:../build/windows/work/java/lib/ext/comm.jar:${QT_JAVA_PATH} + ### --- make version with serial for the application -echo Building bagel with serial support -perl make.pl SERIAL +echo Building bagel with serial and video support +perl make.pl SERIAL VIDEO cp classes/*.class ../build/windows/work/classes/ ### --- make version without serial for applet exporting diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh index 7c873ac84..9c1c844fc 100644 --- a/processing/build/windows/run.sh +++ b/processing/build/windows/run.sh @@ -1,2 +1,14 @@ #!/bin/sh -cd work && ./java/bin/java -cp lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar PdeBase + +if test -d /cygdrive/c/WINNT +then + # windows 2000 or nt + QT_JAVA_PATH=\\cygdrive\\c\\WINNT\\system32\\QTJava.zip +else + # other versions of windows, including xp + QT_JAVA_PATH=\\cygdrive\\c\\WINDOWS\\system32\\QTJava.zip +fi +# another alternative +#QT_JAVA_PATH=..\\build\\shared\\lib\\qtjava.zip + +cd work && ./java/bin/java -cp lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH} PdeBase diff --git a/processing/done.txt b/processing/done.txt index 9406047f4..51870cf83 100644 --- a/processing/done.txt +++ b/processing/done.txt @@ -2,6 +2,7 @@ X disabled the debug flag (oops) in BPolygon X disabled code for alpha in web colors (use 0x instead if needed) X make sure that fill(int a) / stroke(int a) work if an alpha is set +o probably time to send out another message about this release 0053 diff --git a/processing/todo.txt b/processing/todo.txt index 3cb335b97..e9917f541 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -1,50 +1,74 @@ 0055 X incorporated (but not yet tested) net code +X how to include sign with nf() +X whether to include room, and whether + or ' ' +X use nfs (number format signed), with a bool for + or spc +X does a[3] == Float.NaN work? (for testing with splitFloats) +X no, if NaN, then comparison will always return false +X sort() functions for arrays of ints, floats, doubles, and Strings -_ int() doesn't work inside other functions -_ argh, need a real parser +X fix wheel mouse handler so that it works under jdk 1.3 +X no difference between 1.3 and 1.4 code +_ add WheelHandler to cvs +_ add casey to sourceforge with admin privileges as 'reas' + +_ video +_ checkin video code to cvs +X video integration (need to work with dist.sh for it) +X how to get qtjava into the classpath on windows runner + +mac +_ modify classpath to use 1.4 for compiling +_ modify make.sh to include JDK14 flag +_ double-check to see if wheel mouse is working +_ video: get qtjava stuff working, modify make.sh to include paths +_ also run.sh, the classpath on Proce55ing.app +_ had to disable MRJFileUtils stuff on osx at last minute before 53 +_ seems that file names changed between 1.3 and 1.4 + +waiting for ca +_ send email about status +_ alpha sound integration + +creas / hernando +_ need video example modified for .pde, and tested with current +_ need net example modified for .pde, and tested with current _ constrain() still in the motion04 sketch _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1050131287 - -_ probably time to send out another message about this release +_ make a note about mouse movement skipping two pixels on windows +_ need to set mouse properties for higher precision _ present mode, click background window and front window hides +_ wasn't present in jdk 1.3, something changed in 1.4 _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1050163961 +_ file://localhost/D:/jdk-1.4.1_02/docs/api/java/awt/doc-files/FocusSpec.html + + +_ need more comprehensive list of 'known bugs' _ repair lines (even if slow) _ single pixel lines have no alpha and no z _ fix all the random line types to support alpha -_ had to disable MRJFileUtils stuff on osx at last minute before 53 - _ smooth images drawing strangely (missing first line of pixels) _ also smoothed even if not distorted _ aliased and anti-aliased images don't line up _ text (text04) marching around strangely _ problems with u/v are likely to also be there for colors _ u/v should be affected by w for proper perspective -_ should image(img, x, y, alpha) work instead of using fill? -_ or maybe another word for fill/stroke.. apply? colorize? -_ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Syntax;action=display;num=1050323800 _ sphere() and other polygons don't connect flush with one another _ could hack by making each slightly larger than necessary -_ video integration (need to work with dist.sh for it) - -_ alpha sound integration +_ should image(img, x, y, alpha) work instead of using fill? +_ or maybe another word for fill/stroke.. apply? colorize? +_ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Syntax;action=display;num=1050323800 -data things for my own work, but also generally useful -_ numberFormat too much, use nf -_ how to include space for - or + -_ how to do without zeroes -_ need some model for i/o that makes more sense -_ getting whole words from serial, network, and files -_ or buffers of specific length with a sync byte -_ break out BSerial as separate object like BVideo -_ BSerial.flush and BSerial.available +DATA TIDBITS (for my own work, but also generally useful) +_ split to take strings (ie. for ", ") +_ versions of loadStream/loadBytes etc that use streams and/or urls _ file output, save strings or pile of bytes _ quicksort should probably just be made into 'sort' class _ it's the only one ever used @@ -56,9 +80,10 @@ _ more advanced splitting of files into rows/cols uses another class _ other class also has concept for random access of lines _ by storing the line positions, can access without loading all _ into memory because some files will be too large -_ does a[3] == Float.NaN work? (for testing with splitFloats) -_ versions of loadStream/loadBytes etc that use streams and/or urls -_ split to take strings (ie. for ", ") +_ need some model for i/o that makes more sense +_ getting whole words from serial, network, and files +_ or buffers of specific length with a sync byte + //////////////////////////////////////////////////////////////////// @@ -101,6 +126,8 @@ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=p b _ copyImage(x, y, w, h, to_x, to_y) b _ resize of bimage, make a copy of image? b _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1050328581 + b _ getPixel() and other fxns for BImage + b _ curves b _ curveMode(), curveMode to tweak the s parameter of catmullrom @@ -327,6 +354,8 @@ _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs _ separate preprocessor from other kjc-specific code _ compiler barfs on: float[] moo = new int[10]; _ although no error comes through to p5 (benelek) +_ int() doesn't work inside other functions +_ argh, need a real parser _ switch to java cup (one day's work) _ subst Image -> BImage, Font -> BFont _ syntax coloring of built-in java objects.. i.e. String @@ -459,6 +488,8 @@ _ sketches can't be named starting with numbers (D.YOO) _ either provide an error message or explanation for this _ or allow the sketch name to be separte from the class/folder names _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1033674118 +_ break out BSerial as separate object like BVideo +_ BSerial.flush and BSerial.available PDE / Details (low priority) @@ -567,6 +598,8 @@ How the environment gets packed up, downloaded, and installed. DISTRIBUTION / General +b _ need to purge 55 spelling from lots of things +b _ window title code, name of .exe and .app files b _ people like downloadable reference + net isn't cheap everywhere b _ need document icons b _ beta release will include source code