diff options
| author | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
| commit | f3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 (patch) | |
| tree | e7aaef0c1860f35f6b1e115489e134ae7df6d07c /src/demos/vertexProgRefract | |
| parent | a7317cf820a33cac7f068153649031483df53cac (diff) | |
sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74
Diffstat (limited to 'src/demos/vertexProgRefract')
| -rw-r--r-- | src/demos/vertexProgRefract/VertexProgRefract.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java index cac8d5a..9915fae 100644 --- a/src/demos/vertexProgRefract/VertexProgRefract.java +++ b/src/demos/vertexProgRefract/VertexProgRefract.java @@ -299,10 +299,10 @@ public class VertexProgRefract extends Demo { gl.glProgramEnvParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 3, 0.0f, 1.0f, 2.0f, 3.0f); // misc constants try { - cubemap = Cubemap.loadFromStreams(getClass().getClassLoader(), + cubemap = Cubemap.loadFromStreams(gl, + getClass().getClassLoader(), "demos/data/cubemaps/uffizi_", - "png", - true); + "png", true); } catch (IOException e) { shutdownDemo(); throw new RuntimeException(e); @@ -403,15 +403,15 @@ public class VertexProgRefract extends Demo { // set texture transforms gl.glActiveTexture(GL.GL_TEXTURE0); - cubemap.bind(); - cubemap.enable(); + cubemap.bind(gl); + cubemap.enable(gl); gl.glMatrixMode(GL.GL_TEXTURE); gl.glLoadIdentity(); viewer.updateInverseRotation(gl); gl.glActiveTexture(GL.GL_TEXTURE1); - cubemap.bind(); - cubemap.enable(); + cubemap.bind(gl); + cubemap.enable(gl); gl.glMatrixMode(GL.GL_TEXTURE); gl.glLoadIdentity(); viewer.updateInverseRotation(gl); @@ -617,8 +617,8 @@ public class VertexProgRefract extends Demo { gl.glDisable(GL.GL_TEXTURE_CUBE_MAP); gl.glActiveTexture(GL.GL_TEXTURE0); - cubemap.bind(); - cubemap.enable(); + cubemap.bind(gl); + cubemap.enable(gl); // This is a workaround for a driver bug on Mac OS X where the // normals are not being sent down to the hardware in |