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

last bits for rev 93, mostly getting qt7 support working

Browse Source
This commit is contained in:
benfry
2005-10-14 16:55:31 +00:00
parent 50c76e7ef2
commit f4ae0ec638
8 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Editor.java
+1 -1
View File
@@ -624,7 +624,7 @@ public class Editor extends JFrame
if (Base.isWindows() || Base.isMacOS()) {
// no way to do an 'open in file browser' on other platforms
// since there isn't any sort of standard
item = new JMenuItem("Show Sketch Folder");
item = newJMenuItem("Show Sketch Folder", 'K', false);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
//Base.openFolder(sketchDir);
build/shared/revisions.txt
+34 -1
View File
@@ -7,7 +7,11 @@ releases will be super crusty.
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
ABOUT REV 0093 - XX september 2005
ABOUT REV 0093 - 14 October 2005
First release in a while with lots of bug fixes for the video library
(QuickTime 7), OpenGL, and Jikes on Linux.
[ big fixes ]
@@ -20,15 +24,44 @@ ABOUT REV 0093 - XX september 2005
saveFrame() were in a sketch folder. this has been fixed.
http://dev.processing.org/bugs/show_bug.cgi?id=84
- some Java 1.4 code snuck into the core library, breaking applets
whenever Java 1.3 was in use (Firefox or IE on the Mac, for
instance). this is now fixed.
- new version of jikes for linux which should prevent the library
issues: http://dev.processing.org/bugs/show_bug.cgi?id=47
- basic support for QuickTime 7 is now included, if you have problems,
please report them to the bugs database:
Mac OS X: http://dev.processing.org/bugs/show_bug.cgi?id=172
Windows: http://dev.processing.org/bugs/show_bug.cgi?id=171
- applications that use OpenGL should run better due to an update of
the JOGL library.
[ other bits ]
- lots of additions to the FAQ and updates to dev.processing.org
- lots of help from fjen on improving the bugs database
- added a link to the FAQ from the Help menu
- added menu shortcut for "show sketch folder"
- faster blur code contributed by toxi, along with filter(ERODE)
and filter(DILATE). thanks toxi!
- initial support for textMode(SHAPE), which will render fonts as
triangulated vectors that will eventually allow for exporting vector
text from OpenGL applications.
- PGraphics.save() no longer inserts the prefix to the applet folder,
allowing it to be used for absolute paths. (use saveFrame() or the
savePath() function if you want to save frames to the sketch
folder).
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
build/windows/launcher/launcher.cpp
+11 -2
View File
@@ -100,11 +100,20 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
char *qtjava_path = (char *)malloc(16384 * sizeof(char));
qtjava_path[0] = 0;
if (getenv("WINDIR") == NULL) {
if (getenv("QTJAVA") != NULL) {
strcpy(qtjava_path, getenv("QTJAVA"));
FILE *fp = fopen(qtjava_path, "rb");
if (fp != NULL) {
fclose(fp); // found it, all set
strcat(qtjava_path, ";"); // add path separator
}
}
if (qtjava_path[0] == 0) { // not set yet
//if (getenv("WINDIR") == NULL) {
// uh-oh.. serious problem.. gonna have to report this
// but hopefully WINDIR is set on win98 too
//} else {
} else {
strcpy(qtjava_path, getenv("WINDIR"));
strcat(qtjava_path, "\\SYSTEM32\\QTJava.zip");
build/windows/launcher/processing.exe
BIN
View File
Binary file not shown.
build/windows/make.sh
+12 -9
View File
@@ -183,18 +183,21 @@ rm -rf processing
mkdir -p $LIBRARIES/net/library/
cp library/net.jar $LIBRARIES/net/library/
# VIDEO LIBRARY
echo Building video library...
QTJAVA="$WINDIR\\system32\\QTJava.zip"
if test -f "${QTJAVA}"
then
echo "Found Quicktime at $QTJAVA"
else
echo "could not find qtjava.zip in"
echo "${WINDIR}\\system32\\qtjava.zip"
echo "quicktime for java must be installed before building."
exit 1;
then
echo "Found Quicktime 7 installation"
else
QTJAVA="$WINDIR\\system32\\QTJava.zip"
if test -f "${QTJAVA}"
then
echo "Found Quicktime 6 at $QTJAVA"
else
echo "Could not find QuickTime for Java,"
echo "you'll need to install it before building."
exit 1;
fi
fi
cd ../video
$JIKES -target 1.1 +D -classpath "$QTJAVA;$CLASSPATH" -d . *.java
build/windows/run.sh
+29 -14
View File
@@ -1,23 +1,38 @@
#!/bin/sh
QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
if test -f "${QT_JAVA_PATH}"
then
echo "Found Quicktime at $QT_JAVA_PATH"
else
QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
if test -f "${QT_JAVA_PATH}"
if test -f "${QTJAVA}"
then
echo "Found Quicktime 7 installation"
else
QTJAVA="$WINDIR\\system32\\QTJava.zip"
if test -f "${QTJAVA}"
then
echo "could not find qtjava.zip in either"
echo "${WINDIR}\\system32\\qtjava.zip or"
echo "${WINDIR}\\system\\qtjava.zip"
echo "quicktime for java must be installed before building."
echo "Found Quicktime 6 at $QTJAVA"
else
echo "Could not find QuickTime for Java,"
echo "you'll need to install it before running."
exit 1;
else
echo "Found Quicktime at $QT_JAVA_PATH"
fi
fi
#QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
#if test -f "${QT_JAVA_PATH}"
#then
# echo "Found Quicktime at $QT_JAVA_PATH"
#else
# QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
# if test -f "${QT_JAVA_PATH}"
# then
# echo "could not find qtjava.zip in either"
# echo "${WINDIR}\\system32\\qtjava.zip or"
# echo "${WINDIR}\\system\\qtjava.zip"
# echo "quicktime for java must be installed before running."
# exit 1;
# else
# echo "Found Quicktime at $QT_JAVA_PATH"
# fi
#fi
# rxtx testing
#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
@@ -30,7 +45,7 @@ fi
# includes jaws.jar
#CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\"
CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\registry.jar\;${QT_JAVA_PATH}\"
CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\registry.jar\;${QTJAVA}\"
export CLASSPATH
#cd work && ./java/bin/java -Xint PdeBase
core/todo.txt
+10 -4
View File
@@ -15,6 +15,9 @@ X fix a bug with filename capitalization error throwing
X add NO_DEPTH_TEST to PGraphics3
X java 1.4 code snuck into PApplet, causing problems on the mac
X http://dev.processing.org/bugs/show_bug.cgi?id=146
X prevent PGraphics.save() from inserting a file prefix
X so that people can use absolute paths
X or add a version that takes a file object
nixed or fixed in previous releases
X textMode(SCREEN) having issues on Mac OS X
@@ -25,6 +28,13 @@ X http://processing.org/discourse/yabb_beta/YaBB.cgi?board=Contribution_3DOpen
o noLoop() is behaving strangely
o http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1116002432;start=0
_ update to latest 1.4.2 java vm
_ add auto-install of cab file inside applet.html
http://java.sun.com/update/1.4.2/jinstall-1_4_2_09-windows-i586.cab
for the 1.5 versions:
http://java.sun.com/update/1.5.0/jinstall-1_5_0_03-windows-i586.cab
_ check to see noLoop() breakage is fixed in 92 vs 91
_ http://dev.processing.org/bugs/show_bug.cgi?id=164
@@ -45,10 +55,6 @@ _ and start() is supposedly called by the applet viewer
_ http://java.sun.com/j2se/1.4.2/docs/api/java/applet/Applet.html#start()
_ need to track this stuff down a bit
X prevent PGraphics.save() from inserting a file prefix
X so that people can use absolute paths
X or add a version that takes a file object
_ triangleColors are different because they're per-triangle
_ as opposed to per-vertex, because it's based on the facet of the tri
_ make vertexCount etc properly accessible in PGraphics3
todo.txt
+3
View File
@@ -29,6 +29,7 @@ X can also just change the name
X make a note in the library howto about using something besides p5
X add the faq to the help menu
X patch from mellis to make dist.sh properly grab version numbers w/o fink
X fix to enable quicktime 7 to run properly on windows
fixed in previous releases
X closing window w/o first hitting stop() causes freak out
@@ -60,6 +61,7 @@ o doesn't work, try using the class' main() to run it
X not gonna do this, p5 is not a java editor
o if a .pde isn't contained in a properly named folder
o offer to rename the parent folder, rather than placing in a new folder
X add command key for "show sketch folder"
bugzilla problems (fixed by fjen)
X localconfig has been modified, need to update for everything
@@ -85,6 +87,7 @@ forum bugs
X when replying, all the replies so far are listed twice
o fonts are wrong all over the place (use windows to debug)
_ external apps should inherit memory settings from p5 itself
_ too confusing to set the memory in two places
_ or perhaps, have a setting in the ide for it