Added output support to TGAImage, SGIImage and newly-renamed DDSImage

classes. Added support to TextureIO for writing textures back to disk
via new TextureWriter plug-in interface. Added TextureConvert demo
which shows how an application might convert between arbitrary file
formats using these APIs, including automatic compression to DXT3
format when available.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@164 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

3 files changed, 108 insertions, 19 deletions

diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java
index 1ef0074..923fbd6 100755
--- a/src/demos/texture/TestTexture.java
+++ b/src/demos/texture/TestTexture.java
@@ -1,5 +1,4 @@
 /*
-
  * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
new file mode 100755
index 0000000..b0c6bbd
--- /dev/null
+++ b/src/demos/texture/TextureConvert.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * - Redistribution of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 
+ * - Redistribution in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+ * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ * 
+ * Sun gratefully acknowledges that this software was originally authored
+ * and developed by Kenneth Bradley Russell and Christopher John Kline.
+ */
+
+package demos.texture;
+
+import java.io.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
+import com.sun.opengl.utils.*;
+
+/** Demonstrates how the TextureIO subsystem may be used to convert
+    textures between multiple file formats, including texture
+    compression where available. */
+
+public class TextureConvert {
+  public static void main(String[] args) throws IOException {
+    if (args.length != 2) {
+      System.out.println("Usage: java demos.texture.TextureConvert [input file] [output file]");
+      System.out.println("Converts texture from input file format to output file format.");
+      System.out.println("If output file format is DDS, compresses texture with DXT3 compression");
+      System.out.println("if available.");
+      System.exit(1);
+    }
+
+    String inputFile  = args[0];
+    String outputFile = args[1];
+
+    // Make a pbuffer to get an offscreen context
+    if (!GLDrawableFactory.getFactory().canCreateGLPbuffer()) {
+      System.out.println("Pbuffer support not available (required to run this demo)");
+      System.exit(1);
+    }
+    GLPbuffer pbuffer = GLDrawableFactory.getFactory().createGLPbuffer(new GLCapabilities(), null, 2, 2, null);
+    pbuffer.getContext().makeCurrent();
+    GL gl = pbuffer.getGL();
+
+    boolean attemptCompression = false;
+    if (TextureIO.DDS.equals(TextureIO.getFileSuffix(outputFile))) {
+      if (gl.isExtensionAvailable("GL_EXT_texture_compression_s3tc") ||
+          gl.isExtensionAvailable("GL_NV_texture_compression_vtc")) {
+        attemptCompression = true;
+      }
+    }
+
+    TextureData inputData = TextureIO.newTextureData(new File(inputFile), false, null);
+    if (attemptCompression && !inputData.isDataCompressed()) {
+      inputData.setInternalFormat(GL.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
+    }
+    Texture tex = TextureIO.newTexture(inputData);
+
+    // Now read it back and save to the output file
+    TextureIO.write(tex, new File(outputFile));
+  }
+}
diff --git a/src/demos/util/DxTex.java b/src/demos/util/DxTex.java
index aecfe99..2fb65de 100644
--- a/src/demos/util/DxTex.java
+++ b/src/demos/util/DxTex.java
@@ -50,7 +50,7 @@ import javax.swing.filechooser.*;
 import com.sun.opengl.utils.*;
 
 /** Simplified clone of DxTex tool from the DirectX SDK, written in
-    Java using the DDSReader; tests fetching of texture data */
+    Java using the DDSImage; tests fetching of texture data */
 
 public class DxTex {
   private InternalFrameListener frameListener;
@@ -201,9 +201,8 @@ public class DxTex {
 
   private void openFile(File file) {
     try {
-      DDSReader reader = new DDSReader();
-      reader.loadFile(file.getAbsolutePath());
-      showImage(file.getName(), reader, 0);
+      DDSImage image = DDSImage.read(file);
+      showImage(file.getName(), image, 0);
     } catch (IOException e) {
       showMessageDialog("Error while opening file:" + endl +
                         exceptionToString(e),
@@ -216,9 +215,9 @@ public class DxTex {
   // Image display
   //
 
-  private void showImage(String filename, DDSReader reader, int mipMapLevel) {
+  private void showImage(String filename, DDSImage image, int mipMapLevel) {
     try {
-      ImageFrame fr = new ImageFrame(filename, reader, mipMapLevel);
+      ImageFrame fr = new ImageFrame(filename, image, mipMapLevel);
       desktop.add(fr);
       fr.show();
     } catch (Exception e) {
@@ -231,16 +230,16 @@ public class DxTex {
 
   class ImageFrame extends JInternalFrame {
     private String filename;
-    private DDSReader reader;
+    private DDSImage image;
     private int mipMapLevel;
     private int curWidth;
     private int curHeight;
     private JLabel label;
 
-    ImageFrame(String filename, DDSReader reader, int mipMapLevel) {
+    ImageFrame(String filename, DDSImage image, int mipMapLevel) {
       super();
       this.filename = filename;
-      this.reader = reader;
+      this.image = image;
 
       addInternalFrameListener(frameListener);
       label = new JLabel();
@@ -254,7 +253,7 @@ public class DxTex {
     }
 
     int getNumMipMaps() {
-      return reader.getNumMipMaps();
+      return image.getNumMipMaps();
     }
 
     void setMipMapLevel(int level) {
@@ -265,13 +264,13 @@ public class DxTex {
 
     void close() {
       System.err.println("Closing files");
-      reader.close();
+      image.close();
     }
 
     private void computeImage() {
       // Get image data
-      reader.getNumMipMaps();
-      DDSReader.ImageInfo info = reader.getMipMap(mipMapLevel);
+      image.getNumMipMaps();
+      DDSImage.ImageInfo info = image.getMipMap(mipMapLevel);
       int width = info.getWidth();
       int height = info.getHeight();
       curWidth = width;
@@ -284,13 +283,13 @@ public class DxTex {
       WritableRaster dst = img.getRaster();
 
       int skipSize;
-      if (reader.getPixelFormat() == DDSReader.D3DFMT_A8R8G8B8) {
+      if (image.getPixelFormat() == DDSImage.D3DFMT_A8R8G8B8) {
         skipSize = 4;
-      } else if (reader.getPixelFormat() == DDSReader.D3DFMT_R8G8B8) {
+      } else if (image.getPixelFormat() == DDSImage.D3DFMT_R8G8B8) {
         skipSize = 3;
       } else {
-        reader.close();
-        throw new RuntimeException("Unsupported pixel format " + reader.getPixelFormat());        
+        image.close();
+        throw new RuntimeException("Unsupported pixel format " + image.getPixelFormat());        
       }
 
       for (int y = 0; y < height; y++) {
@@ -309,7 +308,7 @@ public class DxTex {
     private void resetTitle() {
       setTitle(filename + " (" + curWidth + "x" + curHeight +
                ", mipmap " + (1 + mipMapLevel) + " of " +
-               reader.getNumMipMaps() + ")");
+               image.getNumMipMaps() + ")");
     }
   }