summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-01-07 01:13:46 +0000
committerKenneth Russel <[email protected]>2006-01-07 01:13:46 +0000
commitecb75532f0c488031d49935d1a7116be07544270 (patch)
treef9a3f732852824a4c79cdfd50c08be941a733e1d /src
parent70c36cd428912af7cd4528e53957c45cf1886696 (diff)
Fixed mipmap handling in TextureIO and associated classes. Top-level
mipmap argument is now a boolean indicating whether mipmaps should be generated or used if available. Added mipmap argument to newTexture APIs. Added support for reading mipmaps from files which support them, in particular DDS files. Updated TestTexture demo to generate mipmaps. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@162 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src')
-rwxr-xr-xsrc/demos/data/images/test_texture_dxt3_mipmap.ddsbin0 -> 87536 bytes
-rwxr-xr-xsrc/demos/texture/TestTexture.java2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/demos/data/images/test_texture_dxt3_mipmap.dds b/src/demos/data/images/test_texture_dxt3_mipmap.dds
new file mode 100755
index 0000000..c58a396
--- /dev/null
+++ b/src/demos/data/images/test_texture_dxt3_mipmap.dds
Binary files differ
diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java
index 8ca89e2..cd71a3a 100755
--- a/src/demos/texture/TestTexture.java
+++ b/src/demos/texture/TestTexture.java
@@ -165,7 +165,7 @@ public class TestTexture implements GLEventListener {
try {
System.err.println("Loading texture...");
- texture = TextureIO.newTexture(file);
+ texture = TextureIO.newTexture(file, true);
} catch (IOException e) {
e.printStackTrace();
ByteArrayOutputStream bos = new ByteArrayOutputStream();