Update JOGL library to current version.

winder · Feb 22, 2015 · c239697 · c239697
1 parent d1d2515
commit c239697
Show file tree

Hide file tree

Showing 87 changed files with 10 additions and 10 deletions.
diff --git a/lib/gluegen-rt-natives-linux-amd64.jar b/lib/gluegen-rt-natives-linux-amd64.jar
diff --git a/lib/gluegen-rt-natives-linux-armv6.jar b/lib/gluegen-rt-natives-linux-armv6.jar
diff --git a/lib/gluegen-rt-natives-linux-armv6hf.jar b/lib/gluegen-rt-natives-linux-armv6hf.jar
diff --git a/lib/gluegen-rt-natives-linux-i586.jar b/lib/gluegen-rt-natives-linux-i586.jar
diff --git a/lib/gluegen-rt-natives-macosx-universal.jar b/lib/gluegen-rt-natives-macosx-universal.jar
diff --git a/lib/gluegen-rt-natives-windows-amd64.jar b/lib/gluegen-rt-natives-windows-amd64.jar
diff --git a/lib/gluegen-rt-natives-windows-i586.jar b/lib/gluegen-rt-natives-windows-i586.jar
diff --git a/lib/gluegen-rt.jar b/lib/gluegen-rt.jar
diff --git a/lib/gluegen.jar b/lib/gluegen.jar
diff --git a/lib/jogl-all-natives-linux-amd64.jar b/lib/jogl-all-natives-linux-amd64.jar
diff --git a/lib/jogl-all-natives-linux-armv6.jar b/lib/jogl-all-natives-linux-armv6.jar
diff --git a/lib/jogl-all-natives-linux-armv6hf.jar b/lib/jogl-all-natives-linux-armv6hf.jar
diff --git a/lib/jogl-all-natives-linux-i586.jar b/lib/jogl-all-natives-linux-i586.jar
diff --git a/lib/jogl-all-natives-macosx-universal.jar b/lib/jogl-all-natives-macosx-universal.jar
diff --git a/lib/jogl-all-natives-windows-amd64.jar b/lib/jogl-all-natives-windows-amd64.jar
diff --git a/lib/jogl-all-natives-windows-i586.jar b/lib/jogl-all-natives-windows-i586.jar
diff --git a/lib/jogl-all.jar b/lib/jogl-all.jar
diff --git a/lib/natives/arm/libgluegen-rt.so b/lib/natives/arm/libgluegen-rt.so
diff --git a/lib/natives/arm/libjoal.so b/lib/natives/arm/libjoal.so
diff --git a/lib/natives/arm/libjocl.so b/lib/natives/arm/libjocl.so
diff --git a/lib/natives/arm/libjogl_cg.so b/lib/natives/arm/libjogl_cg.so
diff --git a/lib/natives/arm/libjogl_desktop.so b/lib/natives/arm/libjogl_desktop.so
diff --git a/lib/natives/arm/libjogl_mobile.so b/lib/natives/arm/libjogl_mobile.so
diff --git a/lib/natives/arm/libnativewindow_awt.so b/lib/natives/arm/libnativewindow_awt.so
diff --git a/lib/natives/arm/libnativewindow_x11.so b/lib/natives/arm/libnativewindow_x11.so
diff --git a/lib/natives/arm/libnewt.so b/lib/natives/arm/libnewt.so
diff --git a/lib/natives/arm/libopenal.so b/lib/natives/arm/libopenal.so
diff --git a/lib/natives/linux32/libgluegen-rt.so b/lib/natives/linux32/libgluegen-rt.so
diff --git a/lib/natives/linux32/libjoal.so b/lib/natives/linux32/libjoal.so
diff --git a/lib/natives/linux32/libjocl.so b/lib/natives/linux32/libjocl.so
diff --git a/lib/natives/linux32/libjogl_cg.so b/lib/natives/linux32/libjogl_cg.so
diff --git a/lib/natives/linux32/libjogl_desktop.so b/lib/natives/linux32/libjogl_desktop.so
diff --git a/lib/natives/linux32/libjogl_mobile.so b/lib/natives/linux32/libjogl_mobile.so
diff --git a/lib/natives/linux32/libnativewindow_awt.so b/lib/natives/linux32/libnativewindow_awt.so
diff --git a/lib/natives/linux32/libnativewindow_x11.so b/lib/natives/linux32/libnativewindow_x11.so
diff --git a/lib/natives/linux32/libnewt.so b/lib/natives/linux32/libnewt.so
diff --git a/lib/natives/linux32/libopenal.so b/lib/natives/linux32/libopenal.so
diff --git a/lib/natives/linux64/libgluegen-rt.so b/lib/natives/linux64/libgluegen-rt.so
diff --git a/lib/natives/linux64/libjoal.so b/lib/natives/linux64/libjoal.so
diff --git a/lib/natives/linux64/libjocl.so b/lib/natives/linux64/libjocl.so
diff --git a/lib/natives/linux64/libjogl_cg.so b/lib/natives/linux64/libjogl_cg.so
diff --git a/lib/natives/linux64/libjogl_desktop.so b/lib/natives/linux64/libjogl_desktop.so
diff --git a/lib/natives/linux64/libjogl_mobile.so b/lib/natives/linux64/libjogl_mobile.so
diff --git a/lib/natives/linux64/libnativewindow_awt.so b/lib/natives/linux64/libnativewindow_awt.so
diff --git a/lib/natives/linux64/libnativewindow_x11.so b/lib/natives/linux64/libnativewindow_x11.so
diff --git a/lib/natives/linux64/libnewt.so b/lib/natives/linux64/libnewt.so
diff --git a/lib/natives/linux64/libopenal.so b/lib/natives/linux64/libopenal.so
diff --git a/lib/natives/macosx/libgluegen-rt.dylib b/lib/natives/macosx/libgluegen-rt.dylib
diff --git a/lib/natives/macosx/libgluegen-rt.jnilib b/lib/natives/macosx/libgluegen-rt.jnilib
diff --git a/lib/natives/macosx/libjoal.jnilib b/lib/natives/macosx/libjoal.jnilib
diff --git a/lib/natives/macosx/libjocl.jnilib b/lib/natives/macosx/libjocl.jnilib
diff --git a/lib/natives/macosx/libjogl_cg.jnilib b/lib/natives/macosx/libjogl_cg.jnilib
diff --git a/lib/natives/macosx/libjogl_desktop.dylib b/lib/natives/macosx/libjogl_desktop.dylib
diff --git a/lib/natives/macosx/libjogl_desktop.jnilib b/lib/natives/macosx/libjogl_desktop.jnilib
diff --git a/lib/natives/macosx/libjogl_mobile.dylib b/lib/natives/macosx/libjogl_mobile.dylib
diff --git a/lib/natives/macosx/libjogl_mobile.jnilib b/lib/natives/macosx/libjogl_mobile.jnilib
diff --git a/lib/natives/macosx/libnativewindow_awt.dylib b/lib/natives/macosx/libnativewindow_awt.dylib
diff --git a/lib/natives/macosx/libnativewindow_awt.jnilib b/lib/natives/macosx/libnativewindow_awt.jnilib
diff --git a/lib/natives/macosx/libnativewindow_macosx.dylib b/lib/natives/macosx/libnativewindow_macosx.dylib
diff --git a/lib/natives/macosx/libnativewindow_macosx.jnilib b/lib/natives/macosx/libnativewindow_macosx.jnilib
diff --git a/lib/natives/macosx/libnewt.dylib b/lib/natives/macosx/libnewt.dylib
diff --git a/lib/natives/macosx/libnewt.jnilib b/lib/natives/macosx/libnewt.jnilib
diff --git a/lib/natives/macosx/libopenal.1.15.1.dylib b/lib/natives/macosx/libopenal.1.15.1.dylib
diff --git a/lib/natives/macosx/libopenal.1.dylib b/lib/natives/macosx/libopenal.1.dylib
diff --git a/lib/natives/macosx/libopenal.dylib b/lib/natives/macosx/libopenal.dylib
diff --git a/lib/natives/windows32/gluegen-rt.dll b/lib/natives/windows32/gluegen-rt.dll
diff --git a/lib/natives/windows32/joal.dll b/lib/natives/windows32/joal.dll
diff --git a/lib/natives/windows32/jocl.dll b/lib/natives/windows32/jocl.dll
diff --git a/lib/natives/windows32/jogl_cg.dll b/lib/natives/windows32/jogl_cg.dll
diff --git a/lib/natives/windows32/jogl_desktop.dll b/lib/natives/windows32/jogl_desktop.dll
diff --git a/lib/natives/windows32/jogl_mobile.dll b/lib/natives/windows32/jogl_mobile.dll
diff --git a/lib/natives/windows32/nativewindow_awt.dll b/lib/natives/windows32/nativewindow_awt.dll
diff --git a/lib/natives/windows32/nativewindow_win32.dll b/lib/natives/windows32/nativewindow_win32.dll
diff --git a/lib/natives/windows32/newt.dll b/lib/natives/windows32/newt.dll
diff --git a/lib/natives/windows32/soft_oal.dll b/lib/natives/windows32/soft_oal.dll
diff --git a/lib/natives/windows64/gluegen-rt.dll b/lib/natives/windows64/gluegen-rt.dll
diff --git a/lib/natives/windows64/joal.dll b/lib/natives/windows64/joal.dll
diff --git a/lib/natives/windows64/jocl.dll b/lib/natives/windows64/jocl.dll
diff --git a/lib/natives/windows64/jogl_cg.dll b/lib/natives/windows64/jogl_cg.dll
diff --git a/lib/natives/windows64/jogl_desktop.dll b/lib/natives/windows64/jogl_desktop.dll
diff --git a/lib/natives/windows64/jogl_mobile.dll b/lib/natives/windows64/jogl_mobile.dll
diff --git a/lib/natives/windows64/nativewindow_awt.dll b/lib/natives/windows64/nativewindow_awt.dll
diff --git a/lib/natives/windows64/nativewindow_win32.dll b/lib/natives/windows64/nativewindow_win32.dll
diff --git a/lib/natives/windows64/newt.dll b/lib/natives/windows64/newt.dll
diff --git a/lib/natives/windows64/soft_oal.dll b/lib/natives/windows64/soft_oal.dll
diff --git a/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java b/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java
@@ -166,19 +166,19 @@ public void draw() {
     }
 
     if (fpsText != null) {
-      renderer.beginRendering(drawable.getWidth(), drawable.getHeight());
+      renderer.beginRendering(drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
       // Figure out the location at which to draw the text
       int x = 0;
       int y = 0;
       switch (textLocation) {
         case UPPER_LEFT:
           x = fpsOffset;
-          y = drawable.getHeight() - fpsHeight - fpsOffset;
+          y = drawable.getSurfaceHeight() - fpsHeight - fpsOffset;
           break;
 
         case UPPER_RIGHT:
-          x = drawable.getWidth() - fpsWidth - fpsOffset;
-          y = drawable.getHeight() - fpsHeight - fpsOffset;
+          x = drawable.getSurfaceWidth() - fpsWidth - fpsOffset;
+          y = drawable.getSurfaceHeight() - fpsHeight - fpsOffset;
           break;
 
         case LOWER_LEFT:
@@ -187,7 +187,7 @@ public void draw() {
           break;
 
         case LOWER_RIGHT:
-          x = drawable.getWidth() - fpsWidth - fpsOffset;
+          x = drawable.getSurfaceWidth() - fpsWidth - fpsOffset;
           y = fpsOffset;
           break;
       }

diff --git a/src/com/willwinder/universalgcodesender/uielements/Overlay.java b/src/com/willwinder/universalgcodesender/uielements/Overlay.java
@@ -146,7 +146,7 @@ public void setColor(float r, float g, float b, float a) throws GLException {
   public void draw(String text) {
     text = text.trim();
     if (text != null || text != "") {
-      renderer.beginRendering(drawable.getWidth(), drawable.getHeight());
+      renderer.beginRendering(drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
 
       Rectangle2D bounds = renderer.getBounds(text);
       width = (int) bounds.getWidth();
@@ -159,12 +159,12 @@ public void draw(String text) {
       switch (textLocation) {
         case UPPER_LEFT:
           x = offset;
-          y = drawable.getHeight() - height - offset;
+          y = drawable.getSurfaceHeight() - height - offset;
           break;
 
         case UPPER_RIGHT:
-          x = drawable.getWidth() - width - offset;
-          y = drawable.getHeight() - height - offset;
+          x = drawable.getSurfaceWidth() - width - offset;
+          y = drawable.getSurfaceHeight() - height - offset;
           break;
 
         case LOWER_LEFT:
@@ -173,7 +173,7 @@ public void draw(String text) {
           break;
 
         case LOWER_RIGHT:
-          x = drawable.getWidth() - width - offset;
+          x = drawable.getSurfaceWidth() - width - offset;
           y = offset;
           break;
       }