Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Determinant fix #167

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
45 changes: 27 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,51 @@
<img src="https://worldwind.arc.nasa.gov/img/nasa-logo.svg" height="100"/>

# 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:

[email protected]
```
[![Build Status](https://travis-ci.com/WorldWindEarth/WorldWindJava.svg?branch=develop)](https://travis-ci.com/WorldWindEarth/WorldWindJava)

[![Build Status](https://travis-ci.com/NASAWorldWind/WorldWindJava.svg?branch=develop)](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:
>
> [email protected]

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]
Expand All @@ -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]
Expand Down
Binary file modified gluegen-rt-natives-linux-amd64.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-linux-i586.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-macosx-universal.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-windows-amd64.jar
Binary file not shown.
Binary file modified gluegen-rt-natives-windows-i586.jar
Binary file not shown.
Binary file modified gluegen-rt.jar
Binary file not shown.
Binary file modified jogl-all-natives-linux-amd64.jar
Binary file not shown.
Binary file modified jogl-all-natives-linux-i586.jar
Binary file not shown.
Binary file modified jogl-all-natives-macosx-universal.jar
Binary file not shown.
Binary file modified jogl-all-natives-windows-amd64.jar
Binary file not shown.
Binary file modified jogl-all-natives-windows-i586.jar
Binary file not shown.
Binary file modified jogl-all.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/com/zebraimaging/ZebraInputHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/AbstractSceneController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwind/Configuration.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/StereoOptionSceneController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/WorldWind.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/WorldWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/WorldWindowGLDrawable.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import gov.nasa.worldwind.cache.*;

import javax.media.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLAutoDrawable;

/**
* @author tag
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/awt/AWTInputHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
16 changes: 8 additions & 8 deletions src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -88,8 +88,8 @@ public WorldWindowGLCanvas()
*
* @param shareWith a <code>WorldWindow</code> 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)
{
Expand Down Expand Up @@ -128,8 +128,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith)
* @param device the <code>GraphicsDevice</code> 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)
{
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down Expand Up @@ -87,8 +87,8 @@ public WorldWindowGLJPanel()
*
* @param shareWith a <code>WorldWindow</code> 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)
{
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/geom/Box.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwind/geom/Cylinder.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/geom/Matrix.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/gov/nasa/worldwind/geom/Sphere.java
Original file line number Diff line number Diff line change
Expand Up @@ -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. <p/> Instances of <code>Sphere</code> are immutable. </p>
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/geom/Triangle.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/layers/CachedRenderableLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/layers/CompassLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/layers/CrosshairLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/layers/RenderableLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/gov/nasa/worldwind/layers/ScalebarLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
Loading