Merged JSR-231 branch on to the main JOGL trunk. The main trunk now

contains the evolving JSR-231 Reference Implementation and the JSR-231
branch is permanently closed.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@144 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

1 files changed, 14 insertions, 12 deletions

diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java
index 1789575..96f5684 100644
--- a/src/gleem/TestTranslate2.java
+++ b/src/gleem/TestTranslate2.java
@@ -41,7 +41,9 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests the Translate2 Manip. */
@@ -51,21 +53,19 @@ public class TestTranslate2 {
   private static final int Y_SIZE = 400;
 
   static class Listener implements GLEventListener {
-    private GL gl;
-    private GLU glu;
+    private GLU glu = new GLU();
     private CameraParameters params = new CameraParameters();
 
-    public void init(GLDrawable drawable) {
-      gl = drawable.getGL();
-      glu = drawable.getGLU();
+    public void init(GLAutoDrawable drawable) {
+      GL gl = drawable.getGL();
 
       gl.glClearColor(0, 0, 0, 0);
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
@@ -96,13 +96,15 @@ public class TestTranslate2 {
       manager.showManipInWindow(manip, drawable);
     }
 
-    public void display(GLDrawable drawable) {
+    public void display(GLAutoDrawable drawable) {
+      GL gl = drawable.getGL();
       gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
       ManipManager.getManipManager().updateCameraParameters(drawable, params);
       ManipManager.getManipManager().render(drawable, gl);
     }
 
-    public void reshape(GLDrawable drawable, int x, int y, int w, int h) {
+    public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) {
+      GL gl = drawable.getGL();
       float aspect, theta;
       aspect = (float) w / (float) h;
       if (w >= h)
@@ -121,7 +123,7 @@ public class TestTranslate2 {
     }
 
     // Unused routines
-    public void displayChanged(GLDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
+    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
   }
 
   public static void main(String[] args) {