From 77b3dc2c25ee7cdb1ef0cdaba14baa43a524a55b Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 28 Jul 2002 00:38:07 +0000 Subject: [PATCH] random fixes and making windows build script --- processing/app/KjcEngine.java | 4 ++ processing/app/PdeEditor.java | 4 +- processing/build/linux/make.sh | 1 + processing/build/shared/lib/pde.properties | 15 +++--- processing/build/windows/dist.sh | 42 +++++++++++++++ processing/build/windows/make.sh | 7 +-- processing/todo.txt | 61 +++++++++------------- 7 files changed, 88 insertions(+), 46 deletions(-) create mode 100755 processing/build/windows/dist.sh diff --git a/processing/app/KjcEngine.java b/processing/app/KjcEngine.java index 60c7ab055..9361cd374 100644 --- a/processing/app/KjcEngine.java +++ b/processing/app/KjcEngine.java @@ -660,9 +660,13 @@ public class KjcEngine extends PdeEngine { window.add(applet); // @#$((* java 1.3 + // removed because didn't seem to be needed anymore + // also, was causing offset troubles + /* window.addMouseListener(applet); window.addMouseMotionListener(applet); window.addKeyListener(applet); + */ Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index 64ae69707..fc29cc85c 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -292,7 +292,9 @@ public class PdeEditor extends Panel { //System.out.println("pwindow activated"); // editor doesn't necessarily have to be on top //presentationWindow.toBack(); - if (frame != null) frame.toFront(); + + // don't move the editor window to the front after all + //if (frame != null) frame.toFront(); try { //((KjcEngine)(runner.engine)).window.toFront(); engine.front(); diff --git a/processing/build/linux/make.sh b/processing/build/linux/make.sh index d6a0de673..c131f7bb5 100755 --- a/processing/build/linux/make.sh +++ b/processing/build/linux/make.sh @@ -7,6 +7,7 @@ if test -d work then else + echo Setting up directories to build P5... mkdir work tar --extract --verbose --file=jre.tgz --ungzip --directory=work cp -r ../shared/lib work/ diff --git a/processing/build/shared/lib/pde.properties b/processing/build/shared/lib/pde.properties index e03221bf2..7dff1bdd4 100644 --- a/processing/build/shared/lib/pde.properties +++ b/processing/build/shared/lib/pde.properties @@ -28,7 +28,7 @@ #editor.status.error.bgcolor = #CC0000 #editor.status.prompt.fgcolor = #FFFFFF #editor.status.prompt.bgcolor = #CC9900 -#editor.status.font = SansSerif,plain,10 +#editor.status.font = SansSerif,plain,12 # not necessary to set bgcolor of window b/c it comes from os #run.window.bgcolor = #666666 @@ -42,6 +42,14 @@ #serial.databits = 8 #serial.stopbits = 1 +#editor.expand_tabs=true +#editor.tab_size=2 +#editor.auto_indent=true +#editor.balance_parens=false + + +# these properties are no longer especially in use + # enable this to run hack-version mildly stabler external processing #play.external = true @@ -52,11 +60,6 @@ # it will also be necessary to put processing in c:\ #play.externalCommand = C:\\processing\\bin\\jre -cp c:\\processing\\lib;c:\\processing\\lib\\pde.jar;c:\\processing\\lib\\kjc.jar;c:\\processing\\lib\\comm.jar ProcessingAppletViewer -#editor.expand_tabs=true -#editor.tab_size=2 -#editor.auto_indent=true -#editor.balance_parens=false - #update.enabled #update.url = http://acg.media.mit.edu/people/fry/processing/update/ #update.url = http://imrf.or.jp/processing/update/ diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh new file mode 100755 index 000000000..b2e39eda3 --- /dev/null +++ b/processing/build/windows/dist.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +echo Creating P5 distribution... + +# remove any old boogers +rm -rf processing +rm -f processing.zip + +# use 'shared' files as starting point +cp -r ../shared processing +# something like the following might be better: +# find / -name "*.mp3" -exec rm -f {}\; +rm -rf processing/lib/CVS +rm -rf processing/reference/CVS +rm -rf processing/reference/images/CVS +rm -rf processing/sketchbook/CVS +rm -rf processing/sketchbook/default/CVS +rm -f processing/sketchbook/default/.cvsignore +# will need to add a zillion of these for the reference.. + +# add java (jre) files +unzip -q -d processing jre.zip + +# directories used by the app +mkdir processing/lib/build + +# grab pde.jar and export from the working dir +cp work/lib/pde.jar processing/lib/ +cp -r work/lib/export processing/lib/ +rm -rf processing/lib/export/CVS + +# get platform-specific goodies from the dist dir +cp dist/run.bat work/ + +# convert notes.txt to windows LFs + +# zip it all up for release +echo Zipping and finishing... +zip -rq processing.zip processing +#rm -rf processing + +echo Done. \ No newline at end of file diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh index 2e8b9b617..f83c2eb9e 100755 --- a/processing/build/windows/make.sh +++ b/processing/build/windows/make.sh @@ -6,17 +6,18 @@ if test -d work then else - echo Setting up directories to build P5 on windows... + echo Setting up directories to build P5... mkdir work unzip -q -d work jre.zip cp -r ../shared/lib work/ rm -rf work/lib/CVS mkdir work/lib/export mkdir work/lib/build - cp -r ../shared/sketchbook work/ - mkdir work/classes # this will copy cvs files intact, meaning that changes # could be made and checked back in.. interesting + cp -r ../shared/sketchbook work/ + cp -r ../shared/reference work/ + mkdir work/classes cp dist/run.bat work/ echo fi diff --git a/processing/todo.txt b/processing/todo.txt index b9532cfdb..ef69736cf 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -28,46 +28,26 @@ X remove 'extends' from kjcengine, make an instance of Main X may need to subclass at.dms.kjc.Main to override the exit() X make pdeengine a class X remove pderunner, collapse into pdeengine +X checked line z problem bug.. it's b/c single pixel lines have no z +X fold simpleserial into BApplet +X set serial properties inside bagel in kjcengine +o sprint an sprintln functions +X nixed because they're too weird, don't make sense w/ actual use +X serial.messageReceived extra long crap in demo.pde (clean up?) +X improve simpleserial and clean up a bit +X need to have function to enable it in setup +X make i/o work just like mouse (event driven, with dflt behavior) +X present mode should hide editor frame -_ save window position (only during session) of sketch run window -_ present mode should hide editor frame -_ present mode doesn't work for draw() +BUGS +X mouse coords coming from window when outside applet.. bad! +X just removed the listeners on the window.. don't seem to be needed -_ mouse coords coming from window when outside applet.. bad! -void setup() { - size(100,100); -} -void loop() { - fill(102); - rect(mouseX - 5, mouseY - 5, 10, 10); -} -triangle_strip, quad_strip are no filling without outlines -> fill(204, 204, 0); -> beginShape(TRIANGLE_STRIP); -> vertex(30, 75); -> vertex(40, 20); -> vertex(50, 75); -> vertex(60, 20); -> vertex(70, 75); -> vertex(80, 20); -> vertex(90, 75); -> endShape(); - -_ box is not opaque -> translate(58, 48, 0); -> rotateY(0.5); -> box(40); bagel -a _ fold simpleserial into BApplet -a _ set serial properties inside bagel in kjcengine -a _ sprint an sprintln functions -a _ make i/o work just like mouse (event driven, with dflt behavior) -a _ need to have function to enable it in setup -a _ serial.messageReceived extra long crap in demo.pde (clean up?) -a _ improve simpleserial and clean up a bit -a _ document a bit more regarding its use +a _ do some serial testing +a _ document a bit more regarding its use a _ serial works poorly for starting/stopping applets a _ this is behaving strangely a _ breaks on every 2nd run when using serial apps (or others?) @@ -87,6 +67,9 @@ a o line wrapping (but save info for resize? noo..) a _ option to delete current project play +a _ save window position (only during session) of sketch run window +a _ present mode doesn't work for draw() +a _ see if play being highlighted can be implemented again a _ shouldn't substitute f's for: "Univers76.vlw.gz"; pde @@ -192,7 +175,13 @@ b _ concave/complex polygon shtuff b _ eventually POLYGON auto-detects convex/concave polygon b _ also add POLYGON_CONVEX and POLYGON_CONCAVE b _ implement clipping planes and clipping of objects -_ clipping [may be needed for current genome browser project] +b _ clipping [may be needed for current genome browser project] +b _ box is not opaque +b X problem is that lines are drawn second +b X one pixel lines have no z value.. argh +b translate(58, 48, 0); +b rotateY(0.5); +b box(40); BAGEL / medium