From 02510865a2ff5468f11df23afcba370789fc6372 Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Sun, 25 Sep 2005 07:26:00 +0000 Subject: Changed GLU to be a single class rather than a separate interface and implementing class. Broke dependence from GLContext and GLAutoDrawable down to GLU package; removed getGLU()/setGLU() routines. A GLU object may now be instantiated via "new GLU()" at any point in the program. When routines on it are called which require an OpenGL context, the GLU implementation fetches the current GLContext and the GL object from within it to do its work via the new public API GLU.getCurrentGL(). This avoids needing to pass down a GL object everywhere or to tie the GLU object to a particular GL object. Restructured GLUT implementation similarly so GL and GLU objects do not need to be passed to it as arguments any more. Restructured all demos to conform to new APIs. Fixed bugs in GlueGen around new functionality of being able to emit only an implementing class with no associated interface. Deleted obsolete GLU-related .cfg files. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@135 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4 --- src/demos/proceduralTexturePhysics/Water.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/demos/proceduralTexturePhysics/Water.java') diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java index d0585fc..404d012 100644 --- a/src/demos/proceduralTexturePhysics/Water.java +++ b/src/demos/proceduralTexturePhysics/Water.java @@ -63,6 +63,8 @@ public class Water { // used to render the water geometry (with the parent drawable's GL // object). + private GLU glu = new GLU(); + // Rendering modes public static final int CA_FULLSCREEN_REFLECT = 0; public static final int CA_FULLSCREEN_FORCE = 1; @@ -424,9 +426,8 @@ public class Water { class Listener implements GLEventListener { public void init(GLAutoDrawable drawable) { GL gl = drawable.getGL(); - GLU glu = drawable.getGLU(); - initOpenGL(gl, glu); + initOpenGL(gl); } public void display(GLAutoDrawable drawable) { @@ -488,7 +489,7 @@ public class Water { initialMapDimensions[1] = initialMap.getHeight(); } - private void initOpenGL(GL gl, GLU glu) { + private void initOpenGL(GL gl) { loadTextures(gl, tmpSpinFilename, tmpDropletFilename, tmpCubeMapFilenamePattern); tmpSpinFilename = null; tmpDropletFilename = null; -- cgit v1.2.3