Skip to content

Commit

Permalink
Updated JOGL to version 2.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael de Hoog committed Jan 13, 2015
1 parent 88a8ce2 commit b53ef59
Show file tree
Hide file tree
Showing 60 changed files with 35 additions and 17 deletions.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.jogamp.jogl.feature"
label="JOGL"
version="2.1.5"
version="2.2.4"
provider-name="JOGAMP"
os="linux,macosx,win32"
arch="x86,x86_64">
Expand Down
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.feature/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.feature</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.linux.x86/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JOGL Natives for Linux x86
Bundle-SymbolicName: com.jogamp.jogl.linux.x86
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-Vendor: JOGAMP
Bundle-NativeCode: libjogl_desktop.so;
libjogl_mobile.so;
Expand Down
Binary file modified externals/com.jogamp.jogl.linux.x86/gluegen-rt-natives-linux-i586.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/jogl-all-natives-linux-i586.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libgluegen-rt.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libjogl_desktop.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libjogl_mobile.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libnativewindow_awt.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libnativewindow_x11.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86/libnewt.so
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.linux.x86/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.linux.x86</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.linux.x86__64/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JOGL Natives for Linux x86_64
Bundle-SymbolicName: com.jogamp.jogl.linux.x86_64
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-Vendor: JOGAMP
Bundle-NativeCode: libjogl_desktop.so;
libjogl_mobile.so;
Expand Down
Binary file modified externals/com.jogamp.jogl.linux.x86__64/gluegen-rt-natives-linux-amd64.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/jogl-all-natives-linux-amd64.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libgluegen-rt.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libjogl_desktop.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libjogl_mobile.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libnativewindow_awt.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libnativewindow_x11.so
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.linux.x86__64/libnewt.so
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.linux.x86__64/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.linux.x86_64</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>


