From 9a9f75a43f6c21d35bd5b59c4254e64331ce33ec Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 17 May 2011 13:44:03 +0200 Subject: sync w/ JOGL 526ea7a3fb579f88a0c0a1e597387aae29d5aa06 --- src/demos/cubefbo/FBCubes.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/demos/cubefbo/FBCubes.java') diff --git a/src/demos/cubefbo/FBCubes.java b/src/demos/cubefbo/FBCubes.java index 76beb3c..765c37f 100755 --- a/src/demos/cubefbo/FBCubes.java +++ b/src/demos/cubefbo/FBCubes.java @@ -63,9 +63,11 @@ class FBCubes implements GLEventListener, MouseListener, MouseMotionListener { GL2 gl = drawable.getGL().getGL2(); // drawable.setGL(new DebugGL2(gl)); // gl = drawable.getGL().getGL2(); - fbo1.init(gl, gl.GL_NEAREST, gl.GL_NEAREST, 0, 0); + fbo1.init(gl); + fbo1.attachTexture2D(gl, 0, gl.GL_NEAREST, gl.GL_NEAREST, 0, 0); fbo1.unbind(gl); - fbo2.init(gl, gl.GL_NEAREST, gl.GL_NEAREST, 0, 0); + fbo2.init(gl); + fbo2.attachTexture2D(gl, 0, gl.GL_NEAREST, gl.GL_NEAREST, 0, 0); fbo2.unbind(gl); } @@ -113,10 +115,10 @@ class FBCubes implements GLEventListener, MouseListener, MouseMotionListener { for (int i = 0; i < MAX_ITER; i++) { rend.bind(gl); gl.glEnable (GL.GL_TEXTURE_2D); - gl.glBindTexture(GL.GL_TEXTURE_2D, tex.getTextureName()); // to use it .. + tex.use(gl, 0); cubeMiddle.reshape(gl, 0, 0, FBO_SIZE, FBO_SIZE); cubeMiddle.display(gl, xRot, yRot); - gl.glBindTexture(GL.GL_TEXTURE_2D, 0); + tex.unuse(gl); gl.glDisable (GL.GL_TEXTURE_2D); rend.unbind(gl); FBObject tmp = tex; @@ -132,10 +134,10 @@ class FBCubes implements GLEventListener, MouseListener, MouseMotionListener { gl.glClearColor(0, 0, 0, 1); gl.glEnable (GL.GL_TEXTURE_2D); - gl.glBindTexture(GL.GL_TEXTURE_2D, tex.getTextureName()); // to use it .. + tex.use(gl, 0); cubeOuter.display(gl, xRot, yRot); // System.out.println("display .. p8"); - gl.glBindTexture(GL.GL_TEXTURE_2D, 0); + tex.unuse(gl); gl.glDisable (GL.GL_TEXTURE_2D); } -- cgit v1.2.3