diff --git a/core/pom.xml b/core/pom.xml index 1c75685b3..624b9f90f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,13 +32,13 @@ org.jogamp.jogl jogl-all-main - 2.2.4 + 2.3.2 org.jogamp.gluegen gluegen-rt-main - 2.2.4 + 2.3.2 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 index 2f5048fff..f27947e78 100644 --- 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 index 6b10f74d5..942df3805 100644 --- 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 index d2a404e80..89151e6bc 100644 --- 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 index 9f224289e..b9c4f906c 100644 --- 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 index cf2d89c2d..590d85fbd 100644 --- 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 index 330883754..f1bb2bd66 100644 --- 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 index d714ac103..54ada936e 100644 --- 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 index d48bf96c8..491b7767b 100644 --- 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 index e03c6b2fe..81ad25f26 100644 --- 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 index d4a648f20..1e04c7aa4 100644 --- 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 index 1bc8c9dd9..c665d9193 100644 --- 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 index 357a22248..843aad1b0 100644 --- 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 index f90e714d7..284ec0f6d 100644 --- 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 index 2def6b185..73bdf14fa 100644 --- 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 index ab990f73a..aa074bbaf 100644 --- 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/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorXAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorXAxisPainter.java index 3650ad6da..adaf30aaa 100644 --- a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorXAxisPainter.java +++ b/core/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/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorYAxisPainter.java b/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorYAxisPainter.java index 9591757bc..fa24f082b 100644 --- a/core/src/main/java/com/metsci/glimpse/axis/tagged/painter/TaggedPartialColorYAxisPainter.java +++ b/core/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 index 809ea0c8b..fa689e16c 100644 --- 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 index 0a653ed93..aac646dc0 100644 --- 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 index dc81adff7..903d6cc4d 100644 --- 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 index 1dd73c7e3..325c78420 100644 --- 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 index 0560c6856..37e535f94 100644 --- 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 index d99e50988..481cb08e9 100644 --- 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 index d465e979f..638f64572 100644 --- 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; } } \ No newline at end of file diff --git a/core/src/main/java/com/metsci/glimpse/canvas/SwingGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/SwingGlimpseCanvas.java index 157f5bc82..dcc650497 100644 --- 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; } } \ No newline at end of file diff --git a/core/src/main/java/com/metsci/glimpse/canvas/SwingLightweightGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/canvas/SwingLightweightGlimpseCanvas.java index 9b3c7cca8..cc60530c0 100644 --- a/core/src/main/java/com/metsci/glimpse/canvas/SwingLightweightGlimpseCanvas.java +++ b/core/src/main/java/com/metsci/glimpse/canvas/SwingLightweightGlimpseCanvas.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.GLJPanel; -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.GLJPanel; 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. * @@ -480,6 +478,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; } } diff --git a/core/src/main/java/com/metsci/glimpse/context/GlimpseContext.java b/core/src/main/java/com/metsci/glimpse/context/GlimpseContext.java index 4c0715ab8..e516232aa 100644 --- a/core/src/main/java/com/metsci/glimpse/context/GlimpseContext.java +++ b/core/src/main/java/com/metsci/glimpse/context/GlimpseContext.java @@ -26,11 +26,11 @@ */ package com.metsci.glimpse.context; -import javax.media.opengl.GL; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLContext; /** - * GlimpseContext wraps a {@link javax.media.opengl.GLContext} and + * GlimpseContext wraps a {@link com.jogamp.opengl.GLContext} and * provides additional contextual information necessary to display a * {@link com.metsci.glimpse.painter.base.GlimpsePainter}. * @@ -44,7 +44,7 @@ public interface GlimpseContext public GLContext getGLContext( ); /** - * @return a convenience method shorthand for the common: {@link #getGLContext( ) getGLContext( )}.{@link javax.media.opengl.GLContext#getGL() getGL( )} + * @return a convenience method shorthand for the common: {@link #getGLContext( ) getGLContext( )}.{@link com.jogamp.opengl.GLContext#getGL() getGL( )} */ public GL getGL( ); diff --git a/core/src/main/java/com/metsci/glimpse/context/GlimpseContextImpl.java b/core/src/main/java/com/metsci/glimpse/context/GlimpseContextImpl.java index 0834d8e9f..cac27933b 100644 --- a/core/src/main/java/com/metsci/glimpse/context/GlimpseContextImpl.java +++ b/core/src/main/java/com/metsci/glimpse/context/GlimpseContextImpl.java @@ -26,8 +26,8 @@ */ package com.metsci.glimpse.context; -import javax.media.opengl.GL; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.canvas.GlimpseCanvas; diff --git a/core/src/main/java/com/metsci/glimpse/gl/GLCapabilityEventListener.java b/core/src/main/java/com/metsci/glimpse/gl/GLCapabilityEventListener.java index 706df97f8..4235e2bd8 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/GLCapabilityEventListener.java +++ b/core/src/main/java/com/metsci/glimpse/gl/GLCapabilityEventListener.java @@ -35,9 +35,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLEventListener; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLEventListener; public class GLCapabilityEventListener implements GLEventListener { diff --git a/core/src/main/java/com/metsci/glimpse/gl/GLSimpleFrameBufferObject.java b/core/src/main/java/com/metsci/glimpse/gl/GLSimpleFrameBufferObject.java index 0c5f7b021..19b62016d 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/GLSimpleFrameBufferObject.java +++ b/core/src/main/java/com/metsci/glimpse/gl/GLSimpleFrameBufferObject.java @@ -35,12 +35,12 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLRunnable; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLRunnable; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureIO; diff --git a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLBuffer.java b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLBuffer.java index 0573411f4..e77261125 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLBuffer.java +++ b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLBuffer.java @@ -31,8 +31,8 @@ import java.nio.ByteBuffer; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; diff --git a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLByteBuffer.java b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLByteBuffer.java index e5b42f0d0..484640746 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLByteBuffer.java +++ b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLByteBuffer.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.gl.attribute; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; diff --git a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLFloatBuffer.java b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLFloatBuffer.java index 6481de026..0adfc48ae 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLFloatBuffer.java +++ b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLFloatBuffer.java @@ -28,7 +28,7 @@ import java.nio.FloatBuffer; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; diff --git a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLVertexAttribute.java b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLVertexAttribute.java index eabee3dee..9c1fac965 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/attribute/GLVertexAttribute.java +++ b/core/src/main/java/com/metsci/glimpse/gl/attribute/GLVertexAttribute.java @@ -26,13 +26,13 @@ */ package com.metsci.glimpse.gl.attribute; -import static javax.media.opengl.GL.GL_FLOAT; -import static javax.media.opengl.fixedfunc.GLPointerFunc.GL_COLOR_ARRAY; -import static javax.media.opengl.fixedfunc.GLPointerFunc.GL_NORMAL_ARRAY; -import static javax.media.opengl.fixedfunc.GLPointerFunc.GL_TEXTURE_COORD_ARRAY; -import static javax.media.opengl.fixedfunc.GLPointerFunc.GL_VERTEX_ARRAY; +import static com.jogamp.opengl.GL.GL_FLOAT; +import static com.jogamp.opengl.fixedfunc.GLPointerFunc.GL_COLOR_ARRAY; +import static com.jogamp.opengl.fixedfunc.GLPointerFunc.GL_NORMAL_ARRAY; +import static com.jogamp.opengl.fixedfunc.GLPointerFunc.GL_TEXTURE_COORD_ARRAY; +import static com.jogamp.opengl.fixedfunc.GLPointerFunc.GL_VERTEX_ARRAY; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; /** * According to NVIDIA: diff --git a/core/src/main/java/com/metsci/glimpse/gl/shader/GLShaderUtils.java b/core/src/main/java/com/metsci/glimpse/gl/shader/GLShaderUtils.java index fa22e7cfa..07ce93681 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/shader/GLShaderUtils.java +++ b/core/src/main/java/com/metsci/glimpse/gl/shader/GLShaderUtils.java @@ -31,7 +31,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; public class GLShaderUtils { diff --git a/core/src/main/java/com/metsci/glimpse/gl/shader/Pipeline.java b/core/src/main/java/com/metsci/glimpse/gl/shader/Pipeline.java index dd964e28e..c27fcfa40 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/shader/Pipeline.java +++ b/core/src/main/java/com/metsci/glimpse/gl/shader/Pipeline.java @@ -30,10 +30,10 @@ import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLException; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLException; /** * A structure wrapping a set of three OpenGL shaders (a geometry diff --git a/core/src/main/java/com/metsci/glimpse/gl/shader/Shader.java b/core/src/main/java/com/metsci/glimpse/gl/shader/Shader.java index aeaa0e210..4301cf684 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/shader/Shader.java +++ b/core/src/main/java/com/metsci/glimpse/gl/shader/Shader.java @@ -36,10 +36,10 @@ import java.util.List; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLException; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLException; import com.metsci.glimpse.util.io.StreamOpener; diff --git a/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderArg.java b/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderArg.java index ca82a7b10..b0e2b4ec0 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderArg.java +++ b/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderArg.java @@ -31,7 +31,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; /** * A wrapper for a shader variable declared in an GLSL source file. diff --git a/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderType.java b/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderType.java index 6a3ef7be0..11bcc00b3 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderType.java +++ b/core/src/main/java/com/metsci/glimpse/gl/shader/ShaderType.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.gl.shader; -import javax.media.opengl.GL3; +import com.jogamp.opengl.GL3; public enum ShaderType { diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/AbstractTexture.java b/core/src/main/java/com/metsci/glimpse/gl/texture/AbstractTexture.java index 22e818b4a..6f8ae9262 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/AbstractTexture.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/AbstractTexture.java @@ -31,9 +31,9 @@ import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; /** * An abstract {@link Texture} implementation which wraps an OpenGL diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/ColorTexture1D.java b/core/src/main/java/com/metsci/glimpse/gl/texture/ColorTexture1D.java index c9d738b16..144d46070 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/ColorTexture1D.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/ColorTexture1D.java @@ -28,8 +28,8 @@ import java.nio.FloatBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.support.colormap.ColorGradient; diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/DrawableTexture.java b/core/src/main/java/com/metsci/glimpse/gl/texture/DrawableTexture.java index fa6a5e3d4..c3fcf44ef 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/DrawableTexture.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/DrawableTexture.java @@ -28,7 +28,7 @@ import java.util.Collection; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.painter.texture.TextureUnit; diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture1D.java b/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture1D.java index edb6c135a..95e69b4ff 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture1D.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture1D.java @@ -28,8 +28,8 @@ import java.nio.FloatBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture2D.java b/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture2D.java index 692761765..583a75e31 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture2D.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/FloatTexture2D.java @@ -32,8 +32,8 @@ import java.util.Collection; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.painter.texture.TextureUnit; diff --git a/core/src/main/java/com/metsci/glimpse/gl/texture/Texture.java b/core/src/main/java/com/metsci/glimpse/gl/texture/Texture.java index 8579607c2..4a0b243ca 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/texture/Texture.java +++ b/core/src/main/java/com/metsci/glimpse/gl/texture/Texture.java @@ -26,8 +26,8 @@ */ package com.metsci.glimpse.gl.texture; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; /** * Wrapper interface for an OpenGL texture. Provides methods diff --git a/core/src/main/java/com/metsci/glimpse/gl/util/GLCapabilityUtils.java b/core/src/main/java/com/metsci/glimpse/gl/util/GLCapabilityUtils.java index e94409cef..621f9a63f 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/util/GLCapabilityUtils.java +++ b/core/src/main/java/com/metsci/glimpse/gl/util/GLCapabilityUtils.java @@ -33,10 +33,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL3; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL3; +import com.jogamp.opengl.GLContext; /** * @author osborn diff --git a/core/src/main/java/com/metsci/glimpse/gl/util/GLColorUtils.java b/core/src/main/java/com/metsci/glimpse/gl/util/GLColorUtils.java index 13d8d2d92..a935e5ca4 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/util/GLColorUtils.java +++ b/core/src/main/java/com/metsci/glimpse/gl/util/GLColorUtils.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.gl.util; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.support.color.RGBA; diff --git a/core/src/main/java/com/metsci/glimpse/gl/util/GLErrorUtils.java b/core/src/main/java/com/metsci/glimpse/gl/util/GLErrorUtils.java index 5236389a6..11cf37113 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/util/GLErrorUtils.java +++ b/core/src/main/java/com/metsci/glimpse/gl/util/GLErrorUtils.java @@ -32,8 +32,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; public class GLErrorUtils { diff --git a/core/src/main/java/com/metsci/glimpse/gl/util/GLUtils.java b/core/src/main/java/com/metsci/glimpse/gl/util/GLUtils.java index 1653fa5c0..667f92401 100644 --- a/core/src/main/java/com/metsci/glimpse/gl/util/GLUtils.java +++ b/core/src/main/java/com/metsci/glimpse/gl/util/GLUtils.java @@ -26,13 +26,13 @@ */ package com.metsci.glimpse.gl.util; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLOffscreenAutoDrawable; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLOffscreenAutoDrawable; +import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.util.FPSAnimator; import com.metsci.glimpse.canvas.GlimpseCanvas; diff --git a/core/src/main/java/com/metsci/glimpse/layout/GlimpseLayoutDelegate.java b/core/src/main/java/com/metsci/glimpse/layout/GlimpseLayoutDelegate.java index 2a8969260..6fbc1698d 100644 --- a/core/src/main/java/com/metsci/glimpse/layout/GlimpseLayoutDelegate.java +++ b/core/src/main/java/com/metsci/glimpse/layout/GlimpseLayoutDelegate.java @@ -33,8 +33,8 @@ import java.util.LinkedHashMap; import java.util.List; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.context.GlimpseBounds; import com.metsci.glimpse.context.GlimpseContext; diff --git a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter1D.java b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter1D.java index 6663488cc..396454613 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter1D.java +++ b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter1D.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.painter.base; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter2D.java b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter2D.java index 71507a3ee..d4daa3988 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter2D.java +++ b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpseDataPainter2D.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.painter.base; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpsePainterImpl.java b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpsePainterImpl.java index 49a4d3d00..4217171e4 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/base/GlimpsePainterImpl.java +++ b/core/src/main/java/com/metsci/glimpse/painter/base/GlimpsePainterImpl.java @@ -30,9 +30,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.context.GlimpseBounds; import com.metsci.glimpse.context.GlimpseContext; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/BackgroundPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/BackgroundPainter.java index 116d280a8..37cd92037 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/BackgroundPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/BackgroundPainter.java @@ -29,8 +29,8 @@ import static com.metsci.glimpse.support.settings.AbstractLookAndFeel.FRAME_BACKGROUND_COLOR; import static com.metsci.glimpse.support.settings.AbstractLookAndFeel.PLOT_BACKGROUND_COLOR; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.context.GlimpseContext; import com.metsci.glimpse.painter.base.GlimpsePainter; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/BorderPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/BorderPainter.java index 2a862357a..3c2a014b2 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/BorderPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/BorderPainter.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.painter.decoration; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.context.GlimpseBounds; import com.metsci.glimpse.context.GlimpseContext; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/CopyrightPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/CopyrightPainter.java index def1e9c54..9db49d1e9 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/CopyrightPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/CopyrightPainter.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.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/CrosshairPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/CrosshairPainter.java index 3fc630846..83032d0e7 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/CrosshairPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/CrosshairPainter.java @@ -26,8 +26,8 @@ */ package com.metsci.glimpse.painter.decoration; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/GridPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/GridPainter.java index fd098a6b3..6934ff9a8 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/GridPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/GridPainter.java @@ -28,7 +28,7 @@ import static java.lang.Integer.parseInt; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/LegendPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/LegendPainter.java index 9dc4c2450..11e506589 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/LegendPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/LegendPainter.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.jogamp.opengl.util.awt.TextRenderer; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/MapBorderPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/MapBorderPainter.java index d7e792180..4094a4dac 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/MapBorderPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/MapBorderPainter.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.painter.decoration; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/decoration/WatermarkPainter.java b/core/src/main/java/com/metsci/glimpse/painter/decoration/WatermarkPainter.java index a0be225d8..612329492 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/decoration/WatermarkPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/decoration/WatermarkPainter.java @@ -37,19 +37,19 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.sqrt; -import static javax.media.opengl.GL.GL_BLEND; -import static javax.media.opengl.GL.GL_LINEAR; -import static javax.media.opengl.GL.GL_ONE; -import static javax.media.opengl.GL.GL_ONE_MINUS_SRC_ALPHA; -import static javax.media.opengl.GL.GL_REPLACE; -import static javax.media.opengl.GL.GL_TEXTURE; -import static javax.media.opengl.GL.GL_TEXTURE_MAG_FILTER; -import static javax.media.opengl.GL.GL_TEXTURE_MIN_FILTER; -import static javax.media.opengl.GL2ES1.GL_TEXTURE_ENV; -import static javax.media.opengl.GL2ES1.GL_TEXTURE_ENV_MODE; -import static javax.media.opengl.GL2GL3.GL_QUADS; -import static javax.media.opengl.fixedfunc.GLMatrixFunc.GL_MODELVIEW; -import static javax.media.opengl.fixedfunc.GLMatrixFunc.GL_PROJECTION; +import static com.jogamp.opengl.GL.GL_BLEND; +import static com.jogamp.opengl.GL.GL_LINEAR; +import static com.jogamp.opengl.GL.GL_ONE; +import static com.jogamp.opengl.GL.GL_ONE_MINUS_SRC_ALPHA; +import static com.jogamp.opengl.GL.GL_REPLACE; +import static com.jogamp.opengl.GL.GL_TEXTURE; +import static com.jogamp.opengl.GL.GL_TEXTURE_MAG_FILTER; +import static com.jogamp.opengl.GL.GL_TEXTURE_MIN_FILTER; +import static com.jogamp.opengl.GL2ES1.GL_TEXTURE_ENV; +import static com.jogamp.opengl.GL2ES1.GL_TEXTURE_ENV_MODE; +import static com.jogamp.opengl.GL2GL3.GL_QUADS; +import static com.jogamp.opengl.fixedfunc.GLMatrixFunc.GL_MODELVIEW; +import static com.jogamp.opengl.fixedfunc.GLMatrixFunc.GL_PROJECTION; import java.awt.image.BufferedImage; import java.io.IOException; @@ -57,9 +57,9 @@ import java.util.logging.Logger; import javax.imageio.ImageIO; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLProfile; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/core/src/main/java/com/metsci/glimpse/painter/geo/ScalePainter.java b/core/src/main/java/com/metsci/glimpse/painter/geo/ScalePainter.java index 37c5166b9..bf11edfdc 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/geo/ScalePainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/geo/ScalePainter.java @@ -31,8 +31,8 @@ import java.awt.geom.Rectangle2D; import java.text.NumberFormat; -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/painter/group/WrappedPainter.java b/core/src/main/java/com/metsci/glimpse/painter/group/WrappedPainter.java index df5796cff..cd49a89fd 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/group/WrappedPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/group/WrappedPainter.java @@ -32,9 +32,9 @@ import java.util.NoSuchElementException; import java.util.concurrent.CopyOnWriteArrayList; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.google.common.collect.Lists; import com.metsci.glimpse.axis.Axis1D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/info/AnnotationPainter.java b/core/src/main/java/com/metsci/glimpse/painter/info/AnnotationPainter.java index ff6055b4a..9cc4617c2 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/AnnotationPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/AnnotationPainter.java @@ -31,7 +31,7 @@ import java.util.Collection; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.jogamp.opengl.util.awt.TextRenderer; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/info/CursorTextPainter.java b/core/src/main/java/com/metsci/glimpse/painter/info/CursorTextPainter.java index ef8c622e1..0822ee82b 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/CursorTextPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/CursorTextPainter.java @@ -32,8 +32,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.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/info/MeasurementPainter.java b/core/src/main/java/com/metsci/glimpse/painter/info/MeasurementPainter.java index a07125788..a631d3832 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/MeasurementPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/MeasurementPainter.java @@ -31,8 +31,8 @@ import java.awt.geom.Rectangle2D; import java.text.DecimalFormat; -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/painter/info/MinimapLayout.java b/core/src/main/java/com/metsci/glimpse/painter/info/MinimapLayout.java index f6ff89c6a..de4e321c9 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/MinimapLayout.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/MinimapLayout.java @@ -28,7 +28,7 @@ import static com.metsci.glimpse.context.TargetStackUtil.newTargetStack; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.axis.factory.DefaultAxisFactory2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/info/SimpleTextPainter.java b/core/src/main/java/com/metsci/glimpse/painter/info/SimpleTextPainter.java index 626adf1e2..574e33cad 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/SimpleTextPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/SimpleTextPainter.java @@ -32,7 +32,7 @@ import java.awt.Font; import java.awt.geom.Rectangle2D; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.jogamp.opengl.util.awt.TextRenderer; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/info/TooltipPainter.java b/core/src/main/java/com/metsci/glimpse/painter/info/TooltipPainter.java index 0272280f5..e962991b9 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/info/TooltipPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/info/TooltipPainter.java @@ -33,7 +33,7 @@ import java.util.Collections; import java.util.List; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.google.common.collect.Lists; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/plot/HistogramPainter.java b/core/src/main/java/com/metsci/glimpse/painter/plot/HistogramPainter.java index 7cc0025a4..9e5573456 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/plot/HistogramPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/plot/HistogramPainter.java @@ -29,8 +29,8 @@ import java.nio.FloatBuffer; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/plot/StackedHistogramPainter.java b/core/src/main/java/com/metsci/glimpse/painter/plot/StackedHistogramPainter.java index 1d4d99c47..db13365f2 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/plot/StackedHistogramPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/plot/StackedHistogramPainter.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/plot/XYLinePainter.java b/core/src/main/java/com/metsci/glimpse/painter/plot/XYLinePainter.java index 223d7312e..17a01aca5 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/plot/XYLinePainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/plot/XYLinePainter.java @@ -29,8 +29,8 @@ import java.nio.FloatBuffer; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicLineSetPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicLineSetPainter.java index cc1c94ca5..07bf9aad1 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicLineSetPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicLineSetPainter.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.google.common.collect.Sets; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicPointSetPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicPointSetPainter.java index c3789bac7..48ac04799 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicPointSetPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/DynamicPointSetPainter.java @@ -40,7 +40,7 @@ import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.google.common.collect.Sets; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/LineSetPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/LineSetPainter.java index 76a736c8d..90de5bd2c 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/LineSetPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/LineSetPainter.java @@ -30,8 +30,8 @@ import java.nio.IntBuffer; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/PointSetPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/PointSetPainter.java index f074af630..7efc8a38d 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/PointSetPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/PointSetPainter.java @@ -30,8 +30,8 @@ import java.util.Collection; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainter.java index 891f917b5..4dcca7cd8 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainter.java @@ -43,9 +43,9 @@ import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainterSimple.java b/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainterSimple.java index 247983271..8fdb12a70 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainterSimple.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/PolygonPainterSimple.java @@ -35,8 +35,8 @@ import java.util.TreeSet; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/ShadedPointPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/ShadedPointPainter.java index 11840ae2c..5673aadc3 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/ShadedPointPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/ShadedPointPainter.java @@ -29,9 +29,9 @@ import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/shape/TimeShadedPointPainter.java b/core/src/main/java/com/metsci/glimpse/painter/shape/TimeShadedPointPainter.java index 840dc8b96..e4ad6b8ee 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/shape/TimeShadedPointPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/shape/TimeShadedPointPainter.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.nio.FloatBuffer; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.gl.attribute.GLFloatBuffer; diff --git a/core/src/main/java/com/metsci/glimpse/painter/texture/ShadedTexturePainter.java b/core/src/main/java/com/metsci/glimpse/painter/texture/ShadedTexturePainter.java index fe99f5648..a888dfdd7 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/texture/ShadedTexturePainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/texture/ShadedTexturePainter.java @@ -32,8 +32,8 @@ import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.google.common.collect.Sets; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/painter/texture/TaggedHeatMapPainter.java b/core/src/main/java/com/metsci/glimpse/painter/texture/TaggedHeatMapPainter.java index cc733c339..b541eaf35 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/texture/TaggedHeatMapPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/texture/TaggedHeatMapPainter.java @@ -32,7 +32,7 @@ import java.nio.FloatBuffer; 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/painter/texture/TextureUnit.java b/core/src/main/java/com/metsci/glimpse/painter/texture/TextureUnit.java index ca9865417..30193f3bc 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/texture/TextureUnit.java +++ b/core/src/main/java/com/metsci/glimpse/painter/texture/TextureUnit.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.painter.texture; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.gl.texture.Texture; diff --git a/core/src/main/java/com/metsci/glimpse/painter/track/StaticParticlePainter.java b/core/src/main/java/com/metsci/glimpse/painter/track/StaticParticlePainter.java index ef5e2db3f..405c3ef37 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/track/StaticParticlePainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/track/StaticParticlePainter.java @@ -30,8 +30,8 @@ import java.nio.IntBuffer; import java.util.Arrays; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/track/TrackPainter.java b/core/src/main/java/com/metsci/glimpse/painter/track/TrackPainter.java index b6bd3091e..be0795e9c 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/track/TrackPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/track/TrackPainter.java @@ -44,9 +44,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +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/painter/treemap/AbstractTreeMapPainter.java b/core/src/main/java/com/metsci/glimpse/painter/treemap/AbstractTreeMapPainter.java index 1e22ad89a..605684c17 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/treemap/AbstractTreeMapPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/treemap/AbstractTreeMapPainter.java @@ -32,9 +32,9 @@ import java.awt.geom.Rectangle2D; import java.util.Arrays; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.axis.Axis2D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/painter/treemap/SimpleTreeMapPainter.java b/core/src/main/java/com/metsci/glimpse/painter/treemap/SimpleTreeMapPainter.java index c16eabaad..304848cd1 100644 --- a/core/src/main/java/com/metsci/glimpse/painter/treemap/SimpleTreeMapPainter.java +++ b/core/src/main/java/com/metsci/glimpse/painter/treemap/SimpleTreeMapPainter.java @@ -32,9 +32,9 @@ import java.awt.Font; import java.awt.geom.Rectangle2D; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.opengl.util.awt.TextRenderer; import com.metsci.glimpse.axis.Axis2D; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/Event.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/Event.java index 09b705550..314030395 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/Event.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/Event.java @@ -35,8 +35,8 @@ import java.util.LinkedList; import java.util.List; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultEventPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultEventPainter.java index 8093639a3..3b6ce4135 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultEventPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultEventPainter.java @@ -33,7 +33,7 @@ import java.awt.geom.Rectangle2D; import java.util.Iterator; -import javax.media.opengl.GL2; +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/plot/timeline/event/paint/DefaultGroupedEventPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultGroupedEventPainter.java index c2d16031e..3388bf7fe 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultGroupedEventPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/DefaultGroupedEventPainter.java @@ -45,8 +45,8 @@ import java.util.Iterator; import java.util.List; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.google.common.collect.Lists; import com.jogamp.common.nio.Buffers; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainter.java index 7156def30..cd3bfbf23 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainter.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.plot.timeline.event.paint; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainterManager.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainterManager.java index 620712648..8d784f84a 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainterManager.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/EventPainterManager.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.List; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.google.common.collect.Lists; import com.jogamp.opengl.util.awt.TextRenderer; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainter.java index 0305c05b7..cca3853c5 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainter.java @@ -28,7 +28,7 @@ import java.util.Collection; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainterAdapter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainterAdapter.java index ed9f7c10f..661070e5e 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainterAdapter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/event/paint/GroupedEventPainterAdapter.java @@ -28,7 +28,7 @@ import java.util.Collection; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.axis.Axis1D; import com.metsci.glimpse.context.GlimpseBounds; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/group/GroupLabelPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/group/GroupLabelPainter.java index 6e6037b18..ef3ce1f9c 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/group/GroupLabelPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/group/GroupLabelPainter.java @@ -26,12 +26,12 @@ */ package com.metsci.glimpse.plot.timeline.group; -import static javax.media.opengl.fixedfunc.GLMatrixFunc.GL_MODELVIEW; -import static javax.media.opengl.fixedfunc.GLMatrixFunc.GL_PROJECTION; +import static com.jogamp.opengl.fixedfunc.GLMatrixFunc.GL_MODELVIEW; +import static com.jogamp.opengl.fixedfunc.GLMatrixFunc.GL_PROJECTION; import java.awt.geom.Rectangle2D; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.context.GlimpseBounds; import com.metsci.glimpse.context.GlimpseContext; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SelectedTimeRegionPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SelectedTimeRegionPainter.java index 0921f660f..4c7fe8e31 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SelectedTimeRegionPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SelectedTimeRegionPainter.java @@ -29,8 +29,8 @@ import java.awt.geom.Rectangle2D; import java.util.List; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.metsci.glimpse.axis.tagged.Tag; import com.metsci.glimpse.axis.tagged.TaggedAxis1D; diff --git a/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SimpleSelectedTimeRegionPainter.java b/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SimpleSelectedTimeRegionPainter.java index fce18a08d..1eb0b6fac 100644 --- a/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SimpleSelectedTimeRegionPainter.java +++ b/core/src/main/java/com/metsci/glimpse/plot/timeline/painter/SimpleSelectedTimeRegionPainter.java @@ -29,7 +29,7 @@ import java.awt.Font; import java.util.List; -import javax.media.opengl.GL2; +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/support/FrameUtils.java b/core/src/main/java/com/metsci/glimpse/support/FrameUtils.java index f7964c688..80c31b573 100644 --- a/core/src/main/java/com/metsci/glimpse/support/FrameUtils.java +++ b/core/src/main/java/com/metsci/glimpse/support/FrameUtils.java @@ -43,8 +43,8 @@ import java.awt.event.WindowListener; import java.util.List; -import javax.media.opengl.GLAnimatorControl; -import javax.media.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLAnimatorControl; +import com.jogamp.opengl.GLAutoDrawable; import javax.swing.JFrame; import com.metsci.glimpse.canvas.GlimpseCanvas; diff --git a/core/src/main/java/com/metsci/glimpse/support/atlas/TextureAtlas.java b/core/src/main/java/com/metsci/glimpse/support/atlas/TextureAtlas.java index 2370926d6..233c48bb1 100644 --- a/core/src/main/java/com/metsci/glimpse/support/atlas/TextureAtlas.java +++ b/core/src/main/java/com/metsci/glimpse/support/atlas/TextureAtlas.java @@ -59,10 +59,10 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReentrantLock; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLException; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.util.awt.TextureRenderer; import com.jogamp.opengl.util.packrect.BackingStoreManager; diff --git a/core/src/main/java/com/metsci/glimpse/support/atlas/painter/IconPainter.java b/core/src/main/java/com/metsci/glimpse/support/atlas/painter/IconPainter.java index 02fe9ef7e..e11b07a5f 100644 --- a/core/src/main/java/com/metsci/glimpse/support/atlas/painter/IconPainter.java +++ b/core/src/main/java/com/metsci/glimpse/support/atlas/painter/IconPainter.java @@ -44,9 +44,9 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.texture.TextureCoords; diff --git a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderFragment.java b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderFragment.java index 6871106f8..8c45416bc 100644 --- a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderFragment.java +++ b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderFragment.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.support.atlas.shader; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL; import com.metsci.glimpse.gl.shader.Shader; import com.metsci.glimpse.gl.shader.ShaderArg; diff --git a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderGeometry.java b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderGeometry.java index f92a7d75c..14905d816 100644 --- a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderGeometry.java +++ b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderGeometry.java @@ -26,7 +26,7 @@ */ package com.metsci.glimpse.support.atlas.shader; -import javax.media.opengl.GL3; +import com.jogamp.opengl.GL3; import com.metsci.glimpse.context.GlimpseBounds; import com.metsci.glimpse.gl.shader.ShaderArg; diff --git a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderVertex.java b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderVertex.java index 00019d021..84282ad26 100644 --- a/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderVertex.java +++ b/core/src/main/java/com/metsci/glimpse/support/atlas/shader/TextureAtlasIconShaderVertex.java @@ -28,8 +28,8 @@ import java.util.logging.Logger; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; import com.metsci.glimpse.gl.shader.Shader; import com.metsci.glimpse.gl.shader.ShaderType; diff --git a/core/src/main/java/com/metsci/glimpse/support/color/GlimpseColor.java b/core/src/main/java/com/metsci/glimpse/support/color/GlimpseColor.java index 07926b61c..c6295be8d 100644 --- a/core/src/main/java/com/metsci/glimpse/support/color/GlimpseColor.java +++ b/core/src/main/java/com/metsci/glimpse/support/color/GlimpseColor.java @@ -29,8 +29,8 @@ import java.awt.Color; import java.text.ParseException; -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; diff --git a/core/src/main/java/com/metsci/glimpse/support/font/AttributedTextRenderer.java b/core/src/main/java/com/metsci/glimpse/support/font/AttributedTextRenderer.java index daffde542..933103a2d 100644 --- a/core/src/main/java/com/metsci/glimpse/support/font/AttributedTextRenderer.java +++ b/core/src/main/java/com/metsci/glimpse/support/font/AttributedTextRenderer.java @@ -65,15 +65,15 @@ import java.util.List; import java.util.Map; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.FPSAnimator; @@ -97,15 +97,15 @@ Using the {@link AttributedTextRenderer TextRenderer} is simple. Add a "TextRenderer renderer;" field to your {@link - javax.media.opengl.GLEventListener GLEventListener}. In your {@link - javax.media.opengl.GLEventListener#init init} method, add: + com.jogamp.opengl.GLEventListener GLEventListener}. In your {@link + com.jogamp.opengl.GLEventListener#init init} method, add: 
     renderer = new TextRenderer(new Font("SansSerif", Font.BOLD, 36));
-

In the {@link javax.media.opengl.GLEventListener#display display} method of your - {@link javax.media.opengl.GLEventListener GLEventListener}, add: +

In the {@link com.jogamp.opengl.GLEventListener#display display} method of your + {@link com.jogamp.opengl.GLEventListener GLEventListener}, add: 

     renderer.beginRendering(drawable.getWidth(), drawable.getHeight());
     // optionally set the color
@@ -400,7 +400,7 @@ public FontRenderContext getFontRenderContext( )
     
         @param width the width of the current on-screen OpenGL drawable
         @param height the height of the current on-screen OpenGL drawable
-        @throws javax.media.opengl.GLException If an OpenGL context is not current when this method is called
+        @throws com.jogamp.opengl.GLException If an OpenGL context is not current when this method is called
     */
     public void beginRendering( int width, int height ) throws GLException
     {
diff --git a/core/src/main/java/com/metsci/glimpse/support/polygon/PolygonTessellator.java b/core/src/main/java/com/metsci/glimpse/support/polygon/PolygonTessellator.java
index dfab7405e..38fff1f1e 100644
--- a/core/src/main/java/com/metsci/glimpse/support/polygon/PolygonTessellator.java
+++ b/core/src/main/java/com/metsci/glimpse/support/polygon/PolygonTessellator.java
@@ -28,10 +28,10 @@
 
 import java.util.Iterator;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUtessellator;
-import javax.media.opengl.glu.GLUtessellatorCallback;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUtessellator;
+import com.jogamp.opengl.glu.GLUtessellatorCallback;
 
 import com.metsci.glimpse.support.polygon.Polygon.Loop;
 
diff --git a/core/src/main/java/com/metsci/glimpse/support/shader/SampledColorScaleShader.java b/core/src/main/java/com/metsci/glimpse/support/shader/SampledColorScaleShader.java
index 3d7678c8d..31936ec9f 100644
--- a/core/src/main/java/com/metsci/glimpse/support/shader/SampledColorScaleShader.java
+++ b/core/src/main/java/com/metsci/glimpse/support/shader/SampledColorScaleShader.java
@@ -26,13 +26,11 @@
  */
 package com.metsci.glimpse.support.shader;
 
-import static com.metsci.glimpse.gl.shader.ShaderType.fragment;
-
 import java.io.IOException;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLContext;
-
+import static com.metsci.glimpse.gl.shader.ShaderType.fragment;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLContext;
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.listener.AxisListener1D;
 import com.metsci.glimpse.gl.shader.Shader;
diff --git a/core/src/main/java/com/metsci/glimpse/support/shader/SampledIntensityScaleShader.java b/core/src/main/java/com/metsci/glimpse/support/shader/SampledIntensityScaleShader.java
index d943f0694..e36393619 100644
--- a/core/src/main/java/com/metsci/glimpse/support/shader/SampledIntensityScaleShader.java
+++ b/core/src/main/java/com/metsci/glimpse/support/shader/SampledIntensityScaleShader.java
@@ -30,8 +30,8 @@
 
 import java.io.IOException;
 
-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/support/shader/SimplePointShader.java b/core/src/main/java/com/metsci/glimpse/support/shader/SimplePointShader.java
index f99638d7b..0f4a7dc02 100644
--- a/core/src/main/java/com/metsci/glimpse/support/shader/SimplePointShader.java
+++ b/core/src/main/java/com/metsci/glimpse/support/shader/SimplePointShader.java
@@ -28,8 +28,8 @@
 
 import java.io.IOException;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.axis.Axis1D;
 import com.metsci.glimpse.axis.listener.AxisListener1D;
diff --git a/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleGeometryShader.java b/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleGeometryShader.java
index 38de9748b..27ee9cbdb 100644
--- a/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleGeometryShader.java
+++ b/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleGeometryShader.java
@@ -26,8 +26,8 @@
  */
 package com.metsci.glimpse.support.shader.geometry;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL3;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL3;
 
 import com.metsci.glimpse.gl.shader.ShaderType;
 
diff --git a/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleShader.java b/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleShader.java
index 124b76c71..ea80a6922 100644
--- a/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleShader.java
+++ b/core/src/main/java/com/metsci/glimpse/support/shader/geometry/SimpleShader.java
@@ -32,8 +32,8 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 import com.metsci.glimpse.gl.shader.Shader;
 import com.metsci.glimpse.gl.shader.ShaderSource;
diff --git a/core/src/main/java/com/metsci/glimpse/support/swing/NewtSwingEDTGlimpseCanvas.java b/core/src/main/java/com/metsci/glimpse/support/swing/NewtSwingEDTGlimpseCanvas.java
index a7420c0cc..379e92f3b 100644
--- a/core/src/main/java/com/metsci/glimpse/support/swing/NewtSwingEDTGlimpseCanvas.java
+++ b/core/src/main/java/com/metsci/glimpse/support/swing/NewtSwingEDTGlimpseCanvas.java
@@ -30,12 +30,12 @@
 
 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.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.GLRunnable;
 import javax.swing.SwingUtilities;
 
 import com.jogamp.newt.NewtFactory;
diff --git a/core/src/main/java/com/metsci/glimpse/support/swing/SwingEDTAnimator.java b/core/src/main/java/com/metsci/glimpse/support/swing/SwingEDTAnimator.java
index da8c047ef..33e446ec9 100644
--- a/core/src/main/java/com/metsci/glimpse/support/swing/SwingEDTAnimator.java
+++ b/core/src/main/java/com/metsci/glimpse/support/swing/SwingEDTAnimator.java
@@ -38,8 +38,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GLAnimatorControl;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAnimatorControl;
+import com.jogamp.opengl.GLAutoDrawable;
 import javax.swing.SwingUtilities;
 
 import com.google.common.collect.Lists;
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/ByteTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/ByteTextureProjected2D.java
index 83a90aaa3..128e23136 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/ByteTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/ByteTextureProjected2D.java
@@ -26,14 +26,13 @@
  */
 package com.metsci.glimpse.support.texture;
 
-import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
-
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import static com.metsci.glimpse.util.logging.LoggerUtils.logWarning;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 /**
  * A texture class which stores 8 bit integer values (uncapped). Must be used
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/ColorTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/ColorTextureProjected2D.java
index 1687aee0b..df9693172 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/ColorTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/ColorTextureProjected2D.java
@@ -26,6 +26,7 @@
  */
 package com.metsci.glimpse.support.texture;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
@@ -34,9 +35,8 @@
 import java.nio.FloatBuffer;
 import java.util.logging.Logger;
 
-import javax.imageio.ImageIO;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 /**
  * A texture class which stores 4 channel RGBA colors. Each color channel
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/ExternalTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/ExternalTextureProjected2D.java
index e81cf6fda..4bbdbbe29 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/ExternalTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/ExternalTextureProjected2D.java
@@ -28,8 +28,8 @@
 
 import java.nio.ByteBuffer;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 /**
  * A wrapper around an OpenGL texture handle which is being handled (allocated, freed,
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/FloatTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/FloatTextureProjected2D.java
index cb39a3dfd..41b211322 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/FloatTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/FloatTextureProjected2D.java
@@ -32,8 +32,8 @@
 import java.nio.FloatBuffer;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 /**
  * A texture class which stores 32 bit fixed point values (uncapped). Must be used
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/LuminanceTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/LuminanceTextureProjected2D.java
index bce67230b..1636858b4 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/LuminanceTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/LuminanceTextureProjected2D.java
@@ -28,7 +28,7 @@
 
 import java.nio.Buffer;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * A texture class which stores 16 bit fixed point greyscale values (capped from 0 to 1).
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/RGBATextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/RGBATextureProjected2D.java
index 1d8e95236..c123c9670 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/RGBATextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/RGBATextureProjected2D.java
@@ -26,15 +26,14 @@
  */
 package com.metsci.glimpse.support.texture;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.Buffer;
 
-import javax.imageio.ImageIO;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 import com.metsci.glimpse.support.texture.ByteTextureProjected2D.MutatorByte2D;
 
 /**
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/RGBTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/RGBTextureProjected2D.java
index edaaee145..aa2f84f8e 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/RGBTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/RGBTextureProjected2D.java
@@ -26,15 +26,14 @@
  */
 package com.metsci.glimpse.support.texture;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.Buffer;
 
-import javax.imageio.ImageIO;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 import com.metsci.glimpse.support.texture.ByteTextureProjected2D.MutatorByte2D;
 
 /**
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/ShortTextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/ShortTextureProjected2D.java
index 71728ffdc..eec56931c 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/ShortTextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/ShortTextureProjected2D.java
@@ -32,8 +32,8 @@
 import java.nio.ShortBuffer;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 /**
  * A texture class which stores 16 bit integer values (uncapped). Must be used
diff --git a/core/src/main/java/com/metsci/glimpse/support/texture/TextureProjected2D.java b/core/src/main/java/com/metsci/glimpse/support/texture/TextureProjected2D.java
index 28613571e..5967267df 100644
--- a/core/src/main/java/com/metsci/glimpse/support/texture/TextureProjected2D.java
+++ b/core/src/main/java/com/metsci/glimpse/support/texture/TextureProjected2D.java
@@ -37,9 +37,9 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLContext;
 
 import com.jogamp.common.nio.Buffers;
 import com.metsci.glimpse.gl.texture.DrawableTexture;