diff --git a/lib/core.jar b/lib/core.jar index 30b358a..9f51a4a 100644 Binary files a/lib/core.jar and b/lib/core.jar differ diff --git a/lib/export.txt b/lib/export.txt index 830532c..308d1a3 100644 --- a/lib/export.txt +++ b/lib/export.txt @@ -1,12 +1,10 @@ -# if you want to support more platforms, see the jogl web site to get -# the natives libraries for the platform in question (i.e. linux-amd64). -# then, add it to the applet line for export. for applications, you'll -# have to make the changes by hand, i.e. use the linux version of the -# export, and modify its contents to include the necessary files for -# your platform. - -application.macosx = opengl.jar, jogl.jar, libjogl.jnilib, libjogl_awt.jnilib, libjogl_cg.jnilib -application.windows = opengl.jar, jogl.jar, jogl.dll, jogl_awt.dll, jogl_cg.dll -application.linux = opengl.jar, jogl.jar, libjogl.so, libjogl_awt.so, libjogl_cg.so, libjogl_drihack.so - -applet = opengl.jar, jogl.jar, jogl-natives-linux-i586.jar, jogl-natives-macosx-ppc.jar, jogl-natives-macosx-universal.jar, jogl-natives-windows-i586.jar +# If you want to support more platforms, visit jogamp.org to get the +# natives libraries for the platform in question (i.e. Solaris). + +name = OpenGL + +application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar +application.windows32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar +application.windows64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar +application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar +application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar diff --git a/lib/gluegen-rt-natives-linux-amd64.jar b/lib/gluegen-rt-natives-linux-amd64.jar new file mode 100644 index 0000000..27e7d6f Binary files /dev/null and b/lib/gluegen-rt-natives-linux-amd64.jar differ diff --git a/lib/gluegen-rt-natives-linux-i586.jar b/lib/gluegen-rt-natives-linux-i586.jar new file mode 100644 index 0000000..a42b96b Binary files /dev/null and b/lib/gluegen-rt-natives-linux-i586.jar differ diff --git a/lib/gluegen-rt-natives-macosx-universal.jar b/lib/gluegen-rt-natives-macosx-universal.jar new file mode 100644 index 0000000..c816405 Binary files /dev/null and b/lib/gluegen-rt-natives-macosx-universal.jar differ diff --git a/lib/gluegen-rt-natives-windows-amd64.jar b/lib/gluegen-rt-natives-windows-amd64.jar new file mode 100644 index 0000000..86cf056 Binary files /dev/null and b/lib/gluegen-rt-natives-windows-amd64.jar differ diff --git a/lib/gluegen-rt-natives-windows-i586.jar b/lib/gluegen-rt-natives-windows-i586.jar new file mode 100644 index 0000000..09a0ffd Binary files /dev/null and b/lib/gluegen-rt-natives-windows-i586.jar differ diff --git a/lib/gluegen-rt.jar b/lib/gluegen-rt.jar index 7ac10a3..a384ce6 100644 Binary files a/lib/gluegen-rt.jar and b/lib/gluegen-rt.jar differ diff --git a/lib/jogl-all-natives-linux-amd64.jar b/lib/jogl-all-natives-linux-amd64.jar new file mode 100644 index 0000000..841c9d5 Binary files /dev/null and b/lib/jogl-all-natives-linux-amd64.jar differ diff --git a/lib/jogl-all-natives-linux-i586.jar b/lib/jogl-all-natives-linux-i586.jar new file mode 100644 index 0000000..e0f1b95 Binary files /dev/null and b/lib/jogl-all-natives-linux-i586.jar differ diff --git a/lib/jogl-all-natives-macosx-universal.jar b/lib/jogl-all-natives-macosx-universal.jar new file mode 100644 index 0000000..10cf392 Binary files /dev/null and b/lib/jogl-all-natives-macosx-universal.jar differ diff --git a/lib/jogl-all-natives-windows-amd64.jar b/lib/jogl-all-natives-windows-amd64.jar new file mode 100644 index 0000000..033af7f Binary files /dev/null and b/lib/jogl-all-natives-windows-amd64.jar differ diff --git a/lib/jogl-all-natives-windows-i586.jar b/lib/jogl-all-natives-windows-i586.jar new file mode 100644 index 0000000..157fbe2 Binary files /dev/null and b/lib/jogl-all-natives-windows-i586.jar differ diff --git a/lib/jogl-all.jar b/lib/jogl-all.jar new file mode 100644 index 0000000..1a1e06d Binary files /dev/null and b/lib/jogl-all.jar differ diff --git a/lib/jogl-natives-linux-i586.jar b/lib/jogl-natives-linux-i586.jar deleted file mode 100644 index afdf654..0000000 Binary files a/lib/jogl-natives-linux-i586.jar and /dev/null differ diff --git a/lib/jogl-natives-macosx-ppc.jar b/lib/jogl-natives-macosx-ppc.jar deleted file mode 100644 index 57712da..0000000 Binary files a/lib/jogl-natives-macosx-ppc.jar and /dev/null differ diff --git a/lib/jogl-natives-macosx-universal.jar b/lib/jogl-natives-macosx-universal.jar deleted file mode 100644 index c81ea13..0000000 Binary files a/lib/jogl-natives-macosx-universal.jar and /dev/null differ diff --git a/lib/jogl-natives-windows-i586.jar b/lib/jogl-natives-windows-i586.jar deleted file mode 100644 index 19c2ea3..0000000 Binary files a/lib/jogl-natives-windows-i586.jar and /dev/null differ diff --git a/lib/jogl.dll b/lib/jogl.dll deleted file mode 100644 index 7d5cb58..0000000 Binary files a/lib/jogl.dll and /dev/null differ diff --git a/lib/jogl.jar b/lib/jogl.jar deleted file mode 100644 index 305e998..0000000 Binary files a/lib/jogl.jar and /dev/null differ diff --git a/lib/jogl_awt.dll b/lib/jogl_awt.dll deleted file mode 100644 index 5c3b21a..0000000 Binary files a/lib/jogl_awt.dll and /dev/null differ diff --git a/lib/jogl_cg.dll b/lib/jogl_cg.dll deleted file mode 100644 index bd054d6..0000000 Binary files a/lib/jogl_cg.dll and /dev/null differ diff --git a/lib/libgluegen-rt.jnilib b/lib/libgluegen-rt.jnilib deleted file mode 100644 index 1956280..0000000 Binary files a/lib/libgluegen-rt.jnilib and /dev/null differ diff --git a/lib/libjogl.jnilib b/lib/libjogl.jnilib deleted file mode 100644 index 85dac01..0000000 Binary files a/lib/libjogl.jnilib and /dev/null differ diff --git a/lib/libjogl.so b/lib/libjogl.so deleted file mode 100644 index 91539b7..0000000 Binary files a/lib/libjogl.so and /dev/null differ diff --git a/lib/libjogl_awt.jnilib b/lib/libjogl_awt.jnilib deleted file mode 100644 index 2f16fbf..0000000 Binary files a/lib/libjogl_awt.jnilib and /dev/null differ diff --git a/lib/libjogl_awt.so b/lib/libjogl_awt.so deleted file mode 100644 index 6069eca..0000000 Binary files a/lib/libjogl_awt.so and /dev/null differ diff --git a/lib/libjogl_cg.jnilib b/lib/libjogl_cg.jnilib deleted file mode 100644 index 5627121..0000000 Binary files a/lib/libjogl_cg.jnilib and /dev/null differ diff --git a/lib/libjogl_cg.so b/lib/libjogl_cg.so deleted file mode 100644 index a30cfd8..0000000 Binary files a/lib/libjogl_cg.so and /dev/null differ diff --git a/lib/libjogl_drihack.so b/lib/libjogl_drihack.so deleted file mode 100644 index 23fe917..0000000 Binary files a/lib/libjogl_drihack.so and /dev/null differ diff --git a/lib/linux-x86_64/libgluegen-rt.so b/lib/linux-x86_64/libgluegen-rt.so deleted file mode 100644 index e12c511..0000000 Binary files a/lib/linux-x86_64/libgluegen-rt.so and /dev/null differ diff --git a/lib/linux-x86_64/libjogl.so b/lib/linux-x86_64/libjogl.so deleted file mode 100644 index 45b0d63..0000000 Binary files a/lib/linux-x86_64/libjogl.so and /dev/null differ diff --git a/lib/linux-x86_64/libjogl_awt.so b/lib/linux-x86_64/libjogl_awt.so deleted file mode 100644 index ad1bc14..0000000 Binary files a/lib/linux-x86_64/libjogl_awt.so and /dev/null differ diff --git a/lib/linux-x86_64/libjogl_cg.so b/lib/linux-x86_64/libjogl_cg.so deleted file mode 100644 index b90208b..0000000 Binary files a/lib/linux-x86_64/libjogl_cg.so and /dev/null differ diff --git a/lib/opengl.jar b/lib/opengl.jar deleted file mode 100644 index be115cb..0000000 Binary files a/lib/opengl.jar and /dev/null differ diff --git a/src/code_swarm.java b/src/code_swarm.java index 950aca4..f523588 100644 --- a/src/code_swarm.java +++ b/src/code_swarm.java @@ -491,7 +491,7 @@ public void drawDate() { fill(fontColor, 255); String dateText = formatter.format(prevDate); textAlign(RIGHT, BASELINE); - textSize(font.size); + textSize(font.getSize()); text(dateText, width - 3, height - (2 + textDescent())); } @@ -534,7 +534,7 @@ public void drawLegend() { for (int i = 0; i < colorAssigner.tests.size(); i++) { ColorTest t = colorAssigner.tests.get(i); fill(t.c1, 200); - text(t.label, font.size, 3 + ((i + 1) * (font.size + 2))); + text(t.label, font.getSize(), 3 + ((i + 1) * (font.getSize() + 2))); } }