Skip to content

Commit 109d8e1

Browse files
committed
Update to JogAmp JOGL 2.3.2 released on 2015 10 10
port was done using git grep -lz 'javax.media.opengl' | xargs -0 perl -i'' -pE "s/javax.media.opengl/com.jogamp.opengl/g" git grep -lz 'javax.media.nativewindow' | xargs -0 perl -i'' -pE "s/javax.media.nativewindow/com.jogamp.nativewindow/g" Signed-off-by: Xerxes Rånby <xerxes@gudinna.com>
1 parent 23580f7 commit 109d8e1

File tree

172 files changed

+257
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+257
-257
lines changed

src/com/zebraimaging/ZebraInputHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import gov.nasa.worldwind.WorldWindow;
44
import gov.nasa.worldwind.awt.*;
55

6-
import javax.media.opengl.awt.GLCanvas;
6+
import com.jogamp.opengl.awt.GLCanvas;
77
import java.awt.*;
88
import java.awt.event.*;
99
import java.util.*;

src/gov/nasa/worldwind/AbstractSceneController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import gov.nasa.worldwind.terrain.*;
1616
import gov.nasa.worldwind.util.*;
1717

18-
import javax.media.opengl.*;
18+
import com.jogamp.opengl.*;
1919
import java.awt.*;
2020
import java.util.*;
2121
import java.util.List;

src/gov/nasa/worldwind/Configuration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import gov.nasa.worldwind.util.*;
1212
import org.w3c.dom.*;
1313

14-
import javax.media.opengl.*;
14+
import com.jogamp.opengl.*;
1515
import javax.xml.xpath.*;
1616
import java.io.*;
1717
import java.util.*;
@@ -659,7 +659,7 @@ public static GLProfile getMaxCompatibleGLProfile()
659659
}
660660

661661
/**
662-
* Returns a {@link javax.media.opengl.GLCapabilities} identifying graphics features required by World Wind. The
662+
* Returns a {@link com.jogamp.opengl.GLCapabilities} identifying graphics features required by World Wind. The
663663
* capabilities instance returned requests the maximum OpenGL profile supporting GL fixed function operations, a
664664
* frame buffer with 8 bits each of red, green, blue and alpha, a 24-bit depth buffer, double buffering, and if the
665665
* Java property "gov.nasa.worldwind.stereo.mode" is set to "device", device supported stereo.

src/gov/nasa/worldwind/StereoOptionSceneController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import gov.nasa.worldwind.geom.Angle;
1111
import gov.nasa.worldwind.render.DrawContext;
1212

13-
import javax.media.opengl.*;
13+
import com.jogamp.opengl.*;
1414

1515
/**
1616
* TODO: This file needs to be updated to implement "correct" stereo, as described at:

src/gov/nasa/worldwind/WorldWind.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import gov.nasa.worldwind.util.*;
1515

1616
import javax.imageio.spi.IIORegistry;
17-
import javax.media.opengl.GL;
17+
import com.jogamp.opengl.GL;
1818
import java.beans.PropertyChangeListener;
1919
import java.util.logging.Level;
2020

src/gov/nasa/worldwind/WorldWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import gov.nasa.worldwind.pick.PickedObjectList;
1414
import gov.nasa.worldwind.util.PerformanceStatistic;
1515

16-
import javax.media.opengl.GLContext;
16+
import com.jogamp.opengl.GLContext;
1717
import java.util.*;
1818

1919
/**

src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import gov.nasa.worldwind.util.*;
1717
import gov.nasa.worldwind.util.dashboard.DashboardController;
1818

19-
import javax.media.opengl.*;
20-
import javax.media.opengl.awt.AWTGLAutoDrawable;
19+
import com.jogamp.opengl.*;
20+
import com.jogamp.opengl.awt.AWTGLAutoDrawable;
2121
import javax.swing.*;
2222
import java.awt.*;
2323
import java.awt.event.*;

src/gov/nasa/worldwind/WorldWindowGLDrawable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import gov.nasa.worldwind.cache.*;
1010

11-
import javax.media.opengl.GLAutoDrawable;
11+
import com.jogamp.opengl.GLAutoDrawable;
1212

1313
/**
1414
* @author tag

src/gov/nasa/worldwind/awt/AWTInputHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import gov.nasa.worldwind.pick.*;
1212
import gov.nasa.worldwind.util.Logging;
1313

14-
import javax.media.opengl.awt.GLJPanel;
14+
import com.jogamp.opengl.awt.GLJPanel;
1515
import javax.swing.event.*;
1616
import java.awt.*;
1717
import java.awt.event.*;

src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import gov.nasa.worldwind.pick.PickedObjectList;
1515
import gov.nasa.worldwind.util.*;
1616

17-
import javax.media.opengl.*;
18-
import javax.media.opengl.awt.GLCanvas;
17+
import com.jogamp.opengl.*;
18+
import com.jogamp.opengl.awt.GLCanvas;
1919
import java.awt.*;
2020
import java.beans.*;
2121
import java.util.*;
@@ -87,8 +87,8 @@ public WorldWindowGLCanvas()
8787
*
8888
* @param shareWith a <code>WorldWindow</code> with which to share graphics resources.
8989
*
90-
* @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
91-
* javax.media.opengl.GLContext, java.awt.GraphicsDevice)
90+
* @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
91+
* com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
9292
*/
9393
public WorldWindowGLCanvas(WorldWindow shareWith)
9494
{
@@ -126,8 +126,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith)
126126
* @param device the <code>GraphicsDevice</code> on which to create the window. May be null, in which case the
127127
* default screen device of the local {@link GraphicsEnvironment} is used.
128128
*
129-
* @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
130-
* javax.media.opengl.GLContext, java.awt.GraphicsDevice)
129+
* @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
130+
* com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
131131
*/
132132
public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device)
133133
{
@@ -169,8 +169,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
169169
* @param chooser a chooser object that customizes the specified capabilities. May be null, in which case a
170170
* default chooser is used.
171171
*
172-
* @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
173-
* javax.media.opengl.GLContext, java.awt.GraphicsDevice)
172+
* @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
173+
* com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
174174
*/
175175
public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device,
176176
GLCapabilities capabilities, GLCapabilitiesChooser chooser)

0 commit comments

Comments
 (0)