Expand Down
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.macosx/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JOGL Natives for MacOSX
Bundle-SymbolicName: com.jogamp.jogl.macosx
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-Vendor: JOGAMP
Bundle-NativeCode: libjogl_desktop.jnilib;
libjogl_mobile.jnilib;
Expand Down
Binary file modified externals/com.jogamp.jogl.macosx/gluegen-rt-natives-macosx-universal.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/jogl-all-natives-macosx-universal.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libgluegen-rt.jnilib
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libjogl_desktop.jnilib
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libjogl_mobile.jnilib
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libnativewindow_awt.jnilib
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libnativewindow_macosx.jnilib
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.macosx/libnewt.jnilib
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.macosx/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.macosx</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.win32.x86/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JOGL Natives for Windows x86
Bundle-SymbolicName: com.jogamp.jogl.win32.x86
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-Vendor: JOGAMP
Bundle-NativeCode: jogl_desktop.dll;
jogl_mobile.dll;
Expand Down
Binary file modified externals/com.jogamp.jogl.win32.x86/gluegen-rt-natives-windows-i586.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/gluegen-rt.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/jogl-all-natives-windows-i586.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/jogl_desktop.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/jogl_mobile.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/nativewindow_awt.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/nativewindow_win32.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86/newt.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.win32.x86/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.win32.x86</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.win32.x86__64/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JOGL Natives for Windows x86_64
Bundle-SymbolicName: com.jogamp.jogl.win32.x86_64
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-Vendor: JOGAMP
Bundle-NativeCode: jogl_desktop.dll;
jogl_mobile.dll;
Expand Down
Binary file modified externals/com.jogamp.jogl.win32.x86__64/gluegen-rt-natives-windows-amd64.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/gluegen-rt.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/jogl-all-natives-windows-amd64.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/jogl_desktop.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/jogl_mobile.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/nativewindow_awt.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/nativewindow_win32.dll
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl.win32.x86__64/newt.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl.win32.x86__64/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl.win32.x86_64</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
8 changes: 5 additions & 3 deletions externals/com.jogamp.jogl/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jogl2.0
Bundle-SymbolicName: com.jogamp.jogl
Bundle-Version: 2.1.5
Bundle-Version: 2.2.4
Bundle-ClassPath: jogl-all.jar,
gluegen-rt.jar
Bundle-Vendor: JogAmp Community
Expand All @@ -24,7 +24,6 @@ Export-Package: com.jogamp.common,
com.jogamp.graph.curve.tess,
com.jogamp.graph.font,
com.jogamp.graph.geom,
com.jogamp.graph.geom.opengl,
com.jogamp.nativewindow,
com.jogamp.nativewindow.awt,
com.jogamp.nativewindow.egl,
Expand All @@ -40,6 +39,7 @@ Export-Package: com.jogamp.common,
com.jogamp.newt.opengl,
com.jogamp.newt.swt,
com.jogamp.newt.util,
com.jogamp.newt.util.applet,
com.jogamp.opengl,
com.jogamp.opengl.math,
com.jogamp.opengl.math.geom,
Expand All @@ -52,6 +52,7 @@ Export-Package: com.jogamp.common,
com.jogamp.opengl.util.glsl.fixedfunc,
com.jogamp.opengl.util.glsl.sdk,
com.jogamp.opengl.util.packrect,
com.jogamp.opengl.util.stereo,
com.jogamp.opengl.util.texture,
com.jogamp.opengl.util.texture.awt,
com.jogamp.opengl.util.texture.spi,
Expand All @@ -72,7 +73,6 @@ Export-Package: com.jogamp.common,
jogamp.graph.curve.opengl,
jogamp.graph.curve.opengl.shader,
jogamp.graph.curve.tess,
jogamp.graph.curve.text,
jogamp.graph.font,
jogamp.graph.font.typecast,
jogamp.graph.font.typecast.ot,
Expand All @@ -99,6 +99,7 @@ Export-Package: com.jogamp.common,
jogamp.newt.driver.bcm.vc.iv,
jogamp.newt.driver.linux,
jogamp.newt.driver.macosx,
jogamp.newt.driver.opengl,
jogamp.newt.driver.windows,
jogamp.newt.driver.x11,
jogamp.newt.event,
Expand Down Expand Up @@ -129,6 +130,7 @@ Export-Package: com.jogamp.common,
jogamp.opengl.util.jpeg,
jogamp.opengl.util.pngj,
jogamp.opengl.util.pngj.chunks,
jogamp.opengl.util.stereo,
jogamp.opengl.windows.wgl,
jogamp.opengl.windows.wgl.awt,
jogamp.opengl.x11.glx
Expand Down
Binary file modified externals/com.jogamp.jogl/gluegen-java-src.zip
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl/gluegen-rt.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl/jogl-all.jar
View file
Binary file not shown.
Binary file modified externals/com.jogamp.jogl/jogl-java-src.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion externals/com.jogamp.jogl/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.jogamp.jogl</groupId>
<artifactId>com.jogamp.jogl</artifactId>
<version>2.1.5</version>
<version>2.2.4</version>
<packaging>eclipse-plugin</packaging>

</project>
2 changes: 1 addition & 1 deletion ...ga.earthsci.model.core.tests/src/au/gov/ga/earthsci/model/core/tests/util/GLTestUtil.java
View file
Expand Up @@ -80,7 +80,7 @@ public static GLContext createGLContext()
caps.setOnscreen(false);
caps.setPBuffer(true);
caps.setDoubleBuffered(false);
GLOffscreenAutoDrawable drawable = fact.createOffscreenAutoDrawable(null, caps, null, 100, 100, null);
GLOffscreenAutoDrawable drawable = fact.createOffscreenAutoDrawable(null, caps, null, 100, 100);
return drawable.getContext();
}
}
16 changes: 16 additions & 0 deletions ...arthsci.worldwind/src/au/gov/ga/earthsci/worldwind/common/render/ExtendedDrawContext.java
View file
Expand Up @@ -200,4 +200,20 @@ public void switchToStandardSurfaceGeometry()
oldSurfaceGeomtry = null;
}
}

@Override
public final int getDrawableWidth()
{
//superclass uses getWidth() method which no longer exists in JOGL (see
//https://github.com/sgothel/jogl/commit/ebe980ad6ac40148bc84913d1ba1f7adf6200490)
return this.getGLDrawable().getSurfaceWidth();
}

@Override
public final int getDrawableHeight()
{
//superclass uses getHeight() method which no longer exists in JOGL (see
//https://github.com/sgothel/jogl/commit/ebe980ad6ac40148bc84913d1ba1f7adf6200490)
return this.getGLDrawable().getSurfaceHeight();
}
}

0 comments on commit b53ef59

Please sign in to comment.