2nd big refactoring.

Goals are orthogonal components for:
	- OS Windowing system
		- NEWT, X11, Windows, MacOsX
	- GL Windowing GLUE
		- EGL, GLX, WGL, CGL
	- GL profiles
	- core and util packages
	- generate all Java components from any platform

All above goals are achieved.

TODO:

- Native compilation fix and test
- Check/Fix Win32, MacOSX and the mobile devices
- ..


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1670 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 20 insertions, 6 deletions

diff --git a/src/classes/javax/media/opengl/glu/GLUquadric.java b/src/classes/javax/media/opengl/glu/GLUquadric.java
index 882df6cb6..937d77f8b 100755
--- a/src/classes/javax/media/opengl/glu/GLUquadric.java
+++ b/src/classes/javax/media/opengl/glu/GLUquadric.java
@@ -1,19 +1,33 @@
 package javax.media.opengl.glu;
 
-import javax.media.opengl.GL;
-import com.sun.opengl.util.ImmModeSink;
+import javax.media.opengl.GL2ES1;
+import javax.media.opengl.util.ImmModeSink;
 
 /**
  * Wrapper for a GLU quadric object.
  */
 
 public interface GLUquadric {
+    // enable/disables the Immediate Mode Sink module.
+    // This defaults to false for GLUgl2,
+    // and is always true for GLUes1.
+    public void enableImmModeSink(boolean val);
+
+    public boolean isImmModeSinkEnabled();
+
+    // set Immediate Mode usage.
+    // This defaults to false at GLU creation time.
+    // If enabled rendering will happen immediately,
+    // otherwise rendering will be hold in the ImmModeSink
+    // object, to be rendered deferred.
+    public void setImmMode(boolean val);
+
+    public boolean getImmMode();
+
     // creates a new ImmModeSink (VBO Buffers) and
     // returns the old vbo buffer with it's rendering result
-    public ImmModeSink replaceVBOBuffer();
-
-    public void setVBOImmediateMode(boolean val);
+    public ImmModeSink replaceImmModeSink();
 
     // gl may be null, then the GL client states are not disabled
-    public void resetVBOBuffer(GL gl);
+    public void resetImmModeSink(GL2ES1 gl);
 }