diff options
author | Sven Gothel <[email protected]> | 2015-02-03 01:16:05 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-02-03 01:16:05 +0100 |
commit | b32c5de0d658a0e41eabe6590da20bc8300c0dae (patch) | |
tree | d022fecab71be00412f52ecd528900e2966625d1 /src/gleem | |
parent | 4392e90ea2909d89895d992833bf9e71ae922a1d (diff) |
Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 1)
Diffstat (limited to 'src/gleem')
-rw-r--r-- | src/gleem/ExaminerViewer.java | 10 | ||||
-rw-r--r-- | src/gleem/HandleBoxManip.java | 2 | ||||
-rw-r--r-- | src/gleem/Manip.java | 2 | ||||
-rw-r--r-- | src/gleem/ManipManager.java | 4 | ||||
-rw-r--r-- | src/gleem/ManipPart.java | 2 | ||||
-rw-r--r-- | src/gleem/ManipPartGroup.java | 2 | ||||
-rw-r--r-- | src/gleem/ManipPartLineSeg.java | 2 | ||||
-rw-r--r-- | src/gleem/ManipPartTriBased.java | 2 | ||||
-rw-r--r-- | src/gleem/TestExaminerViewer.java | 16 | ||||
-rw-r--r-- | src/gleem/TestHandleBox.java | 16 | ||||
-rw-r--r-- | src/gleem/TestMultiWin.java | 16 | ||||
-rw-r--r-- | src/gleem/TestTranslate1.java | 16 | ||||
-rw-r--r-- | src/gleem/TestTranslate2.java | 16 | ||||
-rw-r--r-- | src/gleem/Translate1Manip.java | 2 | ||||
-rw-r--r-- | src/gleem/Translate2Manip.java | 2 | ||||
-rw-r--r-- | src/gleem/WindowUpdateListener.java | 2 |
16 files changed, 56 insertions, 56 deletions
diff --git a/src/gleem/ExaminerViewer.java b/src/gleem/ExaminerViewer.java index e88ecf7..460607e 100644 --- a/src/gleem/ExaminerViewer.java +++ b/src/gleem/ExaminerViewer.java @@ -48,11 +48,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; /** <P> This is an application-level class, not part of the manipulator hierarchy. It is an example of how you might integrate diff --git a/src/gleem/HandleBoxManip.java b/src/gleem/HandleBoxManip.java index a0e55d7..e1387a8 100644 --- a/src/gleem/HandleBoxManip.java +++ b/src/gleem/HandleBoxManip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Patterned after Inventor's HandleBoxManip (by Paul Isaacs and David Mott) and TransformerManip (by Paul Isaacs). Center box diff --git a/src/gleem/Manip.java b/src/gleem/Manip.java index d498534..5c13841 100644 --- a/src/gleem/Manip.java +++ b/src/gleem/Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** The base class for all manipulators. Fundamentally a manipulator must support a ray cast operation with itself and logic to diff --git a/src/gleem/ManipManager.java b/src/gleem/ManipManager.java index 2fabd1e..bc4c68d 100644 --- a/src/gleem/ManipManager.java +++ b/src/gleem/ManipManager.java @@ -44,8 +44,8 @@ import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.*; /** The ManipManager handles making manipulators visible in a window. */ diff --git a/src/gleem/ManipPart.java b/src/gleem/ManipPart.java index 936f755..5931964 100644 --- a/src/gleem/ManipPart.java +++ b/src/gleem/ManipPart.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A ManipPart is a visible or invisible sub-part of a manipulator. ManipParts are organized into trees. */ diff --git a/src/gleem/ManipPartGroup.java b/src/gleem/ManipPartGroup.java index 5cf8f71..3681b1d 100644 --- a/src/gleem/ManipPartGroup.java +++ b/src/gleem/ManipPartGroup.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** This class groups a set of ManipParts. Makes a set of ManipParts look like one. */ diff --git a/src/gleem/ManipPartLineSeg.java b/src/gleem/ManipPartLineSeg.java index e243c62..f0cca34 100644 --- a/src/gleem/ManipPartLineSeg.java +++ b/src/gleem/ManipPartLineSeg.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A line segment from (-1, 0, 0) to (1, 0, 0). */ diff --git a/src/gleem/ManipPartTriBased.java b/src/gleem/ManipPartTriBased.java index 195f613..ec88319 100644 --- a/src/gleem/ManipPartTriBased.java +++ b/src/gleem/ManipPartTriBased.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Triangle-based manipulator part. This is the base class for most of the ManipParts that GLEEM uses internally. You can feel free to diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java index 03042ed..673b907 100644 --- a/src/gleem/TestExaminerViewer.java +++ b/src/gleem/TestExaminerViewer.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java index 13d0e74..554db68 100644 --- a/src/gleem/TestHandleBox.java +++ b/src/gleem/TestHandleBox.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; /** Tests the HandleBox Manip. */ diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java index 39fee6b..de9a7da 100644 --- a/src/gleem/TestMultiWin.java +++ b/src/gleem/TestMultiWin.java @@ -45,14 +45,14 @@ import java.awt.Frame; import java.awt.Point; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java index fae4366..6bcf452 100644 --- a/src/gleem/TestTranslate1.java +++ b/src/gleem/TestTranslate1.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java index ea1ae0e..402cbb1 100644 --- a/src/gleem/TestTranslate2.java +++ b/src/gleem/TestTranslate2.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/Translate1Manip.java b/src/gleem/Translate1Manip.java index 15af612..70db475 100644 --- a/src/gleem/Translate1Manip.java +++ b/src/gleem/Translate1Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A Translate1Manip is a Manip which translates in only one dimension and whose default representation is a two-way arrow. */ diff --git a/src/gleem/Translate2Manip.java b/src/gleem/Translate2Manip.java index fc2011c..d5ce14a 100644 --- a/src/gleem/Translate2Manip.java +++ b/src/gleem/Translate2Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A Translate2Manip is a Manip which translates in two dimensions and whose default representation is two arrows. */ diff --git a/src/gleem/WindowUpdateListener.java b/src/gleem/WindowUpdateListener.java index 8eff015..a9cba9e 100644 --- a/src/gleem/WindowUpdateListener.java +++ b/src/gleem/WindowUpdateListener.java @@ -39,7 +39,7 @@ package gleem; -import javax.media.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; /** A WindowUpdateListener is used by the ManipManager to transmit |