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, 7 insertions, 8 deletions

diff --git a/src/demos/multisample/Multisample.java b/src/demos/multisample/Multisample.java
index f479b0e..ff7d7ca 100755
--- a/src/demos/multisample/Multisample.java
+++ b/src/demos/multisample/Multisample.java
@@ -41,7 +41,8 @@ package demos.multisample;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 public class Multisample {
   private GLCanvas canvas;
@@ -83,7 +84,7 @@ public class Multisample {
 
     caps.setSampleBuffers(true);
     caps.setNumSamples(4);
-    canvas = GLDrawableFactory.getFactory().createGLCanvas(caps, chooser);
+    canvas = GLDrawableFactory.getFactory().createGLCanvas(caps, chooser, null, null);
     canvas.addGLEventListener(new Listener());
     
     Frame frame = new Frame("Full-scene antialiasing");
@@ -123,9 +124,8 @@ public class Multisample {
   }
 
   class Listener implements GLEventListener {
-    public void init(GLDrawable drawable) {
+    public void init(GLAutoDrawable drawable) {
       GL gl = drawable.getGL();
-      GLU glu = drawable.getGLU();
 
       gl.glClearColor(0, 0, 0, 0);
       //      gl.glEnable(GL.GL_DEPTH_TEST);
@@ -138,9 +138,8 @@ public class Multisample {
       gl.glOrtho(-1, 1, -1, 1, -1, 1);
     }
 
-    public void display(GLDrawable drawable) {
+    public void display(GLAutoDrawable drawable) {
       GL gl = drawable.getGL();
-      GLU glu = drawable.getGLU();
 
       gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
 
@@ -161,8 +160,8 @@ public class Multisample {
     }
 
     // Unused routines
-    public void reshape(GLDrawable drawable, int x, int y, int width, int height) {}
-    public void displayChanged(GLDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
+    public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {}
+    public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {}
   }
 
   private void runExit() {