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/util/Cubemap.java | |
parent | a7317cf820a33cac7f068153649031483df53cac (diff) |
sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74
Diffstat (limited to 'src/demos/util/Cubemap.java')
-rwxr-xr-x | src/demos/util/Cubemap.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java index 9f31b9a..5ceab82 100755 --- a/src/demos/util/Cubemap.java +++ b/src/demos/util/Cubemap.java @@ -62,10 +62,10 @@ public class Cubemap { GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z }; - public static Texture loadFromStreams(ClassLoader scope, + public static Texture loadFromStreams(GL gl, + ClassLoader scope, String basename, - String suffix, - boolean mipmapped) throws IOException, GLException { + String suffix, boolean mipmapped) throws IOException, GLException { Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP); for (int i = 0; i < suffixes.length; i++) { @@ -76,7 +76,7 @@ public class Cubemap { if (data == null) { throw new IOException("Unable to load texture " + resourceName); } - cubemap.updateImage(data, targets[i]); + cubemap.updateImage(gl, data, targets[i]); } return cubemap; |