summaryrefslogtreecommitdiffstats
path: root/src/demos/cubefbo
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-05-17 13:44:03 +0200
committerSven Gothel <[email protected]>2011-05-17 13:44:03 +0200
commit9a9f75a43f6c21d35bd5b59c4254e64331ce33ec (patch)
tree393b147075e8cf2cefb46a08c6be70ba087e59c7 /src/demos/cubefbo
parentf3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 (diff)
sync w/ JOGL 526ea7a3fb579f88a0c0a1e597387aae29d5aa06
Diffstat (limited to 'src/demos/cubefbo')
-rwxr-xr-xsrc/demos/cubefbo/FBCubes.java14
1 files changed, 8 insertions, 6 deletions
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);
}