-# WorldWind Java
+# WorldWind Java - Community Edition (WWJ-CE)
-```
-WorldWind team would like to inform you that starting May 3, 2019, NASA WorldWind project will be
-suspended. All the WorldWind servers providing elevation and imagery will be unavailable. While you
-can still download the SDKs from GitHub, there will be no technical support. If you have questions
-and/or concerns, please feel free to email at:
-
-worldwind-info@lists.nasa.gov
-```
+[](https://travis-ci.com/WorldWindEarth/WorldWindJava)
-[](https://travis-ci.com/NASAWorldWind/WorldWindJava)
+WWJ-CE is community supported fork of the ubiquitous [WorldWind Java SDK](https://github.com/NASAWorldWind/WorldWindJava)
+from NASA.
-3D virtual globe API for desktop Java, developed by NASA. Provides a geographic context with high-resolution terrain, for visualizing geographic or geo-located information in 3D and 2D. Developers can customize the globe's terrain and imagery. Provides a collection of shapes for displaying and interacting with geographic data and representing a range of geometric objects.
+WorldWind Java is a 3D virtual globe API for desktop Java, developed by NASA. It provides a geographic
+context with high-resolution terrain, for visualizing geographic or geo-located information in 3D and 2D.
+Developers can customize the globe's terrain and imagery. The SDK provides a collection of shapes for
+displaying and interacting with geographic data and representing a range of geometric objects.
-- [worldwind.arc.nasa.gov](https://worldwind.arc.nasa.gov) has setup instructions, developers guides, API documentation and more
+- [worldwind.arc.nasa.gov/java](https://worldwind.arc.nasa.gov/java) has setup instructions, developers guides, API documentation and more
- [WorldWind Forum](https://forum.worldwindcentral.com) provides help from the WorldWind community
- [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA WorldWind development team
+## Notice from NASA
+On March 8, 2019, NASA announced a suspension of the WorldWind project.
+
+> WorldWind team would like to inform you that starting May 3, 2019, NASA WorldWind project will be
+> suspended. All the WorldWind servers providing elevation and imagery will be unavailable. While you
+> can still download the SDKs from GitHub, there will be no technical support. If you have questions
+> and/or concerns, please feel free to email at:
+>
+> worldwind-info@lists.nasa.gov
+
+WWJ-CE seeks to mitigate the effects of the suspension and continue the development of WorldWind Java.
+
## Releases and Roadmap
Official WorldWind Java releases have the latest stable features, enhancements and bug fixes ready for production use.
-- [GitHub Releases](https://github.com/NASAWorldWind/WorldWindJava/releases/) documents official releases
-- [GitHub Milestones](https://github.com/NASAWorldWind/WorldWindJava/milestones) documents upcoming releases and the development roadmap
-- [Travis CI](https://travis-ci.com/NASAWorldWind/WorldWindJava) provides continuous integration and build automation
+- [GitHub Releases](https://github.com/WorldWindEarth/WorldWindJava/releases/) documents official releases
+- [GitHub Milestones](https://github.com/WorldWindEarth/WorldWindJava/milestones) documents upcoming releases and the development roadmap
+- [Travis CI](https://travis-ci.com/WorldWindEarth/WorldWindJava) provides continuous integration and build automation
## Run a Demo
###### From a Web Browser
- [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities
-- [Java Demos](https://goworldwind.org/demos) has a complete list of example apps
+- [Java Demos](https://worldwind.arc.nasa.gov/java/demos/) has a complete list of example apps
###### From a Windows Development Environment
-- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
+- Download and extract the [Latest Release](https://github.com/WorldWindEarth/WorldWindJava/releases/latest)
- Open the Command Prompt
```bash
cd [WorldWind release]
@@ -45,7 +54,7 @@ run-demo.bat
###### From a Linux or macOS Development Environment
-- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
+- Download and extract the [Latest Release](https://github.com/WorldWindEarth/WorldWindJava/releases/latest)
- Open the Terminal app
```bash
cd [WorldWind release]
diff --git a/gluegen-rt-natives-linux-amd64.jar b/gluegen-rt-natives-linux-amd64.jar
index 21d73175ae..a2466f418a 100644
Binary files a/gluegen-rt-natives-linux-amd64.jar and b/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/gluegen-rt-natives-linux-i586.jar b/gluegen-rt-natives-linux-i586.jar
index d8582aa382..914a259d0d 100644
Binary files a/gluegen-rt-natives-linux-i586.jar and b/gluegen-rt-natives-linux-i586.jar differ
diff --git a/gluegen-rt-natives-macosx-universal.jar b/gluegen-rt-natives-macosx-universal.jar
index f8ffce3647..15df5e8200 100644
Binary files a/gluegen-rt-natives-macosx-universal.jar and b/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/gluegen-rt-natives-windows-amd64.jar b/gluegen-rt-natives-windows-amd64.jar
index d13485ec0d..517fb84c74 100644
Binary files a/gluegen-rt-natives-windows-amd64.jar and b/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/gluegen-rt-natives-windows-i586.jar b/gluegen-rt-natives-windows-i586.jar
index f1a04cbb4d..1c393b7846 100644
Binary files a/gluegen-rt-natives-windows-i586.jar and b/gluegen-rt-natives-windows-i586.jar differ
diff --git a/gluegen-rt.jar b/gluegen-rt.jar
index 436bd23d9c..742fdb26b6 100644
Binary files a/gluegen-rt.jar and b/gluegen-rt.jar differ
diff --git a/jogl-all-natives-linux-amd64.jar b/jogl-all-natives-linux-amd64.jar
index 0edb4cad52..e57b8c7c0b 100644
Binary files a/jogl-all-natives-linux-amd64.jar and b/jogl-all-natives-linux-amd64.jar differ
diff --git a/jogl-all-natives-linux-i586.jar b/jogl-all-natives-linux-i586.jar
index 6259338f28..88a27ce73f 100644
Binary files a/jogl-all-natives-linux-i586.jar and b/jogl-all-natives-linux-i586.jar differ
diff --git a/jogl-all-natives-macosx-universal.jar b/jogl-all-natives-macosx-universal.jar
index 5e5888ff04..c65ea9953b 100644
Binary files a/jogl-all-natives-macosx-universal.jar and b/jogl-all-natives-macosx-universal.jar differ
diff --git a/jogl-all-natives-windows-amd64.jar b/jogl-all-natives-windows-amd64.jar
index 33a1419c44..9577bf1d05 100644
Binary files a/jogl-all-natives-windows-amd64.jar and b/jogl-all-natives-windows-amd64.jar differ
diff --git a/jogl-all-natives-windows-i586.jar b/jogl-all-natives-windows-i586.jar
index 10692d2cf0..4439f1dcc5 100644
Binary files a/jogl-all-natives-windows-i586.jar and b/jogl-all-natives-windows-i586.jar differ
diff --git a/jogl-all.jar b/jogl-all.jar
index 852a18a08f..f73174f9e7 100644
Binary files a/jogl-all.jar and b/jogl-all.jar differ
diff --git a/src/com/zebraimaging/ZebraInputHandler.java b/src/com/zebraimaging/ZebraInputHandler.java
index e3878a4c3e..10abc1936a 100644
--- a/src/com/zebraimaging/ZebraInputHandler.java
+++ b/src/com/zebraimaging/ZebraInputHandler.java
@@ -3,7 +3,7 @@
import gov.nasa.worldwind.WorldWindow;
import gov.nasa.worldwind.awt.*;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLCanvas;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/AbstractSceneController.java b/src/gov/nasa/worldwind/AbstractSceneController.java
index 1932294deb..ff0fafe27f 100644
--- a/src/gov/nasa/worldwind/AbstractSceneController.java
+++ b/src/gov/nasa/worldwind/AbstractSceneController.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.terrain.*;
import gov.nasa.worldwind.util.*;
-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/Configuration.java b/src/gov/nasa/worldwind/Configuration.java
index 2b311ea3fa..f800e0178b 100644
--- a/src/gov/nasa/worldwind/Configuration.java
+++ b/src/gov/nasa/worldwind/Configuration.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.util.*;
import org.w3c.dom.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.xpath.*;
import java.io.*;
import java.util.*;
@@ -659,7 +659,7 @@ public static GLProfile getMaxCompatibleGLProfile()
}
/**
- * Returns a {@link javax.media.opengl.GLCapabilities} identifying graphics features required by WorldWind. The
+ * Returns a {@link com.jogamp.opengl.GLCapabilities} identifying graphics features required by World Wind. The
* capabilities instance returned requests the maximum OpenGL profile supporting GL fixed function operations, a
* frame buffer with 8 bits each of red, green, blue and alpha, a 24-bit depth buffer, double buffering, and if the
* Java property "gov.nasa.worldwind.stereo.mode" is set to "device", device supported stereo.
diff --git a/src/gov/nasa/worldwind/StereoOptionSceneController.java b/src/gov/nasa/worldwind/StereoOptionSceneController.java
index e2e312bc8b..e571a4599a 100644
--- a/src/gov/nasa/worldwind/StereoOptionSceneController.java
+++ b/src/gov/nasa/worldwind/StereoOptionSceneController.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.geom.Angle;
import gov.nasa.worldwind.render.DrawContext;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* TODO: This file needs to be updated to implement "correct" stereo, as described at:
diff --git a/src/gov/nasa/worldwind/WorldWind.java b/src/gov/nasa/worldwind/WorldWind.java
index ecee9897fc..8a7ce5afed 100644
--- a/src/gov/nasa/worldwind/WorldWind.java
+++ b/src/gov/nasa/worldwind/WorldWind.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.util.*;
import javax.imageio.spi.IIORegistry;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.beans.PropertyChangeListener;
import java.util.logging.Level;
diff --git a/src/gov/nasa/worldwind/WorldWindow.java b/src/gov/nasa/worldwind/WorldWindow.java
index 71c082c442..d3fd7e3eaf 100644
--- a/src/gov/nasa/worldwind/WorldWindow.java
+++ b/src/gov/nasa/worldwind/WorldWindow.java
@@ -13,7 +13,7 @@
import gov.nasa.worldwind.pick.PickedObjectList;
import gov.nasa.worldwind.util.PerformanceStatistic;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
import java.util.*;
/**
diff --git a/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
index 44f8a3f63a..ef388e3b9b 100644
--- a/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
+++ b/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
@@ -16,8 +16,8 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.util.dashboard.DashboardController;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.AWTGLAutoDrawable;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.AWTGLAutoDrawable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
diff --git a/src/gov/nasa/worldwind/WorldWindowGLDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLDrawable.java
index dbaa048975..a8105cf6ca 100644
--- a/src/gov/nasa/worldwind/WorldWindowGLDrawable.java
+++ b/src/gov/nasa/worldwind/WorldWindowGLDrawable.java
@@ -8,7 +8,7 @@
import gov.nasa.worldwind.cache.*;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
/**
* @author tag
diff --git a/src/gov/nasa/worldwind/awt/AWTInputHandler.java b/src/gov/nasa/worldwind/awt/AWTInputHandler.java
index 5a907e6835..c52d2fda80 100644
--- a/src/gov/nasa/worldwind/awt/AWTInputHandler.java
+++ b/src/gov/nasa/worldwind/awt/AWTInputHandler.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.pick.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
index 9375a2521f..032ad9d80c 100644
--- a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
+++ b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.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.GLCanvas;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
import java.awt.*;
import java.beans.*;
import java.util.*;
@@ -88,8 +88,8 @@ public WorldWindowGLCanvas()
*
* @param shareWith a 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)
{
@@ -128,8 +128,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)
{
@@ -172,8 +172,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 8d22ad6c92..a190a00969 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.*;
@@ -87,8 +87,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)
{
@@ -130,8 +130,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/Matrix.java b/src/gov/nasa/worldwind/geom/Matrix.java
index 3d373ad864..0a2d191310 100644
--- a/src/gov/nasa/worldwind/geom/Matrix.java
+++ b/src/gov/nasa/worldwind/geom/Matrix.java
@@ -2061,7 +2061,7 @@ public final double getDeterminant()
+ this.m24 * (this.m31 * this.m42 - this.m41 * this.m32));
// Columns 1, 2, 3.
result -= this.m14 *
- (this.m21 * (this.m32 * this.m43 - this.m42 - this.m33)
+ (this.m21 * (this.m32 * this.m43 - this.m42 * this.m33)
- this.m22 * (this.m31 * this.m43 - this.m41 * this.m33)
+ this.m23 * (this.m31 * this.m42 - this.m41 * this.m32));
return result;
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.
diff --git a/src/gov/nasa/worldwind/geom/Triangle.java b/src/gov/nasa/worldwind/geom/Triangle.java
index 8e12a3e2c4..9012bbcd7d 100644
--- a/src/gov/nasa/worldwind/geom/Triangle.java
+++ b/src/gov/nasa/worldwind/geom/Triangle.java
@@ -7,7 +7,7 @@
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.nio.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java b/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java
index 4e8e3ae936..1326cc9d65 100644
--- a/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java
+++ b/src/gov/nasa/worldwind/layers/CachedRenderableLayer.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.Collection;
/**
diff --git a/src/gov/nasa/worldwind/layers/CompassLayer.java b/src/gov/nasa/worldwind/layers/CompassLayer.java
index bfe26e1c37..1ef48b65c0 100644
--- a/src/gov/nasa/worldwind/layers/CompassLayer.java
+++ b/src/gov/nasa/worldwind/layers/CompassLayer.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.view.orbit.OrbitView;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.io.*;
diff --git a/src/gov/nasa/worldwind/layers/CrosshairLayer.java b/src/gov/nasa/worldwind/layers/CrosshairLayer.java
index 79c052e710..c1de7dc03a 100644
--- a/src/gov/nasa/worldwind/layers/CrosshairLayer.java
+++ b/src/gov/nasa/worldwind/layers/CrosshairLayer.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.io.*;
diff --git a/src/gov/nasa/worldwind/layers/RenderableLayer.java b/src/gov/nasa/worldwind/layers/RenderableLayer.java
index c966704893..ebed3082a9 100644
--- a/src/gov/nasa/worldwind/layers/RenderableLayer.java
+++ b/src/gov/nasa/worldwind/layers/RenderableLayer.java
@@ -12,7 +12,7 @@
import gov.nasa.worldwind.render.*;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/src/gov/nasa/worldwind/layers/ScalebarLayer.java b/src/gov/nasa/worldwind/layers/ScalebarLayer.java
index ace39555ce..0f5239d0fb 100644
--- a/src/gov/nasa/worldwind/layers/ScalebarLayer.java
+++ b/src/gov/nasa/worldwind/layers/ScalebarLayer.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.awt.*;
import java.awt.geom.*;
diff --git a/src/gov/nasa/worldwind/layers/SkyColorLayer.java b/src/gov/nasa/worldwind/layers/SkyColorLayer.java
index 3c8138aa39..dac19200ff 100644
--- a/src/gov/nasa/worldwind/layers/SkyColorLayer.java
+++ b/src/gov/nasa/worldwind/layers/SkyColorLayer.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.Logging;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwind/layers/SkyGradientLayer.java b/src/gov/nasa/worldwind/layers/SkyGradientLayer.java
index 9e139c81ee..7d03644eb8 100644
--- a/src/gov/nasa/worldwind/layers/SkyGradientLayer.java
+++ b/src/gov/nasa/worldwind/layers/SkyGradientLayer.java
@@ -10,7 +10,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/layers/StarsLayer.java b/src/gov/nasa/worldwind/layers/StarsLayer.java
index 15c2a1df45..aba50d43f3 100644
--- a/src/gov/nasa/worldwind/layers/StarsLayer.java
+++ b/src/gov/nasa/worldwind/layers/StarsLayer.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.io.*;
import java.nio.*;
diff --git a/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java b/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java
index 1d7f35e3de..5274f06810 100644
--- a/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java
+++ b/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.view.orbit.OrbitView;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.geom.*;
import java.beans.PropertyChangeEvent;
diff --git a/src/gov/nasa/worldwind/layers/TextureTile.java b/src/gov/nasa/worldwind/layers/TextureTile.java
index 43cbe2adda..9a2b3987a8 100644
--- a/src/gov/nasa/worldwind/layers/TextureTile.java
+++ b/src/gov/nasa/worldwind/layers/TextureTile.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.*;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/gov/nasa/worldwind/layers/TiledImageLayer.java b/src/gov/nasa/worldwind/layers/TiledImageLayer.java
index bdbcc423fb..72d360089b 100644
--- a/src/gov/nasa/worldwind/layers/TiledImageLayer.java
+++ b/src/gov/nasa/worldwind/layers/TiledImageLayer.java
@@ -16,7 +16,7 @@
import org.w3c.dom.*;
import javax.imageio.ImageIO;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.xml.xpath.XPath;
import java.awt.image.*;
import java.io.*;
diff --git a/src/gov/nasa/worldwind/layers/WorldMapLayer.java b/src/gov/nasa/worldwind/layers/WorldMapLayer.java
index 22a1640b30..5aa4ff9cd1 100644
--- a/src/gov/nasa/worldwind/layers/WorldMapLayer.java
+++ b/src/gov/nasa/worldwind/layers/WorldMapLayer.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.io.*;
import java.util.ArrayList;
diff --git a/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java b/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
index fadcf1294d..c81ebda904 100644
--- a/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
+++ b/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.util.*;
import javax.imageio.ImageIO;
-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/ogc/collada/impl/ColladaMeshShape.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
index 4658d0cf30..ea579db7a9 100644
--- a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
+++ b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
@@ -17,7 +17,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.FloatBuffer;
import java.util.*;
@@ -1192,6 +1192,9 @@ protected String getTexCoordSemantic(Geometry geometry)
*/
protected String getTextureSource(ColladaAbstractGeometry geometry)
{
+ if (this.bindMaterial == null)
+ return null;
+
ColladaTechniqueCommon techniqueCommon = this.bindMaterial.getTechniqueCommon();
if (techniqueCommon == null)
return null;
@@ -1297,7 +1300,10 @@ protected String getImageRef(ColladaEffect effect, ColladaTexture texture)
* available.
*/
protected ColladaEffect getEffect(ColladaAbstractGeometry geometry)
- {
+ {
+ if (this.bindMaterial == null)
+ return null;
+
ColladaTechniqueCommon techniqueCommon = this.bindMaterial.getTechniqueCommon();
if (techniqueCommon == null)
return null;
diff --git a/src/gov/nasa/worldwind/pick/PickSupport.java b/src/gov/nasa/worldwind/pick/PickSupport.java
index 915af80606..bdc0a68ab9 100644
--- a/src/gov/nasa/worldwind/pick/PickSupport.java
+++ b/src/gov/nasa/worldwind/pick/PickSupport.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.render.DrawContext;
import gov.nasa.worldwind.util.Range;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.util.*;
diff --git a/src/gov/nasa/worldwind/render/AbstractAnnotation.java b/src/gov/nasa/worldwind/render/AbstractAnnotation.java
index e4c67c960e..40bb657254 100644
--- a/src/gov/nasa/worldwind/render/AbstractAnnotation.java
+++ b/src/gov/nasa/worldwind/render/AbstractAnnotation.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.pick.PickSupport;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
/**
diff --git a/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java b/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java
index 324c70ce4e..26280d6413 100644
--- a/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java
+++ b/src/gov/nasa/worldwind/render/AbstractAnnotationLayout.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.pick.PickSupport;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java b/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java
index c7d11dd13e..6c7a82c3c5 100644
--- a/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java
+++ b/src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java
@@ -14,7 +14,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.util.webview.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.geom.*;
diff --git a/src/gov/nasa/worldwind/render/AbstractShape.java b/src/gov/nasa/worldwind/render/AbstractShape.java
index 8fc50c3daf..91397f84d1 100644
--- a/src/gov/nasa/worldwind/render/AbstractShape.java
+++ b/src/gov/nasa/worldwind/render/AbstractShape.java
@@ -19,7 +19,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.*;
diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java b/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java
index ee5577a565..304f95da97 100644
--- a/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java
+++ b/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java
@@ -15,7 +15,7 @@
import gov.nasa.worldwind.pick.*;
import gov.nasa.worldwind.util.*;
-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/render/AbstractSurfaceRenderable.java b/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java
index 2c4a9b850c..f9ed831f2e 100644
--- a/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java
+++ b/src/gov/nasa/worldwind/render/AbstractSurfaceRenderable.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.util.*;
import gov.nasa.worldwind.view.orbit.OrbitView;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.awt.*;
import java.util.*;
import java.util.List;
diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java b/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java
index f08de5a9fb..0271226a1f 100644
--- a/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java
+++ b/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java
@@ -17,8 +17,8 @@
import gov.nasa.worldwind.util.combine.*;
import gov.nasa.worldwind.util.measure.AreaMeasurer;
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
import javax.xml.stream.XMLStreamException;
import java.awt.*;
import java.io.IOException;
diff --git a/src/gov/nasa/worldwind/render/Annotation.java b/src/gov/nasa/worldwind/render/Annotation.java
index 9cef9f9169..8a72838bae 100644
--- a/src/gov/nasa/worldwind/render/Annotation.java
+++ b/src/gov/nasa/worldwind/render/Annotation.java
@@ -10,7 +10,7 @@
import gov.nasa.worldwind.geom.Position;
import gov.nasa.worldwind.pick.*;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
/**
* Represent a text label and its rendering attributes.
diff --git a/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java b/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java
index 126d0a3949..8f28b51f8a 100644
--- a/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java
+++ b/src/gov/nasa/worldwind/render/AnnotationFlowLayout.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.geom.Position;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwind/render/AnnotationNullLayout.java b/src/gov/nasa/worldwind/render/AnnotationNullLayout.java
index 68ff232cc0..5834aa961d 100644
--- a/src/gov/nasa/worldwind/render/AnnotationNullLayout.java
+++ b/src/gov/nasa/worldwind/render/AnnotationNullLayout.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.geom.Position;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author dcollins
diff --git a/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java b/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java
index 25e9e8cc27..7f0b9a743a 100644
--- a/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java
+++ b/src/gov/nasa/worldwind/render/BasicAnnotationRenderer.java
@@ -13,7 +13,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.util.*;
import java.util.logging.Level;
diff --git a/src/gov/nasa/worldwind/render/BasicLightingModel.java b/src/gov/nasa/worldwind/render/BasicLightingModel.java
index 2539a8c44b..6173c6ed9f 100644
--- a/src/gov/nasa/worldwind/render/BasicLightingModel.java
+++ b/src/gov/nasa/worldwind/render/BasicLightingModel.java
@@ -9,7 +9,7 @@
import gov.nasa.worldwind.geom.Vec4;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* Provides a simple lighting model with one light. This model uses only OpenGL light 0.
diff --git a/src/gov/nasa/worldwind/render/BasicWWTexture.java b/src/gov/nasa/worldwind/render/BasicWWTexture.java
index f486aa504e..8edeebd055 100644
--- a/src/gov/nasa/worldwind/render/BasicWWTexture.java
+++ b/src/gov/nasa/worldwind/render/BasicWWTexture.java
@@ -10,7 +10,7 @@
import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
import gov.nasa.worldwind.util.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.image.*;
import java.io.InputStream;
import java.net.URL;
diff --git a/src/gov/nasa/worldwind/render/Box.java b/src/gov/nasa/worldwind/render/Box.java
index a9af98be77..918ffea27e 100644
--- a/src/gov/nasa/worldwind/render/Box.java
+++ b/src/gov/nasa/worldwind/render/Box.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/Cone.java b/src/gov/nasa/worldwind/render/Cone.java
index ff3845121e..1ed507fee6 100644
--- a/src/gov/nasa/worldwind/render/Cone.java
+++ b/src/gov/nasa/worldwind/render/Cone.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/Cylinder.java b/src/gov/nasa/worldwind/render/Cylinder.java
index f2d162c169..a436091fd4 100644
--- a/src/gov/nasa/worldwind/render/Cylinder.java
+++ b/src/gov/nasa/worldwind/render/Cylinder.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/DeclutteringTextRenderer.java b/src/gov/nasa/worldwind/render/DeclutteringTextRenderer.java
index 6028c63a65..91a825d4a9 100644
--- a/src/gov/nasa/worldwind/render/DeclutteringTextRenderer.java
+++ b/src/gov/nasa/worldwind/render/DeclutteringTextRenderer.java
@@ -11,9 +11,9 @@
import gov.nasa.worldwind.terrain.SectorGeometryList;
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.awt.geom.*;
import java.io.IOException;
diff --git a/src/gov/nasa/worldwind/render/DrawContext.java b/src/gov/nasa/worldwind/render/DrawContext.java
index 959bc849cb..36c6d66dd3 100644
--- a/src/gov/nasa/worldwind/render/DrawContext.java
+++ b/src/gov/nasa/worldwind/render/DrawContext.java
@@ -15,8 +15,8 @@
import gov.nasa.worldwind.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 java.awt.*;
import java.nio.FloatBuffer;
import java.util.*;
@@ -30,10 +30,10 @@
public interface DrawContext extends WWObject, Disposable
{
/**
- * Assigns this 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,18 +41,18 @@ public interface DrawContext extends WWObject, Disposable
void setGLContext(GLContext glContext);
/**
- * Retrieves this DrawContexts javax.media.opengl.GLContext. If this method returns null,
+ * Retrieves this DrawContexts com.jogamp.opengl.GLContext. If this method returns null,
* then there are potentially no active GLContexts and rendering should be aborted.
*
- * @return this DrawContexts javax.media.opengl.GLContext.
+ * @return this DrawContexts com.jogamp.opengl.GLContext.
*
* @since 1.5
*/
GLContext getGLContext();
/**
- * Retrieves the current javax.media.opengl.GL. A GL or GLU is required for
- * all graphical rendering in WorldWind.
+ * 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,8 +61,8 @@ public interface DrawContext extends WWObject, Disposable
GL getGL();
/**
- * Retrieves the current javax.media.opengl.glu.GLU. A GLU or GL is required
- * for all graphical rendering in WorldWind.
+ * 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..410b0b94cb 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()
{
@@ -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/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 c7fa471f0c..4339957def 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);
@@ -1951,7 +1951,6 @@ public void run() {
@Override
public void dispose(GLAutoDrawable drawable) {
- glu.destroy();
glu=null;
frame=null;
}
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 c7106cb514..a500f18ca1 100644
--- a/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.java
+++ b/src/gov/nasa/worldwind/render/airspaces/AbstractAirspace.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.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 e545f8e084..107b79a691 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 9f1ec4cf51..04fcf2ef53 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 4e552c2732..8f55e3fdfd 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 1217385f11..1dd32d3700 100644
--- a/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
+++ b/src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
@@ -17,7 +17,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 cbeca26e8d..9a2aa97d89 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 a96a0cbc1e..cb686d13f1 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 7b95b1acfa..b11e05b691 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 4f052399b6..5a6fadc8cb 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/AnimatedGlobe.java b/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java
index 4e6e38036f..b1220fc0b9 100644
--- a/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java
+++ b/src/gov/nasa/worldwindx/examples/AnimatedGlobe.java
@@ -11,7 +11,7 @@
import gov.nasa.worldwind.event.*;
import gov.nasa.worldwind.geom.*;
-import javax.media.opengl.GLAnimatorControl;
+import com.jogamp.opengl.GLAnimatorControl;
/**
* Shows how to use a JOGL Animator to animate in WorldWind
diff --git a/src/gov/nasa/worldwindx/examples/Annotations.java b/src/gov/nasa/worldwindx/examples/Annotations.java
index 771adbe210..4fc79ad12d 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 16b819f6a6..4ec982dc7e 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 WorldWind uses by configuring a {@link
@@ -46,8 +46,8 @@ 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
- * features used by the WorldWind SDK.
+ * 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
{
@@ -57,8 +57,8 @@ public MyGLAutoDrawable()
}
/**
- * Overridden to configure the OpenGL features used by the WorldWind SDK. See {@link
- * javax.media.opengl.GLEventListener#init(GLAutoDrawable)}.
+ * Overridden to configure the OpenGL features used by the World Wind SDK. See {@link
+ * 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 3d6e82c66c..87784fec13 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
@@ -55,8 +55,8 @@ public MyGLAutoDrawable()
}
/**
- * Overridden to configure the OpenGL features used by the WorldWind SDK. See {@link
- * javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable)}.
+ * Overridden to configure the OpenGL features used by the World Wind SDK. See {@link
+ * 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 71081a3aa7..fa285be4e0 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 9d7941d98b..86afdd260d 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 WorldWind.
diff --git a/src/gov/nasa/worldwindx/examples/PickFrustum.java b/src/gov/nasa/worldwindx/examples/PickFrustum.java
index ca72a695b9..d99dbbb5ef 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 7505c082e9..af4de8adbb 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 f5cba796c5..e9e5ad2ae2 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 107bfd6bd1..939365dcf4 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/geom/MatrixTest.java b/test/gov/nasa/worldwind/geom/MatrixTest.java
index faf466c47b..e5bb4da3e6 100644
--- a/test/gov/nasa/worldwind/geom/MatrixTest.java
+++ b/test/gov/nasa/worldwind/geom/MatrixTest.java
@@ -136,6 +136,26 @@ public void testInverseOfNearSingular()
Matrix identity = m.multiply(mInv);
assertTrue("Matrix inverse is incorrect", equals(identity, Matrix.IDENTITY, NEAR_SINGULAR_EQUALITY_TOLERANCE));
}
+
+ @Test
+ public void testDeterminantEqualToDeterminantOfTranspose()
+ {
+ // Create random matrix.
+ Matrix matrix = new Matrix(
+ random.nextDouble(), random.nextDouble(), random.nextDouble(), random.nextDouble(),
+ random.nextDouble(), random.nextDouble(), random.nextDouble(), random.nextDouble(),
+ random.nextDouble(), random.nextDouble(), random.nextDouble(), random.nextDouble(),
+ random.nextDouble(), random.nextDouble(), random.nextDouble(), random.nextDouble());
+
+ // Calculate the determinant.
+ double determinant = matrix.getDeterminant();
+
+ // Transpose the matrix.
+ Matrix transpose = matrix.getTranspose();
+
+ // The determinant and the determinant of the transpose should be equal.
+ assertEquals(determinant, transpose.getDeterminant(), EQUALITY_TOLERANCE);
+ }
//**************************************************************//
//******************** Helper Methods ************************//
diff --git a/test/gov/nasa/worldwind/util/OGLUtilTest.java b/test/gov/nasa/worldwind/util/OGLUtilTest.java
index 0b0a4821a2..7659eae505 100644
--- a/test/gov/nasa/worldwind/util/OGLUtilTest.java
+++ b/test/gov/nasa/worldwind/util/OGLUtilTest.java
@@ -12,7 +12,8 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import javax.media.opengl.*;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLProfile;
import java.io.*;
import java.net.URL;