From 109d8e199ea805fb59b2c0c974901b939dfad1be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xerxes=20R=C3=A5nby?= WorldWindow
with which to share graphics resources.
*
- * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
- * javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+ * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+ * com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
*/
public WorldWindowGLCanvas(WorldWindow shareWith)
{
@@ -126,8 +126,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith)
* @param device the GraphicsDevice
on which to create the window. May be null, in which case the
* default screen device of the local {@link GraphicsEnvironment} is used.
*
- * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
- * javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+ * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+ * com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
*/
public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device)
{
@@ -169,8 +169,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
* @param chooser a chooser object that customizes the specified capabilities. May be null, in which case a
* default chooser is used.
*
- * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
- * javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+ * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+ * com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
*/
public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device,
GLCapabilities capabilities, GLCapabilitiesChooser chooser)
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
index 12db4fe9c9..0c5e140e40 100644
--- a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
+++ b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
@@ -14,8 +14,8 @@
import gov.nasa.worldwind.pick.PickedObjectList;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
import java.beans.*;
import java.util.*;
@@ -86,8 +86,8 @@ public WorldWindowGLJPanel()
*
* @param shareWith a WorldWindow
with which to share graphics resources.
*
- * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
- * javax.media.opengl.GLContext)
+ * @see GLJPanel#GLJPanel(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+ * com.jogamp.opengl.GLContext)
*/
public WorldWindowGLJPanel(WorldWindow shareWith)
{
@@ -128,8 +128,8 @@ public WorldWindowGLJPanel(WorldWindow shareWith)
* @param chooser a chooser object that customizes the specified capabilities. May be null, in which case a
* default chooser is used.
*
- * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
- * javax.media.opengl.GLContext)
+ * @see GLJPanel#GLJPanel(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+ * com.jogamp.opengl.GLContext)
*/
public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,
GLCapabilitiesChooser chooser)
diff --git a/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java b/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java
index 6690a9a531..627386581a 100644
--- a/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java
+++ b/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java
@@ -9,7 +9,7 @@
import com.jogamp.opengl.util.texture.Texture;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.logging.Level;
/**
diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java
index 26e924001b..f28b7d5553 100644
--- a/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java
+++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java
index ecc4ab4197..f8ec6a44be 100644
--- a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java
+++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java
@@ -16,8 +16,8 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.util.combine.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
import java.awt.*;
import java.beans.*;
import java.nio.*;
diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java
index b6e45ddea0..7a8d1d6532 100644
--- a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java
+++ b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java
index 98097a7abb..6b0f583389 100644
--- a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java
+++ b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java
@@ -11,8 +11,8 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
import java.nio.IntBuffer;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java
index 9905acccef..1cd2feb36b 100644
--- a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java
+++ b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/geom/Box.java b/src/gov/nasa/worldwind/geom/Box.java
index e9bcec83b8..e3b3c26ac3 100644
--- a/src/gov/nasa/worldwind/geom/Box.java
+++ b/src/gov/nasa/worldwind/geom/Box.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/geom/Cylinder.java b/src/gov/nasa/worldwind/geom/Cylinder.java
index eeb5e36964..216c2ada58 100644
--- a/src/gov/nasa/worldwind/geom/Cylinder.java
+++ b/src/gov/nasa/worldwind/geom/Cylinder.java
@@ -10,8 +10,8 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/geom/Sphere.java b/src/gov/nasa/worldwind/geom/Sphere.java
index cd14418537..7748a7c5a1 100644
--- a/src/gov/nasa/worldwind/geom/Sphere.java
+++ b/src/gov/nasa/worldwind/geom/Sphere.java
@@ -9,8 +9,8 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.glu.*;
/**
* Represents a sphere in three dimensional space. Instances of Sphere
are immutable.
DrawContext
a new javax.media.opengl.GLContext. May throw a
+ * Assigns this DrawContext
a new com.jogamp.opengl.GLContext. May throw a
* NullPointerException
if glContext
is null.
*
- * @param glContext the new javax.media.opengl.GLContext
+ * @param glContext the new com.jogamp.opengl.GLContext
*
* @throws NullPointerException if glContext is null
* @since 1.5
@@ -41,17 +41,17 @@ public interface DrawContext extends WWObject, Disposable
void setGLContext(GLContext glContext);
/**
- * Retrieves this DrawContext
s javax.media.opengl.GLContext. If this method returns null,
+ * Retrieves this DrawContext
s com.jogamp.opengl.GLContext. If this method returns null,
* then there are potentially no active GLContext
s and rendering should be aborted.
*
- * @return this DrawContext
s javax.media.opengl.GLContext.
+ * @return this DrawContext
s com.jogamp.opengl.GLContext.
*
* @since 1.5
*/
GLContext getGLContext();
/**
- * Retrieves the current javax.media.opengl.GL
. A GL
or GLU
is required for
+ * Retrieves the current com.jogamp.opengl.GL
. A GL
or GLU
is required for
* all graphical rendering in World Wind.
*
* @return the current GL
if available, null otherwise
@@ -61,7 +61,7 @@ public interface DrawContext extends WWObject, Disposable
GL getGL();
/**
- * Retrieves the current javax.media.opengl.glu.GLU
. A GLU
or GL
is required
+ * Retrieves the current com.jogamp.opengl.glu.GLU
. A GLU
or GL
is required
* for all graphical rendering in World Wind.
*
* @return the current GLU
if available, null otherwise
@@ -71,7 +71,7 @@ public interface DrawContext extends WWObject, Disposable
GLU getGLU();
/**
- * Retrieves the current javax.media.opengl.GLDrawable
. A GLDrawable
can be used to create
+ * Retrieves the current com.jogamp.opengl.GLDrawable
. A GLDrawable
can be used to create
* a GLContext
, which can then be used for rendering.
*
* @return the current GLDrawable
, null if none available
@@ -126,7 +126,7 @@ public interface DrawContext extends WWObject, Disposable
* Initializes this DrawContext
. This method should be called at the beginning of each frame to prepare
* the DrawContext
for the coming render pass.
*
- * @param glContext the javax.media.opengl.GLContext
to use for this render pass
+ * @param glContext the com.jogamp.opengl.GLContext
to use for this render pass
*
* @since 1.5
*/
diff --git a/src/gov/nasa/worldwind/render/DrawContextImpl.java b/src/gov/nasa/worldwind/render/DrawContextImpl.java
index 1c86260d3b..6a85e22e6f 100644
--- a/src/gov/nasa/worldwind/render/DrawContextImpl.java
+++ b/src/gov/nasa/worldwind/render/DrawContextImpl.java
@@ -16,9 +16,9 @@
import gov.nasa.worldwind.terrain.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.gl2.GLUgl2;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.gl2.GLUgl2;
import java.awt.*;
import java.nio.*;
import java.util.*;
@@ -147,7 +147,7 @@ public int compare(OrderedRenderableEntry orA, OrderedRenderableEntry orB)
/**
* Free internal resources held by this draw context. A GL context must be current when this method is called.
*
- * @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 dispose()
{
diff --git a/src/gov/nasa/worldwind/render/Ellipsoid.java b/src/gov/nasa/worldwind/render/Ellipsoid.java
index 00fcdbafdc..d77874fbf8 100644
--- a/src/gov/nasa/worldwind/render/Ellipsoid.java
+++ b/src/gov/nasa/worldwind/render/Ellipsoid.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.stream.*;
import java.io.IOException;
import java.nio.*;
diff --git a/src/gov/nasa/worldwind/render/ExtrudedPolygon.java b/src/gov/nasa/worldwind/render/ExtrudedPolygon.java
index c2aa833bc3..523ccfb534 100644
--- a/src/gov/nasa/worldwind/render/ExtrudedPolygon.java
+++ b/src/gov/nasa/worldwind/render/ExtrudedPolygon.java
@@ -18,8 +18,8 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.GLU;
import javax.xml.stream.*;
import java.io.*;
import java.nio.*;
diff --git a/src/gov/nasa/worldwind/render/FBOTexture.java b/src/gov/nasa/worldwind/render/FBOTexture.java
index ab5eff1a13..8c1b4bea96 100644
--- a/src/gov/nasa/worldwind/render/FBOTexture.java
+++ b/src/gov/nasa/worldwind/render/FBOTexture.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.geom.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.util.List;
/**
diff --git a/src/gov/nasa/worldwind/render/FrameFactory.java b/src/gov/nasa/worldwind/render/FrameFactory.java
index f26c493a7a..5c7b00e34b 100644
--- a/src/gov/nasa/worldwind/render/FrameFactory.java
+++ b/src/gov/nasa/worldwind/render/FrameFactory.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.avlist.AVKey;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.DoubleBuffer;
diff --git a/src/gov/nasa/worldwind/render/FramebufferTexture.java b/src/gov/nasa/worldwind/render/FramebufferTexture.java
index 8b09700c36..e3b16b9c02 100644
--- a/src/gov/nasa/worldwind/render/FramebufferTexture.java
+++ b/src/gov/nasa/worldwind/render/FramebufferTexture.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.geom.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.List;
/**
diff --git a/src/gov/nasa/worldwind/render/GLRuntimeCapabilities.java b/src/gov/nasa/worldwind/render/GLRuntimeCapabilities.java
index 70ac565531..03001100a7 100644
--- a/src/gov/nasa/worldwind/render/GLRuntimeCapabilities.java
+++ b/src/gov/nasa/worldwind/render/GLRuntimeCapabilities.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.avlist.AVKey;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* GLRuntimeCapabilities describes the GL capabilities supported by the current GL runtime. It provides the caller with
@@ -19,13 +19,13 @@
* For each GL feature, there are three key pieces of information available through GLRuntimeCapabilities: is[Feature]Available
defines whether or not the feature is supported by the current GL runtime.
* This is an attribute of the GL runtime, and is typically configured automatically by a call to {@link
- * #initialize(javax.media.opengl.GLContext)}.is[Feature]Enabled
defines whether or
+ * #initialize(com.jogamp.opengl.GLContext)}.is[Feature]Enabled
defines whether or
* not this feature should be used, and must be configured by the caller. isUse[Feature]()
. This returns whether or not the feature is available and is enabled for use (it is
* simply a conjunction of the "available" and "enabled" properties).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
@@ -386,7 +386,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 {
beginRendering(width, height, true);
diff --git a/src/gov/nasa/worldwind/render/ToolTipRenderer.java b/src/gov/nasa/worldwind/render/ToolTipRenderer.java
index a1ab808859..cac626cbe4 100644
--- a/src/gov/nasa/worldwind/render/ToolTipRenderer.java
+++ b/src/gov/nasa/worldwind/render/ToolTipRenderer.java
@@ -7,7 +7,7 @@
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import javax.swing.border.*;
import java.awt.*;
diff --git a/src/gov/nasa/worldwind/render/TrackRenderer.java b/src/gov/nasa/worldwind/render/TrackRenderer.java
index bd0eab895d..d0737ae66d 100644
--- a/src/gov/nasa/worldwind/render/TrackRenderer.java
+++ b/src/gov/nasa/worldwind/render/TrackRenderer.java
@@ -14,9 +14,9 @@
import gov.nasa.worldwind.tracks.TrackPoint;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.GLUgl2;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
+import com.jogamp.opengl.glu.gl2.GLUgl2;
import java.util.Iterator;
/**
diff --git a/src/gov/nasa/worldwind/render/Wedge.java b/src/gov/nasa/worldwind/render/Wedge.java
index e7f0bce689..e051a4fd34 100644
--- a/src/gov/nasa/worldwind/render/Wedge.java
+++ b/src/gov/nasa/worldwind/render/Wedge.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.stream.*;
import java.io.IOException;
import java.nio.*;
diff --git a/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.java b/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.java
index 0c4eac44e6..a133d5c5e9 100644
--- a/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.java
+++ b/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.Buffer;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/render/airspaces/AirspaceAttributes.java b/src/gov/nasa/worldwind/render/airspaces/AirspaceAttributes.java
index 403a346623..467ac89eee 100644
--- a/src/gov/nasa/worldwind/render/airspaces/AirspaceAttributes.java
+++ b/src/gov/nasa/worldwind/render/airspaces/AirspaceAttributes.java
@@ -71,7 +71,7 @@ public interface AirspaceAttributes extends ShapeAttributes
* @param enableMaterial true to set OpenGL material state, false to set OpenGL color state.
*
* @throws IllegalArgumentException if the drawing context is null.
- * @deprecated Use {@link Material#apply(javax.media.opengl.GL2, int)} or make OpenGL state changes directly.
+ * @deprecated Use {@link Material#apply(com.jogamp.opengl.GL2, int)} or make OpenGL state changes directly.
*/
void applyInterior(DrawContext dc, boolean enableMaterial);
@@ -84,7 +84,7 @@ public interface AirspaceAttributes extends ShapeAttributes
* @param enableMaterial true to set OpenGL material state, false to set OpenGL color state.
*
* @throws IllegalArgumentException if the drawing context is null.
- * @deprecated Use {@link Material#apply(javax.media.opengl.GL2, int)} or make OpenGL state changes directly.
+ * @deprecated Use {@link Material#apply(com.jogamp.opengl.GL2, int)} or make OpenGL state changes directly.
*/
void applyOutline(DrawContext dc, boolean enableMaterial);
}
diff --git a/src/gov/nasa/worldwind/render/airspaces/BasicAirspaceAttributes.java b/src/gov/nasa/worldwind/render/airspaces/BasicAirspaceAttributes.java
index 196158b406..b06612ea4c 100644
--- a/src/gov/nasa/worldwind/render/airspaces/BasicAirspaceAttributes.java
+++ b/src/gov/nasa/worldwind/render/airspaces/BasicAirspaceAttributes.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* Basic implementation of the {@link gov.nasa.worldwind.render.airspaces.AirspaceAttributes} interface.
@@ -180,7 +180,7 @@ public void setOpacity(double opacity)
/**
* {@inheritDoc}
*
- * @deprecated Use {@link Material#apply(javax.media.opengl.GL2, int)} or make OpenGL state changes directly.
+ * @deprecated Use {@link Material#apply(com.jogamp.opengl.GL2, int)} or make OpenGL state changes directly.
*/
public void applyInterior(DrawContext dc, boolean enableMaterial)
{
@@ -197,7 +197,7 @@ public void applyInterior(DrawContext dc, boolean enableMaterial)
/**
* {@inheritDoc}
*
- * @deprecated Use {@link Material#apply(javax.media.opengl.GL2, int)} or make OpenGL state changes directly.
+ * @deprecated Use {@link Material#apply(com.jogamp.opengl.GL2, int)} or make OpenGL state changes directly.
*/
public void applyOutline(DrawContext dc, boolean enableMaterial)
{
diff --git a/src/gov/nasa/worldwind/render/airspaces/Box.java b/src/gov/nasa/worldwind/render/airspaces/Box.java
index 9a07a97d9a..f0b61a50d5 100644
--- a/src/gov/nasa/worldwind/render/airspaces/Box.java
+++ b/src/gov/nasa/worldwind/render/airspaces/Box.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/render/airspaces/CappedCylinder.java b/src/gov/nasa/worldwind/render/airspaces/CappedCylinder.java
index e54ea27e28..23f4d17c7a 100644
--- a/src/gov/nasa/worldwind/render/airspaces/CappedCylinder.java
+++ b/src/gov/nasa/worldwind/render/airspaces/CappedCylinder.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/CappedEllipticalCylinder.java b/src/gov/nasa/worldwind/render/airspaces/CappedEllipticalCylinder.java
index f76d29743e..ac67013f67 100644
--- a/src/gov/nasa/worldwind/render/airspaces/CappedEllipticalCylinder.java
+++ b/src/gov/nasa/worldwind/render/airspaces/CappedEllipticalCylinder.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/Curtain.java b/src/gov/nasa/worldwind/render/airspaces/Curtain.java
index 780b8dfbd5..5c3d41cfd2 100644
--- a/src/gov/nasa/worldwind/render/airspaces/Curtain.java
+++ b/src/gov/nasa/worldwind/render/airspaces/Curtain.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/Geometry.java b/src/gov/nasa/worldwind/render/airspaces/Geometry.java
index c3bf998796..0eb5eeb5e2 100644
--- a/src/gov/nasa/worldwind/render/airspaces/Geometry.java
+++ b/src/gov/nasa/worldwind/render/airspaces/Geometry.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.cache.Cacheable;
import gov.nasa.worldwind.globes.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.nio.*;
import java.util.Arrays;
diff --git a/src/gov/nasa/worldwind/render/airspaces/Orbit.java b/src/gov/nasa/worldwind/render/airspaces/Orbit.java
index 9f8912773c..b553a718ae 100644
--- a/src/gov/nasa/worldwind/render/airspaces/Orbit.java
+++ b/src/gov/nasa/worldwind/render/airspaces/Orbit.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/PartialCappedCylinder.java b/src/gov/nasa/worldwind/render/airspaces/PartialCappedCylinder.java
index 11bd1a8dd5..6d555f5f4b 100644
--- a/src/gov/nasa/worldwind/render/airspaces/PartialCappedCylinder.java
+++ b/src/gov/nasa/worldwind/render/airspaces/PartialCappedCylinder.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/Polygon.java b/src/gov/nasa/worldwind/render/airspaces/Polygon.java
index 3ed597ed7f..fd419b7e9b 100644
--- a/src/gov/nasa/worldwind/render/airspaces/Polygon.java
+++ b/src/gov/nasa/worldwind/render/airspaces/Polygon.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/SphereAirspace.java b/src/gov/nasa/worldwind/render/airspaces/SphereAirspace.java
index 18769374e8..e106078a7b 100644
--- a/src/gov/nasa/worldwind/render/airspaces/SphereAirspace.java
+++ b/src/gov/nasa/worldwind/render/airspaces/SphereAirspace.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/render/airspaces/SurfaceBox.java b/src/gov/nasa/worldwind/render/airspaces/SurfaceBox.java
index 8eb1584e28..1b5e0408b4 100644
--- a/src/gov/nasa/worldwind/render/airspaces/SurfaceBox.java
+++ b/src/gov/nasa/worldwind/render/airspaces/SurfaceBox.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.util.*;
public class SurfaceBox extends AbstractSurfaceShape
diff --git a/src/gov/nasa/worldwind/render/airspaces/editor/BasicAirspaceControlPointRenderer.java b/src/gov/nasa/worldwind/render/airspaces/editor/BasicAirspaceControlPointRenderer.java
index a4c33c05cb..7c5a8bc028 100644
--- a/src/gov/nasa/worldwind/render/airspaces/editor/BasicAirspaceControlPointRenderer.java
+++ b/src/gov/nasa/worldwind/render/airspaces/editor/BasicAirspaceControlPointRenderer.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.render.markers.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/render/markers/BasicMarkerAttributes.java b/src/gov/nasa/worldwind/render/markers/BasicMarkerAttributes.java
index 9587fd99be..b56aa69ae6 100644
--- a/src/gov/nasa/worldwind/render/markers/BasicMarkerAttributes.java
+++ b/src/gov/nasa/worldwind/render/markers/BasicMarkerAttributes.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* @author tag
diff --git a/src/gov/nasa/worldwind/render/markers/BasicMarkerShape.java b/src/gov/nasa/worldwind/render/markers/BasicMarkerShape.java
index bafb7b4297..fb2e498ee8 100644
--- a/src/gov/nasa/worldwind/render/markers/BasicMarkerShape.java
+++ b/src/gov/nasa/worldwind/render/markers/BasicMarkerShape.java
@@ -13,9 +13,9 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.*;
-import javax.media.opengl.glu.gl2.GLUgl2;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.glu.*;
+import com.jogamp.opengl.glu.gl2.GLUgl2;
import java.util.ArrayList;
/**
diff --git a/src/gov/nasa/worldwind/render/markers/MarkerRenderer.java b/src/gov/nasa/worldwind/render/markers/MarkerRenderer.java
index 189f082dfe..641167b2d8 100644
--- a/src/gov/nasa/worldwind/render/markers/MarkerRenderer.java
+++ b/src/gov/nasa/worldwind/render/markers/MarkerRenderer.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.*;
import java.util.List;
diff --git a/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java b/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
index e0469ce4d1..6bec345e55 100644
--- a/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
+++ b/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
@@ -16,7 +16,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
import java.awt.image.*;
diff --git a/src/gov/nasa/worldwind/symbology/TacticalGraphicLabel.java b/src/gov/nasa/worldwind/symbology/TacticalGraphicLabel.java
index 2f5c14cacc..22e87d59e5 100644
--- a/src/gov/nasa/worldwind/symbology/TacticalGraphicLabel.java
+++ b/src/gov/nasa/worldwind/symbology/TacticalGraphicLabel.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
diff --git a/src/gov/nasa/worldwind/symbology/milstd2525/graphics/EchelonSymbol.java b/src/gov/nasa/worldwind/symbology/milstd2525/graphics/EchelonSymbol.java
index c20b184816..27c67ea275 100644
--- a/src/gov/nasa/worldwind/symbology/milstd2525/graphics/EchelonSymbol.java
+++ b/src/gov/nasa/worldwind/symbology/milstd2525/graphics/EchelonSymbol.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.symbology.milstd2525.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
diff --git a/src/gov/nasa/worldwind/terrain/RectangularTessellator.java b/src/gov/nasa/worldwind/terrain/RectangularTessellator.java
index f133ea1d4c..f25a1f93a7 100644
--- a/src/gov/nasa/worldwind/terrain/RectangularTessellator.java
+++ b/src/gov/nasa/worldwind/terrain/RectangularTessellator.java
@@ -16,7 +16,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/terrain/SectorGeometryList.java b/src/gov/nasa/worldwind/terrain/SectorGeometryList.java
index e994aea36b..6334c4366c 100644
--- a/src/gov/nasa/worldwind/terrain/SectorGeometryList.java
+++ b/src/gov/nasa/worldwind/terrain/SectorGeometryList.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.*;
import java.util.List;
diff --git a/src/gov/nasa/worldwind/util/BasicGLCapabilitiesChooser.java b/src/gov/nasa/worldwind/util/BasicGLCapabilitiesChooser.java
index 2bea633d47..497424a1bb 100644
--- a/src/gov/nasa/worldwind/util/BasicGLCapabilitiesChooser.java
+++ b/src/gov/nasa/worldwind/util/BasicGLCapabilitiesChooser.java
@@ -5,12 +5,12 @@
*/
package gov.nasa.worldwind.util;
-import javax.media.nativewindow.*;
-import javax.media.opengl.*;
+import com.jogamp.nativewindow.*;
+import com.jogamp.opengl.*;
import java.util.List;
/**
- * BasicGLCapabilitiesChooser provides an implementation of {@link javax.media.opengl.GLCapabilitiesChooser} for use
+ * BasicGLCapabilitiesChooser provides an implementation of {@link com.jogamp.opengl.GLCapabilitiesChooser} for use
* with WorldWindow implementations (for example, WorldWindowGLCanvas and WorldWindowGLJPanel).
*
* BasicGLCapabilitiesChooser extends the behavior of the default GLCapabilitiesChooser by implementing a fallback
diff --git a/src/gov/nasa/worldwind/util/BufferWrapper.java b/src/gov/nasa/worldwind/util/BufferWrapper.java
index 1210c26a20..13238e5832 100644
--- a/src/gov/nasa/worldwind/util/BufferWrapper.java
+++ b/src/gov/nasa/worldwind/util/BufferWrapper.java
@@ -8,7 +8,7 @@
import gov.nasa.worldwind.avlist.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.nio.*;
/**
diff --git a/src/gov/nasa/worldwind/util/ClippingTessellator.java b/src/gov/nasa/worldwind/util/ClippingTessellator.java
index 249e2c7d62..d4d006c7a9 100644
--- a/src/gov/nasa/worldwind/util/ClippingTessellator.java
+++ b/src/gov/nasa/worldwind/util/ClippingTessellator.java
@@ -7,7 +7,7 @@
import gov.nasa.worldwind.geom.Sector;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.glu.*;
// TODO: Consider replacing the clipping capability in PolygonTessellator2 with use of this independent component.
// TODO: Consider clipping contour coordinates to the sector bounds, rather than just reducing complexity.
diff --git a/src/gov/nasa/worldwind/util/ContourList.java b/src/gov/nasa/worldwind/util/ContourList.java
index fa92a1ca5e..0d4f62fc6f 100644
--- a/src/gov/nasa/worldwind/util/ContourList.java
+++ b/src/gov/nasa/worldwind/util/ContourList.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.geom.*;
import gov.nasa.worldwind.util.combine.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.glu.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/util/GLUTessellatorSupport.java b/src/gov/nasa/worldwind/util/GLUTessellatorSupport.java
index 0692ed45bd..30fe2b6e1a 100644
--- a/src/gov/nasa/worldwind/util/GLUTessellatorSupport.java
+++ b/src/gov/nasa/worldwind/util/GLUTessellatorSupport.java
@@ -7,13 +7,13 @@
import gov.nasa.worldwind.geom.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
import java.nio.IntBuffer;
import java.util.*;
/**
- * GLUTessellatorSupport is a utility class for configuring and using a {@link javax.media.opengl.glu.GLUtessellator} to
+ * GLUTessellatorSupport is a utility class for configuring and using a {@link com.jogamp.opengl.glu.GLUtessellator} to
* tessellate complex polygons into triangles.
*
* The standard pattern for using GLUTessellatorSupport to prepare a GLUtessellator is as follows:
@@ -36,8 +36,8 @@ public GLUTessellatorSupport()
}
/**
- * Returns this GLUTessellatorSupport's internal {@link javax.media.opengl.glu.GLUtessellator} instance. This
- * returns a valid GLUtessellator instance if called between {@link #beginTessellation(javax.media.opengl.glu.GLUtessellatorCallback,
+ * Returns this GLUTessellatorSupport's internal {@link com.jogamp.opengl.glu.GLUtessellator} instance. This
+ * returns a valid GLUtessellator instance if called between {@link #beginTessellation(com.jogamp.opengl.glu.GLUtessellatorCallback,
* gov.nasa.worldwind.geom.Vec4)} and {@link #endTessellation()}. This returns null if called from outside a
* beginTessellation/endTessellation block.
*
@@ -51,9 +51,9 @@ public GLUtessellator getGLUtessellator()
/**
* Prepares this GLUTessellatorSupport's internal GLU tessellator for use. This initializes the internal
- * GLUtessellator to a new instance by invoking {@link javax.media.opengl.glu.GLU#gluNewTess()}, and configures the
- * tessellator with the specified callback and normal with calls to {@link javax.media.opengl.glu.GLU#gluTessCallback(javax.media.opengl.glu.GLUtessellator,
- * int, javax.media.opengl.glu.GLUtessellatorCallback)} and {@link javax.media.opengl.glu.GLU#gluTessNormal(javax.media.opengl.glu.GLUtessellator,
+ * GLUtessellator to a new instance by invoking {@link com.jogamp.opengl.glu.GLU#gluNewTess()}, and configures the
+ * tessellator with the specified callback and normal with calls to {@link com.jogamp.opengl.glu.GLU#gluTessCallback(com.jogamp.opengl.glu.GLUtessellator,
+ * int, com.jogamp.opengl.glu.GLUtessellatorCallback)} and {@link com.jogamp.opengl.glu.GLU#gluTessNormal(com.jogamp.opengl.glu.GLUtessellator,
* double, double, double)}, respectively.
*
* @param callback the callback to configure the GLU tessellator with.
@@ -99,7 +99,7 @@ public void endTessellation()
}
/**
- * Creates a new {@link javax.media.opengl.glu.GLUtessellatorCallback} that draws tessellated polygons as OpenGL
+ * Creates a new {@link com.jogamp.opengl.glu.GLUtessellatorCallback} that draws tessellated polygons as OpenGL
* primitives by calling glBegin, glEnd, and glVertex.
*
* @param gl the GL context to draw into.
diff --git a/src/gov/nasa/worldwind/util/GeometryBuilder.java b/src/gov/nasa/worldwind/util/GeometryBuilder.java
index 88a94d68bd..43332311bc 100644
--- a/src/gov/nasa/worldwind/util/GeometryBuilder.java
+++ b/src/gov/nasa/worldwind/util/GeometryBuilder.java
@@ -10,8 +10,8 @@
import gov.nasa.worldwind.globes.Globe;
import gov.nasa.worldwind.terrain.Terrain;
-import javax.media.opengl.GL;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.glu.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/util/JOGLVersionInfo.java b/src/gov/nasa/worldwind/util/JOGLVersionInfo.java
index 24b7ad0e73..d6d44029c0 100644
--- a/src/gov/nasa/worldwind/util/JOGLVersionInfo.java
+++ b/src/gov/nasa/worldwind/util/JOGLVersionInfo.java
@@ -20,7 +20,7 @@ public class JOGLVersionInfo
private JOGLVersionInfo()
{
ClassLoader classLoader = getClass().getClassLoader();
- this.p = pkgInfo(classLoader, "javax.media.opengl", "GL");
+ this.p = pkgInfo(classLoader, "com.jogamp.opengl", "GL");
}
private static Package pkgInfo(ClassLoader classLoader, String pkgName, String className)
diff --git a/src/gov/nasa/worldwind/util/OGLRenderToTextureSupport.java b/src/gov/nasa/worldwind/util/OGLRenderToTextureSupport.java
index 6fce4dc127..fa83a74356 100644
--- a/src/gov/nasa/worldwind/util/OGLRenderToTextureSupport.java
+++ b/src/gov/nasa/worldwind/util/OGLRenderToTextureSupport.java
@@ -8,7 +8,7 @@
import com.jogamp.opengl.util.texture.Texture;
import gov.nasa.worldwind.render.DrawContext;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* OGLRenderToTextureSupport encapsulates the pattern of rendering GL commands to a destination texture. Currently only
diff --git a/src/gov/nasa/worldwind/util/OGLStackHandler.java b/src/gov/nasa/worldwind/util/OGLStackHandler.java
index 12585ea580..17ceed244b 100644
--- a/src/gov/nasa/worldwind/util/OGLStackHandler.java
+++ b/src/gov/nasa/worldwind/util/OGLStackHandler.java
@@ -5,7 +5,7 @@
*/
package gov.nasa.worldwind.util;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author tag
diff --git a/src/gov/nasa/worldwind/util/OGLUtil.java b/src/gov/nasa/worldwind/util/OGLUtil.java
index 0b7b1b190f..7848a4aa98 100644
--- a/src/gov/nasa/worldwind/util/OGLUtil.java
+++ b/src/gov/nasa/worldwind/util/OGLUtil.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.geom.Vec4;
import javax.imageio.ImageIO;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.image.*;
import java.io.*;
import java.net.URL;
diff --git a/src/gov/nasa/worldwind/util/PlacemarkClutterFilter.java b/src/gov/nasa/worldwind/util/PlacemarkClutterFilter.java
index d4d0af6573..07b01d9d1a 100644
--- a/src/gov/nasa/worldwind/util/PlacemarkClutterFilter.java
+++ b/src/gov/nasa/worldwind/util/PlacemarkClutterFilter.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.pick.*;
import gov.nasa.worldwind.render.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/util/PolygonTessellator2.java b/src/gov/nasa/worldwind/util/PolygonTessellator2.java
index 6dbf812a31..bf357173e1 100644
--- a/src/gov/nasa/worldwind/util/PolygonTessellator2.java
+++ b/src/gov/nasa/worldwind/util/PolygonTessellator2.java
@@ -6,7 +6,7 @@
package gov.nasa.worldwind.util;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.glu.*;
import java.nio.*;
/**
diff --git a/src/gov/nasa/worldwind/util/TextureAtlas.java b/src/gov/nasa/worldwind/util/TextureAtlas.java
index 8694f8e2f3..9d28f2f638 100644
--- a/src/gov/nasa/worldwind/util/TextureAtlas.java
+++ b/src/gov/nasa/worldwind/util/TextureAtlas.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.exception.WWRuntimeException;
import gov.nasa.worldwind.render.DrawContext;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.awt.*;
import java.awt.image.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/util/VecBuffer.java b/src/gov/nasa/worldwind/util/VecBuffer.java
index 11fe1032a6..673205e7a2 100644
--- a/src/gov/nasa/worldwind/util/VecBuffer.java
+++ b/src/gov/nasa/worldwind/util/VecBuffer.java
@@ -8,7 +8,7 @@
import gov.nasa.worldwind.geom.*;
import gov.nasa.worldwind.render.DrawContext;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.nio.Buffer;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/util/VecBufferSequence.java b/src/gov/nasa/worldwind/util/VecBufferSequence.java
index 2d4bb0ad6d..cfbab30e31 100644
--- a/src/gov/nasa/worldwind/util/VecBufferSequence.java
+++ b/src/gov/nasa/worldwind/util/VecBufferSequence.java
@@ -7,7 +7,7 @@
import gov.nasa.worldwind.render.DrawContext;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* VecBufferSequence provides storage and retrieval of a sequence of logical VecBuffers in a single VecBuffer that
diff --git a/src/gov/nasa/worldwind/util/WWMath.java b/src/gov/nasa/worldwind/util/WWMath.java
index 2fd97c71f4..3754e3ba9e 100644
--- a/src/gov/nasa/worldwind/util/WWMath.java
+++ b/src/gov/nasa/worldwind/util/WWMath.java
@@ -1257,9 +1257,9 @@ public static Intersection[] polytopeIntersect(Line line, Plane[] planes)
/**
* Computes an index buffer in the system native byte order that tessellates the interior of a vertex grid as a
* triangle strip. The returned buffer may be used as the source buffer
in a call to {@link
- * javax.media.opengl.GL2#glDrawElements(int, int, int, java.nio.Buffer)}, where mode
is {@link
- * javax.media.opengl.GL#GL_TRIANGLE_STRIP}, count
is the number of elements remaining in the buffer,
- * and type
is {@link javax.media.opengl.GL#GL_UNSIGNED_INT}.
+ * com.jogamp.opengl.GL2#glDrawElements(int, int, int, java.nio.Buffer)}, where mode
is {@link
+ * com.jogamp.opengl.GL#GL_TRIANGLE_STRIP}, count
is the number of elements remaining in the buffer,
+ * and type
is {@link com.jogamp.opengl.GL#GL_UNSIGNED_INT}.
*
* For details the drawing OpenGL primitives, see http://www.glprogramming.com/red/chapter02.html#name14.
*
@@ -1313,9 +1313,9 @@ public static IntBuffer computeIndicesForGridInterior(int width, int height)
/**
* Computes an index buffer in the system native byte order that tessellates the outline of a vertex grid as a line
* strip. The returned buffer may be used as the source buffer
in a call to {@link
- * javax.media.opengl.GL2#glDrawElements(int, int, int, java.nio.Buffer)}, where mode
is {@link
- * javax.media.opengl.GL#GL_LINE_STRIP}, count
is the number of elements remaining in the buffer, and
- * type
is {@link javax.media.opengl.GL#GL_UNSIGNED_INT}.
+ * com.jogamp.opengl.GL2#glDrawElements(int, int, int, java.nio.Buffer)}, where mode
is {@link
+ * com.jogamp.opengl.GL#GL_LINE_STRIP}, count
is the number of elements remaining in the buffer, and
+ * type
is {@link com.jogamp.opengl.GL#GL_UNSIGNED_INT}.
*
* For details the drawing OpenGL primitives, see http://www.glprogramming.com/red/chapter02.html#name14.
*
diff --git a/src/gov/nasa/worldwind/util/combine/CombineContext.java b/src/gov/nasa/worldwind/util/combine/CombineContext.java
index 9c55364d9e..7ee5c4f0aa 100644
--- a/src/gov/nasa/worldwind/util/combine/CombineContext.java
+++ b/src/gov/nasa/worldwind/util/combine/CombineContext.java
@@ -10,8 +10,8 @@
import gov.nasa.worldwind.globes.Globe;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.glu.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/util/combine/ShapeCombiner.java b/src/gov/nasa/worldwind/util/combine/ShapeCombiner.java
index 50f207c01e..e5a50667c4 100644
--- a/src/gov/nasa/worldwind/util/combine/ShapeCombiner.java
+++ b/src/gov/nasa/worldwind/util/combine/ShapeCombiner.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.globes.Globe;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.glu.*;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/util/tree/BasicTreeLayout.java b/src/gov/nasa/worldwind/util/tree/BasicTreeLayout.java
index 69cd49e9d2..a4a880d1f3 100644
--- a/src/gov/nasa/worldwind/util/tree/BasicTreeLayout.java
+++ b/src/gov/nasa/worldwind/util/tree/BasicTreeLayout.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
import java.beans.*;
diff --git a/src/gov/nasa/worldwind/util/tree/ScrollBar.java b/src/gov/nasa/worldwind/util/tree/ScrollBar.java
index 28b50a36f3..473bd4a093 100644
--- a/src/gov/nasa/worldwind/util/tree/ScrollBar.java
+++ b/src/gov/nasa/worldwind/util/tree/ScrollBar.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.event.*;
diff --git a/src/gov/nasa/worldwind/util/tree/ScrollFrame.java b/src/gov/nasa/worldwind/util/tree/ScrollFrame.java
index 09ee5b1a30..7d3209ba51 100644
--- a/src/gov/nasa/worldwind/util/tree/ScrollFrame.java
+++ b/src/gov/nasa/worldwind/util/tree/ScrollFrame.java
@@ -14,8 +14,8 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.GLU;
import java.awt.*;
import java.awt.event.*;
import java.awt.geom.*;
diff --git a/src/gov/nasa/worldwind/util/tree/TreeUtil.java b/src/gov/nasa/worldwind/util/tree/TreeUtil.java
index 16d57e3363..87b762e416 100644
--- a/src/gov/nasa/worldwind/util/tree/TreeUtil.java
+++ b/src/gov/nasa/worldwind/util/tree/TreeUtil.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwind/util/webview/WebViewTexture.java b/src/gov/nasa/worldwind/util/webview/WebViewTexture.java
index 38500bf039..d5fbaeebc8 100644
--- a/src/gov/nasa/worldwind/util/webview/WebViewTexture.java
+++ b/src/gov/nasa/worldwind/util/webview/WebViewTexture.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.logging.Level;
diff --git a/src/gov/nasa/worldwind/view/BasicView.java b/src/gov/nasa/worldwind/view/BasicView.java
index 8ff6cfcdd0..c63ba0957d 100644
--- a/src/gov/nasa/worldwind/view/BasicView.java
+++ b/src/gov/nasa/worldwind/view/BasicView.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* A base class from which {@link View} implementations can be derived. Currently {@link
diff --git a/src/gov/nasa/worldwind/view/ViewUtil.java b/src/gov/nasa/worldwind/view/ViewUtil.java
index 1a8a1ba5b5..e98c38193e 100644
--- a/src/gov/nasa/worldwind/view/ViewUtil.java
+++ b/src/gov/nasa/worldwind/view/ViewUtil.java
@@ -12,8 +12,8 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.gl2.GLUgl2;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.gl2.GLUgl2;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwind/view/firstperson/BasicFlyView.java b/src/gov/nasa/worldwind/view/firstperson/BasicFlyView.java
index 66915416c4..82b2294753 100644
--- a/src/gov/nasa/worldwind/view/firstperson/BasicFlyView.java
+++ b/src/gov/nasa/worldwind/view/firstperson/BasicFlyView.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.util.Logging;
import gov.nasa.worldwind.view.*;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
/**
* This is a basic view that implements a yaw-pitch-roll model that can be applied to first-person style view
diff --git a/src/gov/nasa/worldwind/view/orbit/BasicOrbitView.java b/src/gov/nasa/worldwind/view/orbit/BasicOrbitView.java
index 75f98bb823..4f674fc711 100644
--- a/src/gov/nasa/worldwind/view/orbit/BasicOrbitView.java
+++ b/src/gov/nasa/worldwind/view/orbit/BasicOrbitView.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.view.BasicView;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwindx/applications/antenna/AntennaAxes.java b/src/gov/nasa/worldwindx/applications/antenna/AntennaAxes.java
index d47fab7660..2b5258b689 100644
--- a/src/gov/nasa/worldwindx/applications/antenna/AntennaAxes.java
+++ b/src/gov/nasa/worldwindx/applications/antenna/AntennaAxes.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.stream.*;
import java.awt.*;
import java.io.IOException;
diff --git a/src/gov/nasa/worldwindx/applications/antenna/AntennaModel.java b/src/gov/nasa/worldwindx/applications/antenna/AntennaModel.java
index 5e1f881929..ab4efce223 100644
--- a/src/gov/nasa/worldwindx/applications/antenna/AntennaModel.java
+++ b/src/gov/nasa/worldwindx/applications/antenna/AntennaModel.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.stream.*;
import java.awt.*;
import java.awt.image.*;
diff --git a/src/gov/nasa/worldwindx/applications/sar/ElevationPlane.java b/src/gov/nasa/worldwindx/applications/sar/ElevationPlane.java
index bdb0b958ac..60e94f0a81 100644
--- a/src/gov/nasa/worldwindx/applications/sar/ElevationPlane.java
+++ b/src/gov/nasa/worldwindx/applications/sar/ElevationPlane.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.render.airspaces.Polygon;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.util.List;
/**
diff --git a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
index d87a76c875..010a5d5a23 100644
--- a/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
+++ b/src/gov/nasa/worldwindx/applications/sar/render/PlaneModel.java
@@ -199,7 +199,7 @@ private void renderPlane(DrawContext dc)
gl.glMatrixMode(GL.GL_MODELVIEW);
gl.glPushMatrix();
- gl.glDisable(javax.media.opengl.GL.GL_TEXTURE_2D);
+ gl.glDisable(com.jogamp.opengl.GL.GL_TEXTURE_2D);
gl.glColor3d(this.color.getRed() / 255d, this.color.getGreen() / 255d, this.color.getBlue() / 255d);
// Placement and orientation
diff --git a/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java b/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java
index 4355bd8ce4..ec7d45bd1b 100644
--- a/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java
+++ b/src/gov/nasa/worldwindx/applications/sar/render/ScreenElevationLine.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java b/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java
index 6374e37eb0..6649455c3f 100644
--- a/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java
+++ b/src/gov/nasa/worldwindx/applications/sar/render/TrackSegmentInfo.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwindx.applications.sar.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java
index a01a9f8648..61c49fe0bf 100644
--- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java
+++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneAttributes.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java
index 5d4cb42675..afd736514c 100644
--- a/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java
+++ b/src/gov/nasa/worldwindx/applications/sar/segmentplane/SegmentPlaneRenderer.java
@@ -17,7 +17,7 @@
import gov.nasa.worldwind.terrain.SectorGeometryList;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/examples/Annotations.java b/src/gov/nasa/worldwindx/examples/Annotations.java
index ee6dba785c..73e5a6498a 100644
--- a/src/gov/nasa/worldwindx/examples/Annotations.java
+++ b/src/gov/nasa/worldwindx/examples/Annotations.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwindx.examples.util.PowerOfTwoPaddedImage;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import javax.swing.Box;
import javax.swing.border.*;
diff --git a/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java b/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java
index e5f4244429..4d12d7287e 100644
--- a/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java
+++ b/src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.GLRuntimeCapabilities;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
/**
* Illustrates how to specify the OpenGL features World Wind uses by configuring a {@link
@@ -46,7 +46,7 @@ public class ConfiguringGLRuntimeCapabilities extends ApplicationTemplate
/**
* Subclass of {@link gov.nasa.worldwind.WorldWindowGLAutoDrawable} which overrides the method {@link
- * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(javax.media.opengl.GLAutoDrawable)} to configure the OpenGL
+ * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(com.jogamp.opengl.GLAutoDrawable)} to configure the OpenGL
* features used by the World Wind SDK.
*/
public static class MyGLAutoDrawable extends WorldWindowGLAutoDrawable
@@ -58,7 +58,7 @@ public MyGLAutoDrawable()
/**
* Overridden to configure the OpenGL features used by the World Wind SDK. See {@link
- * javax.media.opengl.GLEventListener#init(GLAutoDrawable)}.
+ * com.jogamp.opengl.GLEventListener#init(GLAutoDrawable)}.
*
* @param glAutoDrawable the drawable
*/
diff --git a/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java b/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java
index 52cbb1f27c..9e42b4aa20 100644
--- a/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java
+++ b/src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java
@@ -8,11 +8,11 @@
import gov.nasa.worldwind.*;
import gov.nasa.worldwind.avlist.AVKey;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* Illustrates how to capture OpenGL errors into the log during development. By defining a custom {@link
- * gov.nasa.worldwind.WorldWindowGLDrawable}
and installing JOGL's {@link javax.media.opengl.DebugGL2},
+ * gov.nasa.worldwind.WorldWindowGLDrawable}
and installing JOGL's {@link com.jogamp.opengl.DebugGL2},
* applications can receive log error messages when an OpenGL error occurs. This technique is intended for use during
* application development, and should not be used in a deployed application.
*
@@ -44,7 +44,7 @@ public class DebuggingGLErrors extends ApplicationTemplate
/**
* Subclass of {@link gov.nasa.worldwind.WorldWindowGLAutoDrawable} which overrides the method {@link
- * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(javax.media.opengl.GLAutoDrawable)} to configure the OpenGL
+ * gov.nasa.worldwind.WorldWindowGLAutoDrawable#init(com.jogamp.opengl.GLAutoDrawable)} to configure the OpenGL
* error logger.
*/
public static class MyGLAutoDrawable extends WorldWindowGLAutoDrawable
@@ -56,7 +56,7 @@ public MyGLAutoDrawable()
/**
* Overridden to configure the OpenGL features used by the World Wind SDK. See {@link
- * javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable)}.
+ * com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable)}.
*
* @param glAutoDrawable the drawable
*/
diff --git a/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java b/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java
index 604756bcc5..0959bf703f 100644
--- a/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java
+++ b/src/gov/nasa/worldwindx/examples/FlatWorldEarthquakes.java
@@ -16,7 +16,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.view.orbit.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import javax.swing.border.*;
import java.awt.*;
diff --git a/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java b/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java
index 9234c63833..d306c58a85 100644
--- a/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java
+++ b/src/gov/nasa/worldwindx/examples/OpenGLSupportTest.java
@@ -6,8 +6,8 @@
package gov.nasa.worldwindx.examples;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
/**
* Determines whether a device supports the OpenGL features necessary for World Wind.
diff --git a/src/gov/nasa/worldwindx/examples/PickFrustum.java b/src/gov/nasa/worldwindx/examples/PickFrustum.java
index b876929887..8681782cea 100644
--- a/src/gov/nasa/worldwindx/examples/PickFrustum.java
+++ b/src/gov/nasa/worldwindx/examples/PickFrustum.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.layers.*;
import gov.nasa.worldwind.render.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
diff --git a/src/gov/nasa/worldwindx/examples/RadarVolume.java b/src/gov/nasa/worldwindx/examples/RadarVolume.java
index 5df2a48545..49abc19ae5 100644
--- a/src/gov/nasa/worldwindx/examples/RadarVolume.java
+++ b/src/gov/nasa/worldwindx/examples/RadarVolume.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.stream.*;
import java.io.IOException;
import java.nio.*;
diff --git a/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java b/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
index d90270a615..d3750b4780 100644
--- a/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
+++ b/src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
@@ -7,8 +7,8 @@
import gov.nasa.worldwind.Configuration;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
@@ -117,7 +117,7 @@ public void init(GLAutoDrawable glAutoDrawable)
}
sb.append("\nJOGL Values\n");
- String pkgName = "javax.media.opengl";
+ String pkgName = "com.jogamp.opengl";
try
{
getClass().getClassLoader().loadClass(pkgName + ".GL");
diff --git a/src/gov/nasa/worldwindx/examples/analytics/AnalyticSurface.java b/src/gov/nasa/worldwindx/examples/analytics/AnalyticSurface.java
index a5cfca2fd9..02ab38718e 100644
--- a/src/gov/nasa/worldwindx/examples/analytics/AnalyticSurface.java
+++ b/src/gov/nasa/worldwindx/examples/analytics/AnalyticSurface.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/examples/lineofsight/PointGrid.java b/src/gov/nasa/worldwindx/examples/lineofsight/PointGrid.java
index a79c616f55..06de494b27 100644
--- a/src/gov/nasa/worldwindx/examples/lineofsight/PointGrid.java
+++ b/src/gov/nasa/worldwindx/examples/lineofsight/PointGrid.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.nio.FloatBuffer;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/examples/tutorial/Cube.java b/src/gov/nasa/worldwindx/examples/tutorial/Cube.java
index 5c040346a5..53e462ba2b 100644
--- a/src/gov/nasa/worldwindx/examples/tutorial/Cube.java
+++ b/src/gov/nasa/worldwindx/examples/tutorial/Cube.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.util.OGLUtil;
import gov.nasa.worldwindx.examples.ApplicationTemplate;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwindx/examples/util/ButtonAnnotation.java b/src/gov/nasa/worldwindx/examples/util/ButtonAnnotation.java
index 32258a67fa..2ef53b13df 100644
--- a/src/gov/nasa/worldwindx/examples/util/ButtonAnnotation.java
+++ b/src/gov/nasa/worldwindx/examples/util/ButtonAnnotation.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwindx/examples/util/DialogAnnotation.java b/src/gov/nasa/worldwindx/examples/util/DialogAnnotation.java
index aa15ddde6e..95fb88c18f 100644
--- a/src/gov/nasa/worldwindx/examples/util/DialogAnnotation.java
+++ b/src/gov/nasa/worldwindx/examples/util/DialogAnnotation.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwindx/examples/util/DirectedPath.java b/src/gov/nasa/worldwindx/examples/util/DirectedPath.java
index 6a3bf8e45d..a237c639bb 100644
--- a/src/gov/nasa/worldwindx/examples/util/DirectedPath.java
+++ b/src/gov/nasa/worldwindx/examples/util/DirectedPath.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.terrain.Terrain;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.nio.*;
import java.util.List;
diff --git a/src/gov/nasa/worldwindx/examples/util/DirectedSurfacePolyline.java b/src/gov/nasa/worldwindx/examples/util/DirectedSurfacePolyline.java
index 151a119678..d0ee64e05a 100644
--- a/src/gov/nasa/worldwindx/examples/util/DirectedSurfacePolyline.java
+++ b/src/gov/nasa/worldwindx/examples/util/DirectedSurfacePolyline.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.nio.FloatBuffer;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/examples/util/ImageAnnotation.java b/src/gov/nasa/worldwindx/examples/util/ImageAnnotation.java
index 0749a5c794..ab20dd8fde 100644
--- a/src/gov/nasa/worldwindx/examples/util/ImageAnnotation.java
+++ b/src/gov/nasa/worldwindx/examples/util/ImageAnnotation.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.geom.Position;
import gov.nasa.worldwind.render.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwindx/examples/util/ProgressAnnotation.java b/src/gov/nasa/worldwindx/examples/util/ProgressAnnotation.java
index 6249b33b0f..828102f794 100644
--- a/src/gov/nasa/worldwindx/examples/util/ProgressAnnotation.java
+++ b/src/gov/nasa/worldwindx/examples/util/ProgressAnnotation.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwindx/examples/util/ScreenSelector.java b/src/gov/nasa/worldwindx/examples/util/ScreenSelector.java
index af93c571da..98d42589df 100644
--- a/src/gov/nasa/worldwindx/examples/util/ScreenSelector.java
+++ b/src/gov/nasa/worldwindx/examples/util/ScreenSelector.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwindx.applications.worldwindow.util.Util;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwindx/examples/util/ScreenShotAction.java b/src/gov/nasa/worldwindx/examples/util/ScreenShotAction.java
index 7baba71762..47bb05d03a 100644
--- a/src/gov/nasa/worldwindx/examples/util/ScreenShotAction.java
+++ b/src/gov/nasa/worldwindx/examples/util/ScreenShotAction.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.util.WWIO;
import javax.imageio.ImageIO;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
diff --git a/src/gov/nasa/worldwindx/examples/util/StatusLayer.java b/src/gov/nasa/worldwindx/examples/util/StatusLayer.java
index c621c0272a..6882b52808 100644
--- a/src/gov/nasa/worldwindx/examples/util/StatusLayer.java
+++ b/src/gov/nasa/worldwindx/examples/util/StatusLayer.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
diff --git a/src/gov/nasa/worldwindx/examples/util/ViewVolumeRenderer.java b/src/gov/nasa/worldwindx/examples/util/ViewVolumeRenderer.java
index 05851acbaf..e25cbeb9f4 100644
--- a/src/gov/nasa/worldwindx/examples/util/ViewVolumeRenderer.java
+++ b/src/gov/nasa/worldwindx/examples/util/ViewVolumeRenderer.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/test/gov/nasa/worldwind/util/OGLUtilTest.java b/test/gov/nasa/worldwind/util/OGLUtilTest.java
index 466e7aed8f..ebdfbf7ef7 100644
--- a/test/gov/nasa/worldwind/util/OGLUtilTest.java
+++ b/test/gov/nasa/worldwind/util/OGLUtilTest.java
@@ -11,7 +11,7 @@
import junit.framework.TestCase;
import org.junit.Test;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.io.*;
import java.net.URL;
From e6794ae4e605a216fcf7cd83cd748a0e101e0553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xerxes=20R=C3=A5nby?=
Date: Thu, 14 Jan 2016 12:18:24 +0100
Subject: [PATCH 2/3] Fix JogAmp JOGL 2.x.x -> 2.3.2 API changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Xerxes RÄnby
---
src/gov/nasa/worldwind/render/DrawContextImpl.java | 4 ++--
src/gov/nasa/worldwind/render/TextRenderer.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/gov/nasa/worldwind/render/DrawContextImpl.java b/src/gov/nasa/worldwind/render/DrawContextImpl.java
index 6a85e22e6f..410b0b94cb 100644
--- a/src/gov/nasa/worldwind/render/DrawContextImpl.java
+++ b/src/gov/nasa/worldwind/render/DrawContextImpl.java
@@ -171,12 +171,12 @@ public final GLContext getGLContext()
public final int getDrawableHeight()
{
- return this.getGLDrawable().getHeight();
+ return this.getGLDrawable().getSurfaceHeight();
}
public final int getDrawableWidth()
{
- return this.getGLDrawable().getWidth();
+ return this.getGLDrawable().getSurfaceWidth();
}
public final GLDrawable getGLDrawable()
diff --git a/src/gov/nasa/worldwind/render/TextRenderer.java b/src/gov/nasa/worldwind/render/TextRenderer.java
index 53c0e2fcd8..8ecea9b471 100644
--- a/src/gov/nasa/worldwind/render/TextRenderer.java
+++ b/src/gov/nasa/worldwind/render/TextRenderer.java
@@ -1951,7 +1951,6 @@ public void run() {
@Override
public void dispose(GLAutoDrawable drawable) {
- glu.destroy();
glu=null;
frame=null;
}
From 52e2ae37d8250069dd227aeea4fcfc3ee53acb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xerxes=20R=C3=A5nby?=
Date: Thu, 14 Jan 2016 12:20:24 +0100
Subject: [PATCH 3/3] Import JogAmp JOGL 2.3.2 jars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Imported using:
wget http://jogamp.org/deployment/v2.3.2/archive/jogamp-all-platforms.7z
7z x jogamp-all-platforms.7z
cp jogamp-all-platforms/jar/gluegen-rt.jar .
cp jogamp-all-platforms/jar/gluegen-rt-natives-*.jar .
cp jogamp-all-platforms/jar/jogl-all.jar .
cp jogamp-all-platforms/jar/jogl-all-natives-*.jar .
Signed-off-by: Xerxes RÄnby
---
gluegen-rt-natives-linux-amd64.jar | Bin 4045 -> 4149 bytes
gluegen-rt-natives-linux-i586.jar | Bin 4078 -> 4130 bytes
gluegen-rt-natives-macosx-universal.jar | Bin 4873 -> 5076 bytes
gluegen-rt-natives-windows-amd64.jar | Bin 7928 -> 8159 bytes
gluegen-rt-natives-windows-i586.jar | Bin 7353 -> 7577 bytes
gluegen-rt.jar | Bin 289164 -> 345605 bytes
jogl-all-natives-linux-amd64.jar | Bin 202008 -> 224010 bytes
jogl-all-natives-linux-i586.jar | Bin 201020 -> 217274 bytes
jogl-all-natives-macosx-universal.jar | Bin 406088 -> 443876 bytes
jogl-all-natives-windows-amd64.jar | Bin 216701 -> 240721 bytes
jogl-all-natives-windows-i586.jar | Bin 187365 -> 209445 bytes
jogl-all.jar | Bin 3082059 -> 3414448 bytes
12 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/gluegen-rt-natives-linux-amd64.jar b/gluegen-rt-natives-linux-amd64.jar
index 21d73175ae98a9587556690c8ff5547884cc3bee..a2466f418a12a7f57b52b0a7dc8e5bd2304ec33d 100644
GIT binary patch
literal 4149
zcmb7{cTf}Fvd2RUT@>k{NJ|8yNv|NI+_~BCgS>A(!qc-HVF+4=L(ec!Ku
zFgK;JCyyWG%qU&;B5IV|nkH^}8$G^-uem;5TFaf=DMF8ENj|AqfArTC=wKYir2F-xuJo{q
z`aZ?W%qKtTXus!{p*ZDNz8SY>7K4|sZn?r5JQI&!cYA3C8ijC{5PjgzxjQ(?7
zKQ7lr;drww{&GzjmnL>;FWq6bt{xI@wmwd92OnFQ#B+C7S9doF7biDge+gSxdpQ{i
z6R4K>a~E50Z)Lpugc=YC6ab2g108{IIPeM_XrKv{%j|3JV^-D#Ix_Z4Y698T2=7g9
z0@;9Onm~LR;jnX>oY>r%+*duC-04GHCQMHgRESx9&BJuW&S@6u>%^;Cewx70vd(IC
zVpeCfPY|h~Y;>6!_y7pX6}#0=^Y-3Sh#+?&m}XU4^6N`in9VeeSvvsmKZQk=YhWE2
z0DxQ&03diN>~BThe+v=&TZoI39n8ho0p{Q)=H(;q?T-G7(THd4MsSyW1i&mMF`?r_
zlEOfbcQrm)FNzlrDcjbsIR^W$V7i9PW&!c8Q~I>(wNX1?ddaA$a)jt^3+9r@i|
z=p*4nfjLUBmRlVK9ffgpm~c4e`qEhiBn~dwF~VU-+ERrj_V6-vfy
zLukS-Sm+b+o_7D4CeEm<8E<$Pbh}#!x&Jlb_v}(`^OnsJ(hd
z?wh{4U8-k(XOzi4sku)E*K)ctQK_BZG-=L+PgqC^_xN4JGJnQp8IA!yd1{9ORtR}y
z>w0Y~1T5xnx6Nhx&9o<2sckgE592opK|+K0z%1fXi7C>pZOa2UKV!l6>|&EUJU@GE
z;<%Nx*e$SnJ}jZl|KgjvYudxRI>82a+{4BG6peRy
zt@N6$msLLO2u^*t+r`#pC>Y-gHc(k}O_>lyW39Q~wI!tob)^wYMoD+PdU;Y>$xpp$
zS71rM8>`OJgfh>bJ^8uW7DZT7xY!W}k#5AdF>bZQm k_OlDd=aRsR5Dh0#u*BJ9
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
literal 4045
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
CFP<&{
diff --git a/gluegen-rt-natives-linux-i586.jar b/gluegen-rt-natives-linux-i586.jar
index d8582aa3820cc262ba11acf67dbfa058ee4bf0bf..914a259d0d2d1877ba95069e74501401f8154e45 100644
GIT binary patch
literal 4130
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
literal 4078
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
diff --git a/gluegen-rt-natives-macosx-universal.jar b/gluegen-rt-natives-macosx-universal.jar
index f8ffce36471d7a9c0d6aba5ba255105c68e144cf..15df5e8200e9eaa9e48217f0131ce31e85dad4c4 100644
GIT binary patch
literal 5076
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
byrxtC4Rk!!BPIL8MSNXQ*R>SGAHDwp7AtZ?
diff --git a/gluegen-rt-natives-windows-amd64.jar b/gluegen-rt-natives-windows-amd64.jar
index d13485ec0d36ab1094d09367448771aef6365136..517fb84c747408545f3c34ee7d93657f0351d58d 100644
GIT binary patch
literal 8159
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
literal 7928
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
diff --git a/gluegen-rt-natives-windows-i586.jar b/gluegen-rt-natives-windows-i586.jar
index f1a04cbb4d871b8fd4924045a5ff73582b6418c9..1c393b784662e79e1b5470b34e6a1c20b2d10eb4 100644
GIT binary patch
literal 7577
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