jogl version updated to 2.3.2

metsci · Aug 26, 2016 · e86c2d0 · e86c2d0
1 parent fb19a89
commit e86c2d0
Show file tree

Hide file tree

Showing 123 changed files with 318 additions and 317 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -32,13 +32,13 @@
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all-main</artifactId>
-			<version>2.2.4</version>
+			<version>2.3.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt-main</artifactId>
-			<version>2.2.4</version>
+			<version>2.3.2</version>
 		</dependency>
 	</dependencies>
 

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/ColorXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/ColorXAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/ColorYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/ColorYAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericAxisPainter.java
@@ -31,7 +31,7 @@
 
 import java.awt.Font;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 import com.jogamp.opengl.util.awt.TextRenderer;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericPolarAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericPolarAxisPainter.java
@@ -28,8 +28,8 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 import com.jogamp.opengl.util.awt.TextRenderer;
 import com.metsci.glimpse.axis.Axis1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericRotatedYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericRotatedYAxisPainter.java
@@ -30,7 +30,7 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericXAxisPainter.java
@@ -30,7 +30,7 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericXYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericXYAxisPainter.java
@@ -31,8 +31,8 @@
 import java.awt.Font;
 import java.awt.geom.Rectangle2D;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLContext;
 
 import com.jogamp.opengl.util.awt.TextRenderer;
 import com.metsci.glimpse.axis.Axis1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/NumericYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/NumericYAxisPainter.java
@@ -30,7 +30,7 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.AxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/TimeAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/TimeAxisPainter.java
@@ -28,7 +28,7 @@
 
 import java.awt.Font;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 import com.jogamp.opengl.util.awt.TextRenderer;
 import com.metsci.glimpse.axis.Axis1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/TimeXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/TimeXAxisPainter.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.TimeZone;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.TimeAxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/painter/TimeYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/painter/TimeYAxisPainter.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.TimeZone;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.label.TimeAxisLabelHandler;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedColorXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedColorXAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.tagged.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.ColorXAxisPainter;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedColorYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedColorYAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.tagged.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.ColorYAxisPainter;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedNumericXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedNumericXAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.tagged.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.NumericXAxisPainter;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedNumericYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedNumericYAxisPainter.java
@@ -26,7 +26,7 @@
  */
 package com.metsci.glimpse.axis.tagged.painter;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.painter.NumericYAxisPainter;

diff --git a/.../src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorXAxisPainter.java b/.../src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorXAxisPainter.java
@@ -31,7 +31,7 @@
 import java.nio.FloatBuffer;
 import java.util.List;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.jogamp.common.nio.Buffers;
 import com.metsci.glimpse.axis.Axis1D;

diff --git a/.../src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorYAxisPainter.java b/.../src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorYAxisPainter.java
@@ -31,7 +31,7 @@
 import java.nio.FloatBuffer;
 import java.util.List;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import com.jogamp.common.nio.Buffers;
 import com.metsci.glimpse.axis.Axis1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/PartialTaggedPointShader.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/PartialTaggedPointShader.java
@@ -31,7 +31,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.listener.AxisListener1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/TaggedColorScaleShader.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/TaggedColorScaleShader.java
@@ -32,8 +32,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLContext;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.listener.AxisListener1D;

diff --git a/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/TaggedPointShader.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/shader/TaggedPointShader.java
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.listener.AxisListener1D;

diff --git a/core/src/main/java/com/metsci/glimpse/canvas/AbstractGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/AbstractGlimpseCanvas.java
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLRunnable;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLRunnable;
 
 import com.metsci.glimpse.context.GlimpseContext;
 import com.metsci.glimpse.context.GlimpseContextImpl;

diff --git a/core/src/main/java/com/metsci/glimpse/canvas/FBOGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/FBOGlimpseCanvas.java
@@ -32,14 +32,14 @@
 import java.awt.image.BufferedImage;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLOffscreenAutoDrawable;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLOffscreenAutoDrawable;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
 
 import com.jogamp.opengl.FBObject.Colorbuffer;
 import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;

diff --git a/core/src/main/java/com/metsci/glimpse/canvas/GlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/GlimpseCanvas.java
@@ -26,11 +26,11 @@
  */
 package com.metsci.glimpse.canvas;
 
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
 
 import com.metsci.glimpse.context.GlimpseBounds;
 import com.metsci.glimpse.context.GlimpseContext;

diff --git a/core/src/main/java/com/metsci/glimpse/canvas/NewtSwingGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/NewtSwingGlimpseCanvas.java
@@ -26,25 +26,23 @@
  */
 package com.metsci.glimpse.canvas;
 
-import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
-
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.swing.JPanel;
-
+import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
 import com.jogamp.newt.awt.NewtCanvasAWT;
 import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
 import com.metsci.glimpse.context.GlimpseBounds;
 import com.metsci.glimpse.context.GlimpseContext;
 import com.metsci.glimpse.context.GlimpseContextImpl;
@@ -415,6 +413,10 @@ public boolean run( GLAutoDrawable drawable )
     @Override
     public int[] getSurfaceScale( )
     {
-        return this.glWindow.getNativeSurfaceScale( new int[2] );
+        float[] fArray = this.glWindow.getCurrentSurfaceScale(new float[2]);
+        int[] iArray = new int[2];
+        iArray[0] = (int) fArray[0];
+        iArray[1] = (int) fArray[1];
+        return iArray;
     }
 }
diff --git a/core/src/main/java/com/metsci/glimpse/canvas/SwingGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/SwingGlimpseCanvas.java
@@ -26,8 +26,7 @@
  */
 package com.metsci.glimpse.canvas;
 
-import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
-
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.KeyListener;
@@ -38,16 +37,15 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.media.opengl.awt.GLCanvas;
-import javax.swing.JPanel;
-
+import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
+import com.jogamp.opengl.awt.GLCanvas;
 import com.metsci.glimpse.context.GlimpseBounds;
 import com.metsci.glimpse.context.GlimpseContext;
 import com.metsci.glimpse.context.GlimpseContextImpl;
@@ -60,7 +58,7 @@
 import com.metsci.glimpse.support.settings.LookAndFeel;
 
 /**
- * A Swing GlimpseCanvas implementation which draws to a {@link javax.media.opengl.awt.GLCanvas}. This
+ * A Swing GlimpseCanvas implementation which draws to a {@link com.jogamp.opengl.awt.GLCanvas}. This
  * Canvas implementation is not as well supported as the newer JOGL {@link com.jogamp.newt.awt.NewtCanvasAWT}.
  * For this reason, {@link NewtSwingGlimpseCanvas} should generally be preferred over this class.
  * 
@@ -479,6 +477,10 @@ public boolean run( GLAutoDrawable drawable )
     @Override
     public int[] getSurfaceScale( )
     {
-        return this.glCanvas.getCurrentSurfaceScale( new int[2] );
+        float[] fArray = this.glCanvas.getCurrentSurfaceScale(new float[2]);
+        int[] iArray = new int[2];
+        iArray[0] = (int) fArray[0];
+        iArray[1] = (int) fArray[1];
+        return iArray;
     }
 }