Merge pull request #45 from jsettlers/update_jogl_jars

Update JOGL jars to newest version
jsettlers · Apr 26, 2015 · 648f892 · 648f892
2 parents a7ed8db + 0baf035
commit 648f892
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 12 deletions.
diff --git a/go.graphics.swing/jogl-packaged/jogamp-all-platforms.7z b/go.graphics.swing/jogl-packaged/jogamp-all-platforms.7z
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-linux-amd64.jar b/go.graphics.swing/libs/gluegen-rt-natives-linux-amd64.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-linux-armv6.jar b/go.graphics.swing/libs/gluegen-rt-natives-linux-armv6.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-linux-armv6hf.jar b/go.graphics.swing/libs/gluegen-rt-natives-linux-armv6hf.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-linux-i586.jar b/go.graphics.swing/libs/gluegen-rt-natives-linux-i586.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-macosx-universal.jar b/go.graphics.swing/libs/gluegen-rt-natives-macosx-universal.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-solaris-amd64.jar b/go.graphics.swing/libs/gluegen-rt-natives-solaris-amd64.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-solaris-i586.jar b/go.graphics.swing/libs/gluegen-rt-natives-solaris-i586.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-windows-amd64.jar b/go.graphics.swing/libs/gluegen-rt-natives-windows-amd64.jar
diff --git a/go.graphics.swing/libs/gluegen-rt-natives-windows-i586.jar b/go.graphics.swing/libs/gluegen-rt-natives-windows-i586.jar
diff --git a/go.graphics.swing/libs/gluegen-rt.jar b/go.graphics.swing/libs/gluegen-rt.jar
diff --git a/go.graphics.swing/libs/gluegen.jar b/go.graphics.swing/libs/gluegen.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-linux-amd64.jar b/go.graphics.swing/libs/jogl-all-natives-linux-amd64.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-linux-armv6.jar b/go.graphics.swing/libs/jogl-all-natives-linux-armv6.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-linux-armv6hf.jar b/go.graphics.swing/libs/jogl-all-natives-linux-armv6hf.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-linux-i586.jar b/go.graphics.swing/libs/jogl-all-natives-linux-i586.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-macosx-universal.jar b/go.graphics.swing/libs/jogl-all-natives-macosx-universal.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-solaris-amd64.jar b/go.graphics.swing/libs/jogl-all-natives-solaris-amd64.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-solaris-i586.jar b/go.graphics.swing/libs/jogl-all-natives-solaris-i586.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-windows-amd64.jar b/go.graphics.swing/libs/jogl-all-natives-windows-amd64.jar
diff --git a/go.graphics.swing/libs/jogl-all-natives-windows-i586.jar b/go.graphics.swing/libs/jogl-all-natives-windows-i586.jar
diff --git a/go.graphics.swing/libs/jogl-all-noawt.jar b/go.graphics.swing/libs/jogl-all-noawt.jar
diff --git a/go.graphics.swing/libs/jogl-all.jar b/go.graphics.swing/libs/jogl-all.jar
diff --git a/go.graphics.swing/src/go/graphics/swing/AreaContainer.java b/go.graphics.swing/src/go/graphics/swing/AreaContainer.java
@@ -10,16 +10,17 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
 import javax.swing.JPanel;
 
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
+
 /**
  * This class lets you embed areas into swing components.
  * 

diff --git a/go.graphics.swing/src/go/graphics/swing/opengl/JOGLDrawContext.java b/go.graphics.swing/src/go/graphics/swing/opengl/JOGLDrawContext.java
@@ -11,10 +11,9 @@
 import java.nio.ShortBuffer;
 import java.util.ArrayList;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-
 import com.jogamp.common.nio.Buffers;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 public class JOGLDrawContext implements GLDrawContext {
 
@@ -230,6 +229,7 @@ public void drawTrianglesWithTextureColored(int textureid, float[] geometry) {
 				/ FLOATS_PER_COLORED_TRI_VERTEX);
 	}
 
+	@Override
 	public void drawTrianglesWithTextureColored(int textureid,
 			ByteBuffer buffer, int triangles) {
 		gl2.glBindTexture(GL.GL_TEXTURE_2D, textureid);

diff --git a/go.graphics.swing/src/go/graphics/swing/opengl/TextureCalculator.java b/go.graphics.swing/src/go/graphics/swing/opengl/TextureCalculator.java
@@ -1,6 +1,6 @@
 package go.graphics.swing.opengl;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 public final class TextureCalculator {
 	private TextureCalculator() {