Skip to content

Commit ddf0ffe

Browse files
committed
Merge pull request #14 from longbai/master
update some external libraries
2 parents 70867b3 + fc0e055 commit ddf0ffe

36 files changed

+12
-14
lines changed

lib/core.jar

-175 KB
Binary file not shown.

lib/export.txt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# if you want to support more platforms, see the jogl web site to get
2-
# the natives libraries for the platform in question (i.e. linux-amd64).
3-
# then, add it to the applet line for export. for applications, you'll
4-
# have to make the changes by hand, i.e. use the linux version of the
5-
# export, and modify its contents to include the necessary files for
6-
# your platform.
7-
8-
application.macosx = opengl.jar, jogl.jar, libjogl.jnilib, libjogl_awt.jnilib, libjogl_cg.jnilib
9-
application.windows = opengl.jar, jogl.jar, jogl.dll, jogl_awt.dll, jogl_cg.dll
10-
application.linux = opengl.jar, jogl.jar, libjogl.so, libjogl_awt.so, libjogl_cg.so, libjogl_drihack.so
11-
12-
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
1+
# If you want to support more platforms, visit jogamp.org to get the
2+
# natives libraries for the platform in question (i.e. Solaris).
3+
4+
name = OpenGL
5+
6+
application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar
7+
application.windows32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar
8+
application.windows64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar
9+
application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar
10+
application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar
3.93 KB
Binary file not shown.

lib/gluegen-rt-natives-linux-i586.jar

3.96 KB
Binary file not shown.
4.73 KB
Binary file not shown.
7.72 KB
Binary file not shown.
7.16 KB
Binary file not shown.

lib/gluegen-rt.jar

246 KB
Binary file not shown.

lib/jogl-all-natives-linux-amd64.jar

196 KB
Binary file not shown.

lib/jogl-all-natives-linux-i586.jar

195 KB
Binary file not shown.
391 KB
Binary file not shown.
208 KB
Binary file not shown.

lib/jogl-all-natives-windows-i586.jar

179 KB
Binary file not shown.

lib/jogl-all.jar

4.24 MB
Binary file not shown.

lib/jogl-natives-linux-i586.jar

-184 KB
Binary file not shown.

lib/jogl-natives-macosx-ppc.jar

-125 KB
Binary file not shown.

lib/jogl-natives-macosx-universal.jar

-240 KB
Binary file not shown.

lib/jogl-natives-windows-i586.jar

-56.9 KB
Binary file not shown.

lib/jogl.dll

-284 KB
Binary file not shown.

lib/jogl.jar

-1.07 MB
Binary file not shown.

lib/jogl_awt.dll

-20 KB
Binary file not shown.

lib/jogl_cg.dll

-112 KB
Binary file not shown.

lib/libgluegen-rt.jnilib

-48.6 KB
Binary file not shown.

lib/libjogl.jnilib

-2.71 MB
Binary file not shown.

lib/libjogl.so

-940 KB
Binary file not shown.

lib/libjogl_awt.jnilib

-49.1 KB
Binary file not shown.

lib/libjogl_awt.so

-9.87 KB
Binary file not shown.

lib/libjogl_cg.jnilib

-459 KB
Binary file not shown.

lib/libjogl_cg.so

-181 KB
Binary file not shown.

lib/libjogl_drihack.so

-6.27 KB
Binary file not shown.

lib/linux-x86_64/libgluegen-rt.so

-9.28 KB
Binary file not shown.

lib/linux-x86_64/libjogl.so

-1.27 MB
Binary file not shown.

lib/linux-x86_64/libjogl_awt.so

-11.4 KB
Binary file not shown.

lib/linux-x86_64/libjogl_cg.so

-218 KB
Binary file not shown.

lib/opengl.jar

-59.4 KB
Binary file not shown.

src/code_swarm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ public void drawDate() {
491491
fill(fontColor, 255);
492492
String dateText = formatter.format(prevDate);
493493
textAlign(RIGHT, BASELINE);
494-
textSize(font.size);
494+
textSize(font.getSize());
495495
text(dateText, width - 3, height - (2 + textDescent()));
496496
}
497497

@@ -534,7 +534,7 @@ public void drawLegend() {
534534
for (int i = 0; i < colorAssigner.tests.size(); i++) {
535535
ColorTest t = colorAssigner.tests.get(i);
536536
fill(t.c1, 200);
537-
text(t.label, font.size, 3 + ((i + 1) * (font.size + 2)));
537+
text(t.label, font.getSize(), 3 + ((i + 1) * (font.getSize() + 2)));
538538
}
539539
}
540540

0 commit comments

Comments
 (0)