diff options
Diffstat (limited to 'src/redbook')
96 files changed, 243 insertions, 243 deletions
diff --git a/src/redbook/src/glredbook10/GLSkeleton.java b/src/redbook/src/glredbook10/GLSkeleton.java index 6b147fa..39d93ae 100644 --- a/src/redbook/src/glredbook10/GLSkeleton.java +++ b/src/redbook/src/glredbook10/GLSkeleton.java @@ -2,7 +2,7 @@ package glredbook10; import com.jogamp.opengl.util.FPSAnimator;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
public abstract class GLSkeleton<D extends GLAutoDrawable> {
diff --git a/src/redbook/src/glredbook10/README.txt b/src/redbook/src/glredbook10/README.txt index d3c409e..bdec6ff 100644 --- a/src/redbook/src/glredbook10/README.txt +++ b/src/redbook/src/glredbook10/README.txt @@ -15,7 +15,7 @@ and the system dependent jogl-natives-*.jar has an internal copy.
- All examples extends from glskeleton.java
-Note: Color Index examples are not support in javax.media.opengl (jogl),
+Note: Color Index examples are not support in com.jogamp.opengl (jogl),
so they are not ported. NURBS are also not ported for the same reason.
LIST:
- antiindex.c
diff --git a/src/redbook/src/glredbook10/accanti.java b/src/redbook/src/glredbook10/accanti.java index 5aeeb70..3988df8 100644 --- a/src/redbook/src/glredbook10/accanti.java +++ b/src/redbook/src/glredbook10/accanti.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Use the accumulation buffer to do full-scene antialiasing on a scene with
diff --git a/src/redbook/src/glredbook10/accnot.java b/src/redbook/src/glredbook10/accnot.java index 8403bc7..65f7d06 100644 --- a/src/redbook/src/glredbook10/accnot.java +++ b/src/redbook/src/glredbook10/accnot.java @@ -4,7 +4,7 @@ import java.awt.event.*; import javax.swing.*;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
/**
* @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes
diff --git a/src/redbook/src/glredbook10/accpersp.java b/src/redbook/src/glredbook10/accpersp.java index 4d8bfbe..d7c89c3 100644 --- a/src/redbook/src/glredbook10/accpersp.java +++ b/src/redbook/src/glredbook10/accpersp.java @@ -5,8 +5,8 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Use the accumulation buffer to do full-scene antialiasing on a scene with
diff --git a/src/redbook/src/glredbook10/accum.java b/src/redbook/src/glredbook10/accum.java index bbd040d..06d1071 100644 --- a/src/redbook/src/glredbook10/accum.java +++ b/src/redbook/src/glredbook10/accum.java @@ -6,8 +6,8 @@ import java.awt.event.KeyListener; import javax.swing.JFrame;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Do a sixteen pass
diff --git a/src/redbook/src/glredbook10/aim.java b/src/redbook/src/glredbook10/aim.java index 2f6a009..ada98fd 100644 --- a/src/redbook/src/glredbook10/aim.java +++ b/src/redbook/src/glredbook10/aim.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program calculates the fovy (field of view angle in the y direction), by
diff --git a/src/redbook/src/glredbook10/alpha.java b/src/redbook/src/glredbook10/alpha.java index 6385c11..93e007d 100644 --- a/src/redbook/src/glredbook10/alpha.java +++ b/src/redbook/src/glredbook10/alpha.java @@ -4,9 +4,9 @@ import javax.swing.*; import java.awt.event.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook10/alpha3D.java b/src/redbook/src/glredbook10/alpha3D.java index 06a592d..ebc5a69 100644 --- a/src/redbook/src/glredbook10/alpha3D.java +++ b/src/redbook/src/glredbook10/alpha3D.java @@ -5,8 +5,8 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook10/anti.java b/src/redbook/src/glredbook10/anti.java index a207fb6..2aae928 100644 --- a/src/redbook/src/glredbook10/anti.java +++ b/src/redbook/src/glredbook10/anti.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program draws antialiased lines in RGBA mode.
diff --git a/src/redbook/src/glredbook10/antipoint.java b/src/redbook/src/glredbook10/antipoint.java index b53b608..67446cb 100644 --- a/src/redbook/src/glredbook10/antipoint.java +++ b/src/redbook/src/glredbook10/antipoint.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* The program draws antialiased points, in RGBA mode.
diff --git a/src/redbook/src/glredbook10/antipoly.java b/src/redbook/src/glredbook10/antipoly.java index f69c24d..60c349f 100644 --- a/src/redbook/src/glredbook10/antipoly.java +++ b/src/redbook/src/glredbook10/antipoly.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program draws filled polygons with antialiased edges. The special
diff --git a/src/redbook/src/glredbook10/bezcurve.java b/src/redbook/src/glredbook10/bezcurve.java index 7e9e67e..dfa00b1 100644 --- a/src/redbook/src/glredbook10/bezcurve.java +++ b/src/redbook/src/glredbook10/bezcurve.java @@ -4,12 +4,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.FloatBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program uses evaluators to draw a Bezier curve.
diff --git a/src/redbook/src/glredbook10/bezmesh.java b/src/redbook/src/glredbook10/bezmesh.java index dea45c6..f750a7a 100644 --- a/src/redbook/src/glredbook10/bezmesh.java +++ b/src/redbook/src/glredbook10/bezmesh.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.common.nio.Buffers;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program renders a wireframe (mesh) Bezier surface, using two-dimensional
diff --git a/src/redbook/src/glredbook10/bezsurf.java b/src/redbook/src/glredbook10/bezsurf.java index 57fc12b..d47deab 100644 --- a/src/redbook/src/glredbook10/bezsurf.java +++ b/src/redbook/src/glredbook10/bezsurf.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.common.nio.Buffers;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program renders a wireframe (mesh) Bezier surface, using two-dimensional
diff --git a/src/redbook/src/glredbook10/checker.java b/src/redbook/src/glredbook10/checker.java index 5da7024..24a5370 100644 --- a/src/redbook/src/glredbook10/checker.java +++ b/src/redbook/src/glredbook10/checker.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program texture maps a checkerboard image onto two rectangles. This
diff --git a/src/redbook/src/glredbook10/checker2.java b/src/redbook/src/glredbook10/checker2.java index 20a3dd5..9803186 100644 --- a/src/redbook/src/glredbook10/checker2.java +++ b/src/redbook/src/glredbook10/checker2.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program texture maps a checkerboard image onto two rectangles. This
diff --git a/src/redbook/src/glredbook10/chess.java b/src/redbook/src/glredbook10/chess.java index beb9f7a..4f776fb 100644 --- a/src/redbook/src/glredbook10/chess.java +++ b/src/redbook/src/glredbook10/chess.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program texture maps a checkerboard image onto two rectangles. The
diff --git a/src/redbook/src/glredbook10/clip.java b/src/redbook/src/glredbook10/clip.java index 6506311..82eda1b 100644 --- a/src/redbook/src/glredbook10/clip.java +++ b/src/redbook/src/glredbook10/clip.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates arbitrary clipping planes.
diff --git a/src/redbook/src/glredbook10/colormat.java b/src/redbook/src/glredbook10/colormat.java index 99f8117..520ae10 100644 --- a/src/redbook/src/glredbook10/colormat.java +++ b/src/redbook/src/glredbook10/colormat.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* After initialization, the program will be in ColorMaterial mode. Pressing the
diff --git a/src/redbook/src/glredbook10/cone.java b/src/redbook/src/glredbook10/cone.java index e5e9bfd..3c7fb45 100644 --- a/src/redbook/src/glredbook10/cone.java +++ b/src/redbook/src/glredbook10/cone.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of the GL lighting model. A sphere is drawn
diff --git a/src/redbook/src/glredbook10/cube.java b/src/redbook/src/glredbook10/cube.java index f72afa2..1b0221f 100644 --- a/src/redbook/src/glredbook10/cube.java +++ b/src/redbook/src/glredbook10/cube.java @@ -3,12 +3,12 @@ package glredbook10; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates a single modeling transformation, glScalef() and a
diff --git a/src/redbook/src/glredbook10/depthcue.java b/src/redbook/src/glredbook10/depthcue.java index b25759a..5ee0584 100644 --- a/src/redbook/src/glredbook10/depthcue.java +++ b/src/redbook/src/glredbook10/depthcue.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program draws a wireframe model, which uses intensity (brightness) to
* give clues to distance. Fog is used to achieve this effect.
diff --git a/src/redbook/src/glredbook10/disk.java b/src/redbook/src/glredbook10/disk.java index f20264d..b2cbe39 100644 --- a/src/redbook/src/glredbook10/disk.java +++ b/src/redbook/src/glredbook10/disk.java @@ -4,10 +4,10 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUquadric;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUquadric;
/**
* This program demonstrates the use of the quadrics Utility Library routines to
diff --git a/src/redbook/src/glredbook10/dof.java b/src/redbook/src/glredbook10/dof.java index 1f42f8d..f7a432f 100644 --- a/src/redbook/src/glredbook10/dof.java +++ b/src/redbook/src/glredbook10/dof.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates use of the accumulation buffer to create an
diff --git a/src/redbook/src/glredbook10/dofnot.java b/src/redbook/src/glredbook10/dofnot.java index 701bd62..bbb8f38 100644 --- a/src/redbook/src/glredbook10/dofnot.java +++ b/src/redbook/src/glredbook10/dofnot.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates the same scene as dof.c, but without use of the
diff --git a/src/redbook/src/glredbook10/doublebuf.java b/src/redbook/src/glredbook10/doublebuf.java index af353d3..1e751dc 100644 --- a/src/redbook/src/glredbook10/doublebuf.java +++ b/src/redbook/src/glredbook10/doublebuf.java @@ -5,8 +5,8 @@ import java.awt.event.*; import com.jogamp.opengl.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This is a simple double buffered program. Pressing the left mouse button
diff --git a/src/redbook/src/glredbook10/drawf.java b/src/redbook/src/glredbook10/drawf.java index ee953c0..4a7ec92 100644 --- a/src/redbook/src/glredbook10/drawf.java +++ b/src/redbook/src/glredbook10/drawf.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Draws the bitmapped letter F on the screen (several times). This demonstrates
diff --git a/src/redbook/src/glredbook10/feedback.java b/src/redbook/src/glredbook10/feedback.java index b824a55..5fb737e 100644 --- a/src/redbook/src/glredbook10/feedback.java +++ b/src/redbook/src/glredbook10/feedback.java @@ -5,9 +5,9 @@ import java.awt.event.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates use of OpenGL feedback. First, a lighting
diff --git a/src/redbook/src/glredbook10/fog.java b/src/redbook/src/glredbook10/fog.java index 636aae1..5eabfc7 100644 --- a/src/redbook/src/glredbook10/fog.java +++ b/src/redbook/src/glredbook10/fog.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program draws 5 red teapots, each at a different z distance from the
diff --git a/src/redbook/src/glredbook10/font.java b/src/redbook/src/glredbook10/font.java index accc262..062d2d4 100644 --- a/src/redbook/src/glredbook10/font.java +++ b/src/redbook/src/glredbook10/font.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Draws some text in a bitmapped font. Uses glBitmap() and other pixel
diff --git a/src/redbook/src/glredbook10/jfont.java b/src/redbook/src/glredbook10/jfont.java index 11524ec..b848d52 100644 --- a/src/redbook/src/glredbook10/jfont.java +++ b/src/redbook/src/glredbook10/jfont.java @@ -16,12 +16,12 @@ import java.awt.event.KeyListener; import java.awt.font.GlyphVector;
import java.awt.geom.PathIterator;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.awt.GLJPanel;
import javax.swing.JFrame;
public class jfont //
@@ -85,7 +85,7 @@ public class jfont // gl.glTranslatef(-20, -20, 0);
gl.glScalef(0.75f, 1, 0);
gl.glColor3f(1, 0, 0);
- drawString(gl, "javax.media.opengl", false);
+ drawString(gl, "com.jogamp.opengl", false);
gl.glTranslatef(20, 40, 0);
drawString(gl, "OpenGL Everywhere", false);
diff --git a/src/redbook/src/glredbook10/light.java b/src/redbook/src/glredbook10/light.java index afd3579..3383e9e 100644 --- a/src/redbook/src/glredbook10/light.java +++ b/src/redbook/src/glredbook10/light.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of the OpenGL lighting model. A sphere
diff --git a/src/redbook/src/glredbook10/linelist.java b/src/redbook/src/glredbook10/linelist.java index 02f033e..a0aaf77 100644 --- a/src/redbook/src/glredbook10/linelist.java +++ b/src/redbook/src/glredbook10/linelist.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates using display lists to call different line
diff --git a/src/redbook/src/glredbook10/lines.java b/src/redbook/src/glredbook10/lines.java index ecba228..48563bc 100644 --- a/src/redbook/src/glredbook10/lines.java +++ b/src/redbook/src/glredbook10/lines.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates geometric primitives and their attributes.
diff --git a/src/redbook/src/glredbook10/list.java b/src/redbook/src/glredbook10/list.java index f91b8ec..32d554c 100644 --- a/src/redbook/src/glredbook10/list.java +++ b/src/redbook/src/glredbook10/list.java @@ -2,8 +2,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook10/list2.java b/src/redbook/src/glredbook10/list2.java index 4203f95..8e2d701 100644 --- a/src/redbook/src/glredbook10/list2.java +++ b/src/redbook/src/glredbook10/list2.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook10/maplight.java b/src/redbook/src/glredbook10/maplight.java index ebd430d..29b4efc 100644 --- a/src/redbook/src/glredbook10/maplight.java +++ b/src/redbook/src/glredbook10/maplight.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of the GL lighting model. A sphere is drawn
diff --git a/src/redbook/src/glredbook10/material.java b/src/redbook/src/glredbook10/material.java index 13c6aa8..a92a0e4 100644 --- a/src/redbook/src/glredbook10/material.java +++ b/src/redbook/src/glredbook10/material.java @@ -3,8 +3,8 @@ package glredbook10; import com.jogamp.opengl.util.gl2.GLUT;
import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of the GL lighting model. Several objects
diff --git a/src/redbook/src/glredbook10/mipmap.java b/src/redbook/src/glredbook10/mipmap.java index e7e9d85..0ffb049 100644 --- a/src/redbook/src/glredbook10/mipmap.java +++ b/src/redbook/src/glredbook10/mipmap.java @@ -6,10 +6,10 @@ import javax.swing.*; import java.nio.*;
import com.jogamp.common.nio.Buffers;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates using mipmaps for texture maps. To overtly show the
diff --git a/src/redbook/src/glredbook10/model.java b/src/redbook/src/glredbook10/model.java index 8ca110e..e8374ad 100644 --- a/src/redbook/src/glredbook10/model.java +++ b/src/redbook/src/glredbook10/model.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of OpenGL modeling transformations. Four
diff --git a/src/redbook/src/glredbook10/movelight.java b/src/redbook/src/glredbook10/movelight.java index c20e2c2..20da816 100644 --- a/src/redbook/src/glredbook10/movelight.java +++ b/src/redbook/src/glredbook10/movelight.java @@ -5,12 +5,12 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates when to issue lighting and transformation commands
diff --git a/src/redbook/src/glredbook10/pickdepth.java b/src/redbook/src/glredbook10/pickdepth.java index 2426702..f8fcb55 100644 --- a/src/redbook/src/glredbook10/pickdepth.java +++ b/src/redbook/src/glredbook10/pickdepth.java @@ -6,11 +6,11 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* Picking is demonstrated in this program. In rendering mode, three overlapping
diff --git a/src/redbook/src/glredbook10/pickline.java b/src/redbook/src/glredbook10/pickline.java index bb6b5c7..64a4371 100644 --- a/src/redbook/src/glredbook10/pickline.java +++ b/src/redbook/src/glredbook10/pickline.java @@ -6,10 +6,10 @@ import javax.swing.*; import java.nio.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* Picking is demonstrated in this program. In rendering mode, three overlapping
diff --git a/src/redbook/src/glredbook10/picksquare.java b/src/redbook/src/glredbook10/picksquare.java index 2d9ff14..36ebbe0 100644 --- a/src/redbook/src/glredbook10/picksquare.java +++ b/src/redbook/src/glredbook10/picksquare.java @@ -4,11 +4,11 @@ import javax.swing.*; import java.awt.*;
import java.awt.event.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
import java.nio.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* Use of multiple names and picking are demonstrated. A 3x3 grid of squares is
diff --git a/src/redbook/src/glredbook10/plane.java b/src/redbook/src/glredbook10/plane.java index b8a9f46..8e9eb80 100644 --- a/src/redbook/src/glredbook10/plane.java +++ b/src/redbook/src/glredbook10/plane.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of local versus infinite lighting on a flat
diff --git a/src/redbook/src/glredbook10/planet.java b/src/redbook/src/glredbook10/planet.java index f7936f7..b26952e 100644 --- a/src/redbook/src/glredbook10/planet.java +++ b/src/redbook/src/glredbook10/planet.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program shows how to composite modeling transformations to draw
diff --git a/src/redbook/src/glredbook10/planetup.java b/src/redbook/src/glredbook10/planetup.java index 3cc3dbd..d4b7a34 100644 --- a/src/redbook/src/glredbook10/planetup.java +++ b/src/redbook/src/glredbook10/planetup.java @@ -3,9 +3,9 @@ package glredbook10; import com.jogamp.opengl.util.gl2.GLUT;
import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* The planets (from planet.c) have been rotated so their polar regions are
diff --git a/src/redbook/src/glredbook10/polys.java b/src/redbook/src/glredbook10/polys.java index 1bcd723..dc250f5 100644 --- a/src/redbook/src/glredbook10/polys.java +++ b/src/redbook/src/glredbook10/polys.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook10/robot.java b/src/redbook/src/glredbook10/robot.java index a244c0c..d5d368c 100644 --- a/src/redbook/src/glredbook10/robot.java +++ b/src/redbook/src/glredbook10/robot.java @@ -5,10 +5,10 @@ import java.awt.event.*; import javax.swing.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program shows how to composite modeling transformations to draw
diff --git a/src/redbook/src/glredbook10/sccolorlight.java b/src/redbook/src/glredbook10/sccolorlight.java index 86e5a0d..530eb46 100644 --- a/src/redbook/src/glredbook10/sccolorlight.java +++ b/src/redbook/src/glredbook10/sccolorlight.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of a colored (magenta, in this example)
diff --git a/src/redbook/src/glredbook10/scene.java b/src/redbook/src/glredbook10/scene.java index 800d8c0..acc6a9c 100644 --- a/src/redbook/src/glredbook10/scene.java +++ b/src/redbook/src/glredbook10/scene.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates the use of the GL lighting model. Objects are drawn
diff --git a/src/redbook/src/glredbook10/scenebamb.java b/src/redbook/src/glredbook10/scenebamb.java index e01e404..0d13202 100644 --- a/src/redbook/src/glredbook10/scenebamb.java +++ b/src/redbook/src/glredbook10/scenebamb.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates use of a blue ambient light source.
diff --git a/src/redbook/src/glredbook10/sceneflat.java b/src/redbook/src/glredbook10/sceneflat.java index 35cf950..330f23e 100644 --- a/src/redbook/src/glredbook10/sceneflat.java +++ b/src/redbook/src/glredbook10/sceneflat.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program draws lighted objects with flat shading.
diff --git a/src/redbook/src/glredbook10/select.java b/src/redbook/src/glredbook10/select.java index 8943228..5dfba64 100644 --- a/src/redbook/src/glredbook10/select.java +++ b/src/redbook/src/glredbook10/select.java @@ -4,11 +4,11 @@ import javax.swing.*; import java.awt.event.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import com.jogamp.opengl.util.*;
import java.nio.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This is an illustration of the selection mode and name stack, which detects
diff --git a/src/redbook/src/glredbook10/simple.java b/src/redbook/src/glredbook10/simple.java index e9bd48d..0efbb26 100644 --- a/src/redbook/src/glredbook10/simple.java +++ b/src/redbook/src/glredbook10/simple.java @@ -3,8 +3,8 @@ package glredbook10; * This program draws a white rectangle on a black background.
* @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes
*/
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
import javax.swing.*;
diff --git a/src/redbook/src/glredbook10/smooth.java b/src/redbook/src/glredbook10/smooth.java index 65b6cf4..295bb17 100644 --- a/src/redbook/src/glredbook10/smooth.java +++ b/src/redbook/src/glredbook10/smooth.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates smooth shading. A smooth shaded polygon is drawn in
diff --git a/src/redbook/src/glredbook10/sphere.java b/src/redbook/src/glredbook10/sphere.java index ca5b739..aad5cb3 100644 --- a/src/redbook/src/glredbook10/sphere.java +++ b/src/redbook/src/glredbook10/sphere.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program draws a wire frame sphere. It uses glTranslatef() as a viewing
diff --git a/src/redbook/src/glredbook10/stencil.java b/src/redbook/src/glredbook10/stencil.java index 7bb2e1e..820371a 100644 --- a/src/redbook/src/glredbook10/stencil.java +++ b/src/redbook/src/glredbook10/stencil.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.awt.event.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates use of the stencil buffer for masking
diff --git a/src/redbook/src/glredbook10/stroke.java b/src/redbook/src/glredbook10/stroke.java index 081ba3d..ce95e34 100644 --- a/src/redbook/src/glredbook10/stroke.java +++ b/src/redbook/src/glredbook10/stroke.java @@ -15,9 +15,9 @@ import java.nio.*; import com.jogamp.opengl.util.*;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
public class stroke//
extends GLSkeleton<GLJPanel>
diff --git a/src/redbook/src/glredbook10/tea.java b/src/redbook/src/glredbook10/tea.java index a73d0de..aebf9dd 100644 --- a/src/redbook/src/glredbook10/tea.java +++ b/src/redbook/src/glredbook10/tea.java @@ -5,8 +5,8 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import javax.swing.JFrame;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates two-sided lighting and compares it with one-sided
diff --git a/src/redbook/src/glredbook10/teaambient.java b/src/redbook/src/glredbook10/teaambient.java index 02c7b74..30f3eec 100644 --- a/src/redbook/src/glredbook10/teaambient.java +++ b/src/redbook/src/glredbook10/teaambient.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
/**
* This program renders three lighted, shaded teapots, with different ambient
diff --git a/src/redbook/src/glredbook10/teapots.java b/src/redbook/src/glredbook10/teapots.java index f49d882..f95d9fd 100644 --- a/src/redbook/src/glredbook10/teapots.java +++ b/src/redbook/src/glredbook10/teapots.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*;
import javax.swing.*;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
/**
* This program demonstrates lots of material properties. A single light source
diff --git a/src/redbook/src/glredbook10/texgen.java b/src/redbook/src/glredbook10/texgen.java index 4255a63..cc0c527 100644 --- a/src/redbook/src/glredbook10/texgen.java +++ b/src/redbook/src/glredbook10/texgen.java @@ -7,7 +7,7 @@ import java.nio.*; import com.jogamp.common.nio.Buffers;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
/**
* This program draws a texture mapped teapot with automatically generated
diff --git a/src/redbook/src/glredbook10/texturesurf.java b/src/redbook/src/glredbook10/texturesurf.java index ec376f2..6a29ba8 100644 --- a/src/redbook/src/glredbook10/texturesurf.java +++ b/src/redbook/src/glredbook10/texturesurf.java @@ -7,8 +7,8 @@ import java.awt.event.*; import java.nio.*;
import com.jogamp.common.nio.Buffers;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program uses evaluators to generate a curved surface and automatically
diff --git a/src/redbook/src/glredbook11/README.txt b/src/redbook/src/glredbook11/README.txt index 8225c0b..5d67114 100644 --- a/src/redbook/src/glredbook11/README.txt +++ b/src/redbook/src/glredbook11/README.txt @@ -4,7 +4,7 @@ These are port of the examples programs which are featured in the OpenGL Programming Guide, 2nd Edition corresponding
to OpenGL version 1.1.
-- All examples requires JDK 1.4.2 and javax.media.opengl (jogl)
+- All examples requires JDK 1.4.2 and com.jogamp.opengl (jogl)
and a system dependent jogl-natives-*.jar to compile.
- No ant build file is yet available.
diff --git a/src/redbook/src/glredbook11/aargb.java b/src/redbook/src/glredbook11/aargb.java index 71ae3b8..ee54edc 100644 --- a/src/redbook/src/glredbook11/aargb.java +++ b/src/redbook/src/glredbook11/aargb.java @@ -4,9 +4,9 @@ import glredbook10.GLSkeleton; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
- import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.*;
+ import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
import javax.swing.JFrame;
/**
diff --git a/src/redbook/src/glredbook11/hello.java b/src/redbook/src/glredbook11/hello.java index f7ddfb1..de7cc6d 100644 --- a/src/redbook/src/glredbook11/hello.java +++ b/src/redbook/src/glredbook11/hello.java @@ -3,15 +3,15 @@ package glredbook11; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;import javax.swing.JFrame;
+import com.jogamp.opengl.*;import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This is a simple, introductory OpenGL program in Java using the
- * javax.media.opengl extension library.
+ * com.jogamp.opengl extension library.
*
* @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes
*/
diff --git a/src/redbook/src/glredbook11/image.java b/src/redbook/src/glredbook11/image.java index 7c6d16b..dfddd4e 100644 --- a/src/redbook/src/glredbook11/image.java +++ b/src/redbook/src/glredbook11/image.java @@ -19,14 +19,14 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook11/polyoff.java b/src/redbook/src/glredbook11/polyoff.java index 4b192fd..d8f164f 100644 --- a/src/redbook/src/glredbook11/polyoff.java +++ b/src/redbook/src/glredbook11/polyoff.java @@ -5,13 +5,13 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.gl2.GLUT;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates polygon offset to draw a shaded polygon and its
diff --git a/src/redbook/src/glredbook11/tess.java b/src/redbook/src/glredbook11/tess.java index e2610fd..f855952 100644 --- a/src/redbook/src/glredbook11/tess.java +++ b/src/redbook/src/glredbook11/tess.java @@ -3,15 +3,15 @@ package glredbook11; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUtessellator;
-import javax.media.opengl.glu.GLUtessellatorCallback;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUtessellator;
+import com.jogamp.opengl.glu.GLUtessellatorCallback;
/**
* This program demonstrates polygon tessellation. Two tesselated objects are
diff --git a/src/redbook/src/glredbook11/tesswind.java b/src/redbook/src/glredbook11/tesswind.java index 548f519..e65e547 100644 --- a/src/redbook/src/glredbook11/tesswind.java +++ b/src/redbook/src/glredbook11/tesswind.java @@ -3,14 +3,14 @@ package glredbook11; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUtessellator;
-import javax.media.opengl.glu.GLUtessellatorCallback;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUtessellator;
+import com.jogamp.opengl.glu.GLUtessellatorCallback;
/**
* This program demonstrates the winding rule polygon tessellation property.
diff --git a/src/redbook/src/glredbook11/texbind.java b/src/redbook/src/glredbook11/texbind.java index ba29968..7334a70 100644 --- a/src/redbook/src/glredbook11/texbind.java +++ b/src/redbook/src/glredbook11/texbind.java @@ -6,12 +6,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates using glBindTexture() by creating and managing two
diff --git a/src/redbook/src/glredbook11/texgen.java b/src/redbook/src/glredbook11/texgen.java index c944454..66cfc44 100644 --- a/src/redbook/src/glredbook11/texgen.java +++ b/src/redbook/src/glredbook11/texgen.java @@ -6,13 +6,13 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.common.nio.Buffers;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* This program draws a texture mapped teapot with automatically generated
diff --git a/src/redbook/src/glredbook11/texprox.java b/src/redbook/src/glredbook11/texprox.java index 2004645..db2fdbf 100644 --- a/src/redbook/src/glredbook11/texprox.java +++ b/src/redbook/src/glredbook11/texprox.java @@ -5,7 +5,7 @@ import glredbook10.GLSkeleton; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
import javax.swing.JFrame;
/**
diff --git a/src/redbook/src/glredbook11/texsub.java b/src/redbook/src/glredbook11/texsub.java index 645745d..09f31b9 100644 --- a/src/redbook/src/glredbook11/texsub.java +++ b/src/redbook/src/glredbook11/texsub.java @@ -6,12 +6,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program texture maps a checkerboard image onto two rectangles. This
diff --git a/src/redbook/src/glredbook11/torus.java b/src/redbook/src/glredbook11/torus.java index 414d1f5..cf16c76 100644 --- a/src/redbook/src/glredbook11/torus.java +++ b/src/redbook/src/glredbook11/torus.java @@ -3,10 +3,10 @@ package glredbook11; import glredbook10.GLSkeleton;
import javax.swing.*;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import java.awt.event.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates the creation of a display list.
diff --git a/src/redbook/src/glredbook11/unproject.java b/src/redbook/src/glredbook11/unproject.java index 4f5514d..fcd7523 100644 --- a/src/redbook/src/glredbook11/unproject.java +++ b/src/redbook/src/glredbook11/unproject.java @@ -5,12 +5,12 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook11/varray.java b/src/redbook/src/glredbook11/varray.java index d235296..d9abbbd 100644 --- a/src/redbook/src/glredbook11/varray.java +++ b/src/redbook/src/glredbook11/varray.java @@ -9,12 +9,12 @@ import java.awt.event.MouseListener; import java.nio.FloatBuffer;
import java.nio.IntBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates vertex arrays.
diff --git a/src/redbook/src/glredbook11/wrap.java b/src/redbook/src/glredbook11/wrap.java index 47662a4..c5ee211 100644 --- a/src/redbook/src/glredbook11/wrap.java +++ b/src/redbook/src/glredbook11/wrap.java @@ -4,14 +4,14 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program texture maps a checkerboard image onto two rectangles. This
diff --git a/src/redbook/src/glredbook12x/blendeqn.java b/src/redbook/src/glredbook12x/blendeqn.java index 7b979fc..92b8e88 100644 --- a/src/redbook/src/glredbook12x/blendeqn.java +++ b/src/redbook/src/glredbook12x/blendeqn.java @@ -8,7 +8,7 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelListener;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel;
import javax.swing.JFrame;
/**
diff --git a/src/redbook/src/glredbook12x/colormatrix.java b/src/redbook/src/glredbook12x/colormatrix.java index 9f4748f..5fcf387 100644 --- a/src/redbook/src/glredbook12x/colormatrix.java +++ b/src/redbook/src/glredbook12x/colormatrix.java @@ -9,12 +9,12 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;import javax.swing.JFrame;
+import com.jogamp.opengl.*;import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
diff --git a/src/redbook/src/glredbook12x/colortable.java b/src/redbook/src/glredbook12x/colortable.java index 0564b26..d7bb245 100644 --- a/src/redbook/src/glredbook12x/colortable.java +++ b/src/redbook/src/glredbook12x/colortable.java @@ -9,13 +9,13 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;import javax.swing.JFrame;
+import com.jogamp.opengl.*;import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
diff --git a/src/redbook/src/glredbook12x/convolution.java b/src/redbook/src/glredbook12x/convolution.java index 9e6d72e..8481f67 100644 --- a/src/redbook/src/glredbook12x/convolution.java +++ b/src/redbook/src/glredbook12x/convolution.java @@ -10,14 +10,14 @@ import java.io.DataInputStream; import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Use various 2D convolutions filters to find edges in an image.
diff --git a/src/redbook/src/glredbook12x/histogram.java b/src/redbook/src/glredbook12x/histogram.java index 2fabe52..60cc178 100644 --- a/src/redbook/src/glredbook12x/histogram.java +++ b/src/redbook/src/glredbook12x/histogram.java @@ -10,14 +10,14 @@ import java.io.DataInputStream; import java.nio.ByteBuffer;
import java.nio.ShortBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Compute the histogram of the image. This program illustrates the use of the
diff --git a/src/redbook/src/glredbook12x/minmax.java b/src/redbook/src/glredbook12x/minmax.java index 6f35328..2cf39f7 100644 --- a/src/redbook/src/glredbook12x/minmax.java +++ b/src/redbook/src/glredbook12x/minmax.java @@ -9,13 +9,13 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;import javax.swing.JFrame;
+import com.jogamp.opengl.*;import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
/**
* Determine the minimum and maximum values of a group of pixels. This
diff --git a/src/redbook/src/glredbook12x/multitex.java b/src/redbook/src/glredbook12x/multitex.java index f243739..9c57851 100644 --- a/src/redbook/src/glredbook12x/multitex.java +++ b/src/redbook/src/glredbook12x/multitex.java @@ -9,12 +9,12 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
*
diff --git a/src/redbook/src/glredbook12x/quadric.java b/src/redbook/src/glredbook12x/quadric.java index 7c8e0e8..fc2653b 100644 --- a/src/redbook/src/glredbook12x/quadric.java +++ b/src/redbook/src/glredbook12x/quadric.java @@ -8,11 +8,11 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUquadric;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUquadric;
import javax.swing.JFrame;
/**
diff --git a/src/redbook/src/glredbook12x/texture3d.java b/src/redbook/src/glredbook12x/texture3d.java index 240ca0b..5512376 100644 --- a/src/redbook/src/glredbook12x/texture3d.java +++ b/src/redbook/src/glredbook12x/texture3d.java @@ -7,14 +7,14 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates using a three-dimensional texture. It creates a 3D
diff --git a/src/redbook/src/glredbook1314/combiner.java b/src/redbook/src/glredbook1314/combiner.java index bf34c23..41dc49d 100644 --- a/src/redbook/src/glredbook1314/combiner.java +++ b/src/redbook/src/glredbook1314/combiner.java @@ -4,14 +4,14 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.opengl.util.GLBuffers;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program renders a variety of quads showing different effects of texture
diff --git a/src/redbook/src/glredbook1314/cubemap.java b/src/redbook/src/glredbook1314/cubemap.java index 0b0c03a..af3529a 100644 --- a/src/redbook/src/glredbook1314/cubemap.java +++ b/src/redbook/src/glredbook1314/cubemap.java @@ -4,15 +4,15 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.ByteBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
import com.jogamp.opengl.util.*;
import com.jogamp.opengl.util.gl2.GLUT;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates cube map textures. Six different colored checker
diff --git a/src/redbook/src/glredbook1314/fogcoord.java b/src/redbook/src/glredbook1314/fogcoord.java index a72273e..ea897aa 100644 --- a/src/redbook/src/glredbook1314/fogcoord.java +++ b/src/redbook/src/glredbook1314/fogcoord.java @@ -3,13 +3,13 @@ package glredbook1314; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLU;
/**
diff --git a/src/redbook/src/glredbook1314/multisamp.java b/src/redbook/src/glredbook1314/multisamp.java index 16eb43c..0371982 100644 --- a/src/redbook/src/glredbook1314/multisamp.java +++ b/src/redbook/src/glredbook1314/multisamp.java @@ -3,12 +3,12 @@ package glredbook1314; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLU;
/**
* This program draws shows how to use multisampling to draw anti-aliased
diff --git a/src/redbook/src/glredbook1314/mvarray.java b/src/redbook/src/glredbook1314/mvarray.java index e97d2aa..dc011bb 100644 --- a/src/redbook/src/glredbook1314/mvarray.java +++ b/src/redbook/src/glredbook1314/mvarray.java @@ -8,13 +8,13 @@ import java.awt.event.KeyListener; import java.nio.ByteBuffer;
import java.nio.IntBuffer;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import com.jogamp.common.nio.PointerBuffer;
import com.jogamp.common.nio.Buffers;
import com.jogamp.opengl.util.GLBuffers;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates multiple vertex arrays, specifically the OpenGL
@@ -81,7 +81,7 @@ public class mvarray // /*
* (non-Javadoc)
*
- * @see javax.media.opengl.GLEventListener#display(javax.media.opengl.GLAutoDrawable)
+ * @see com.jogamp.opengl.GLEventListener#display(com.jogamp.opengl.GLAutoDrawable)
*/
public void display(GLAutoDrawable drawable) {
final GL2 gl = drawable.getGL().getGL2();
@@ -104,7 +104,7 @@ public class mvarray // /*
* (non-Javadoc)
*
- * @see javax.media.opengl.GLEventListener#displayChanged(javax.media.opengl.GLAutoDrawable,
+ * @see com.jogamp.opengl.GLEventListener#displayChanged(com.jogamp.opengl.GLAutoDrawable,
* boolean, boolean)
*/
public void displayChanged(GLAutoDrawable drawable, boolean modeChanged,
@@ -114,7 +114,7 @@ public class mvarray // /*
* (non-Javadoc)
*
- * @see javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable)
+ * @see com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable)
*/
public void init(GLAutoDrawable drawable) {
final GL2 gl = drawable.getGL().getGL2();
@@ -132,7 +132,7 @@ public class mvarray // /*
* (non-Javadoc)
*
- * @see javax.media.opengl.GLEventListener#reshape(javax.media.opengl.GLAutoDrawable,
+ * @see com.jogamp.opengl.GLEventListener#reshape(com.jogamp.opengl.GLAutoDrawable,
* int, int, int, int)
*/
public void reshape(GLAutoDrawable drawable, int x, int y, //
diff --git a/src/redbook/src/glredbook1314/pointp.java b/src/redbook/src/glredbook1314/pointp.java index dedfaf9..f9b6a08 100644 --- a/src/redbook/src/glredbook1314/pointp.java +++ b/src/redbook/src/glredbook1314/pointp.java @@ -3,12 +3,12 @@ package glredbook1314; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
import javax.swing.JFrame;
import glredbook10.GLSkeleton;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.glu.GLU;
/**
* This program demonstrates point parameters and their effect on point
diff --git a/src/redbook/src/glredbook1314/shadowmap.java b/src/redbook/src/glredbook1314/shadowmap.java index f20b9d2..28759d0 100644 --- a/src/redbook/src/glredbook1314/shadowmap.java +++ b/src/redbook/src/glredbook1314/shadowmap.java @@ -4,7 +4,7 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener;
import java.nio.FloatBuffer;
-import javax.media.opengl.*; import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JFrame;
@@ -14,7 +14,7 @@ import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.gl2.GLUT;
import glredbook10.GLSkeleton;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLU;
public class shadowmap //
|