diff options
15 files changed, 377 insertions, 13 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 804a29b55..9a4ad8b8e 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -150,7 +150,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/*"/> + value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/* jogamp/opengl/util/pngj/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/> diff --git a/make/build-test.xml b/make/build-test.xml index 0a290dcea..96b3f08a4 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -47,6 +47,8 @@ <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build.test}" /> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> <fileset file="${jogl.test.jar}" /> </delete> @@ -534,6 +536,8 @@ <mkdir dir="${build}/test/results-x32"/> <move todir="${build}/test/results-x32"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <move todir="${build}/test/results-x32"> @@ -864,6 +868,8 @@ ${line.separator} <fileset dir="${results.test}" includes="**"/> <fileset dir="${build}/test/results-x32" includes="**"/> <fileset file="${build}/${test.archive.name}.7z"/> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </delete> <mkdir dir="${results.test}" /> @@ -879,6 +885,8 @@ ${line.separator} <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -887,6 +895,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.newt" depends="junit.run.settings, junit.run.remote.ssh.newt"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -895,6 +905,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.awt" depends="junit.run.settings, junit.run.remote.ssh.awt"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -903,6 +915,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.all" depends="junit.run.settings, junit.run.remote.ssh.all"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 81ff3b7ac..248663a96 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -238,7 +238,8 @@ function testawtswt() { #testnoawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestGLReadBufferUtilTextureIOWrite01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestGLReadBufferUtilTextureIOWrite02NEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* +testnoawt com.jogamp.opengl.test.junit.jogl.util.TestPNGImage01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* # # awt (testawt) diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java index 89d840ac7..16e031f05 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java @@ -64,6 +64,7 @@ import jogamp.opengl.Debug; import com.jogamp.common.util.IOUtil; import com.jogamp.opengl.util.texture.spi.DDSImage; import com.jogamp.opengl.util.texture.spi.NetPbmTextureWriter; +import com.jogamp.opengl.util.texture.spi.PNGImage; import com.jogamp.opengl.util.texture.spi.SGIImage; import com.jogamp.opengl.util.texture.spi.TGAImage; import com.jogamp.opengl.util.texture.spi.TextureProvider; @@ -775,6 +776,7 @@ public class TextureIO { } // Other special-case providers + addTextureProvider(new PNGTextureProvider()); addTextureProvider(new DDSTextureProvider()); addTextureProvider(new SGITextureProvider()); addTextureProvider(new TGATextureProvider()); @@ -798,6 +800,7 @@ public class TextureIO { } // Other special-case writers + addTextureWriter(new PNGTextureWriter()); addTextureWriter(new DDSTextureWriter()); addTextureWriter(new SGITextureWriter()); addTextureWriter(new TGATextureWriter()); @@ -1102,7 +1105,44 @@ public class TextureIO { pixelFormat = image.getGLFormat(); } if (internalFormat == 0) { - if(glp.isGL2()) { + if(glp.isGL2GL3()) { + internalFormat = GL.GL_RGBA8; + } else { + internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB; + } + } + return new TextureData(glp, internalFormat, + image.getWidth(), + image.getHeight(), + 0, + pixelFormat, + GL.GL_UNSIGNED_BYTE, + mipmap, + false, + false, + image.getData(), + null); + } + + return null; + } + } + + //---------------------------------------------------------------------- + // PNG image provider + static class PNGTextureProvider extends StreamBasedTextureProvider { + public TextureData newTextureData(GLProfile glp, InputStream stream, + int internalFormat, + int pixelFormat, + boolean mipmap, + String fileSuffix) throws IOException { + if (PNG.equals(fileSuffix)) { + PNGImage image = PNGImage.read(/*glp, */ stream); + if (pixelFormat == 0) { + pixelFormat = image.getGLFormat(); + } + if (internalFormat == 0) { + if(glp.isGL2GL3()) { internalFormat = GL.GL_RGBA8; } else { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB; @@ -1268,6 +1308,61 @@ public class TextureIO { } //---------------------------------------------------------------------- + // PNG texture writer + + static class PNGTextureWriter implements TextureWriter { + public boolean write(File file, TextureData data) throws IOException { + if (PNG.equals(IOUtil.getFileSuffix(file))) { + // See whether the PNG writer can handle this TextureData + int pixelFormat = data.getPixelFormat(); + int pixelType = data.getPixelType(); + boolean reversedChannels; + int bytesPerPixel; + switch(pixelFormat) { + case GL.GL_RGB: + reversedChannels=false; + bytesPerPixel=3; + break; + case GL.GL_RGBA: + reversedChannels=false; + bytesPerPixel=4; + break; + case GL2.GL_BGR: + reversedChannels=true; + bytesPerPixel=3; + break; + case GL.GL_BGRA: + reversedChannels=true; + bytesPerPixel=4; + break; + default: + reversedChannels=false; + bytesPerPixel=-1; + break; + } + if ( 1 < bytesPerPixel && + (pixelType == GL.GL_BYTE || + pixelType == GL.GL_UNSIGNED_BYTE)) { + + ByteBuffer buf = (ByteBuffer) data.getBuffer(); + if (null == buf) { + buf = (ByteBuffer) data.getMipmapData()[0]; + } + buf.rewind(); + + PNGImage image = PNGImage.createFromData(data.getWidth(), data.getHeight(), -1f, -1f, + bytesPerPixel, reversedChannels, buf); + image.write(file, true); + return true; + } + throw new IOException("PNG writer doesn't support this pixel format 0x"+Integer.toHexString(pixelFormat)+ + " / type 0x"+Integer.toHexString(pixelFormat)+" (only GL_RGB/A, GL_BGR/A + bytes)"); + } + return false; + } + } + + //---------------------------------------------------------------------- // Helper routines // diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java index 674e53182..306e7d2fe 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java @@ -52,6 +52,7 @@ import java.nio.channels.FileChannel; import javax.media.opengl.GL; +import com.jogamp.common.util.IOUtil; import com.jogamp.opengl.util.GLBuffers; /** A reader and writer for DirectDraw Surface (.dds) files, which are @@ -281,7 +282,7 @@ public class DDSImage { * @throws java.io.IOException if an I/O exception occurred */ public void write(File file) throws IOException { - FileOutputStream stream = new FileOutputStream(file); + FileOutputStream stream = IOUtil.getFileOutputStream(file, true); FileChannel chan = stream.getChannel(); // Create ByteBuffer for header in case the start of our // ByteBuffer isn't actually memory-mapped diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java index 216c994c0..c2b131b97 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java @@ -138,7 +138,7 @@ public class NetPbmTextureWriter implements TextureWriter { throw new IOException("NetPbmTextureWriter magic 6 (PPM) doesn't RGBA pixel format, use magic 7 (PAM)"); } - FileOutputStream fos = new FileOutputStream(file); + FileOutputStream fos = IOUtil.getFileOutputStream(file, true); StringBuilder header = new StringBuilder(); header.append("P"); diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java new file mode 100644 index 000000000..a89418f84 --- /dev/null +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java @@ -0,0 +1,172 @@ +package com.jogamp.opengl.util.texture.spi; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; + +import javax.media.opengl.GL; + +import jogamp.opengl.util.pngj.ImageInfo; +import jogamp.opengl.util.pngj.ImageLine; +import jogamp.opengl.util.pngj.PngReader; +import jogamp.opengl.util.pngj.PngWriter; +import jogamp.opengl.util.pngj.chunks.PngChunkTextVar; + +import com.jogamp.common.nio.Buffers; +import com.jogamp.common.util.IOUtil; + + +public class PNGImage { + /** Creates a PNGImage from data supplied by the end user. Shares + data with the passed ByteBuffer. Assumes the data is already in + the correct byte order for writing to disk, i.e., RGB or RGBA bottom-to-top (OpenGL coord). */ + public static PNGImage createFromData(int width, int height, double dpiX, double dpiY, + int bytesPerPixel, boolean reversedChannels, ByteBuffer data) { + return new PNGImage(width, height, dpiX, dpiY, bytesPerPixel, reversedChannels, data); + } + + /** Reads a PNG image from the specified InputStream. */ + public static PNGImage read(InputStream in) throws IOException { + return new PNGImage(in); + } + + /** Reverse read and store, implicitly flip image to GL coords. */ + private static final int getPixelRGBA8(ByteBuffer d, int dOff, ImageLine line, int lineOff, boolean hasAlpha) { + if(hasAlpha) { + d.put(dOff--, (byte)line.scanline[lineOff + 3]); // A + } + d.put(dOff--, (byte)line.scanline[lineOff + 2]); // B + d.put(dOff--, (byte)line.scanline[lineOff + 1]); // G + d.put(dOff--, (byte)line.scanline[lineOff ]); // R + return dOff; + } + /** Reverse read and store, implicitly flip image from GL coords. */ + private static int setPixelRGBA8(ImageLine line, int lineOff, ByteBuffer d, int dOff, boolean hasAlpha, boolean reversedChannels) { + if(reversedChannels) { + line.scanline[lineOff ] = d.get(dOff--); // R, A + line.scanline[lineOff + 1] = d.get(dOff--); // G, B + line.scanline[lineOff + 2] = d.get(dOff--); // B, G + if(hasAlpha) { + line.scanline[lineOff + 3] = d.get(dOff--);// R + } + } else { + if(hasAlpha) { + line.scanline[lineOff + 3] = d.get(dOff--); // A + } + line.scanline[lineOff + 2] = d.get(dOff--); // B + line.scanline[lineOff + 1] = d.get(dOff--); // G + line.scanline[lineOff ] = d.get(dOff--); // R + } + return dOff; + } + + private PNGImage(int width, int height, double dpiX, double dpiY, int bytesPerPixel, boolean reversedChannels, ByteBuffer data) { + pixelWidth=width; + pixelHeight=height; + dpi = new double[] { dpiX, dpiY }; + if(4 == bytesPerPixel) { + glFormat = GL.GL_RGBA; + } else if (3 == bytesPerPixel) { + glFormat = GL.GL_RGB; + } else { + throw new InternalError("XXX: bytesPerPixel "+bytesPerPixel); + } + this.bytesPerPixel = bytesPerPixel; + this.reversedChannels = reversedChannels; + this.data = data; + } + + private PNGImage(InputStream in) { + final PngReader pngr = new PngReader(new BufferedInputStream(in), null); + final int channels = pngr.imgInfo.channels; + if (3 > channels || channels > 4 ) { + throw new RuntimeException("PNGImage can only handle RGB/RGBA images for now. Channels "+channels); + } + bytesPerPixel=pngr.imgInfo.bytesPixel; + if (3 > bytesPerPixel || bytesPerPixel > 4 ) { + throw new RuntimeException("PNGImage can only handle RGB/RGBA images for now. BytesPerPixel "+bytesPerPixel); + } + pixelWidth=pngr.imgInfo.cols; + pixelHeight=pngr.imgInfo.rows; + dpi = new double[2]; + { + final double[] dpi2 = pngr.getMetadata().getDpi(); + dpi[0]=dpi2[0]; + dpi[1]=dpi2[1]; + } + glFormat= ( 4 == bytesPerPixel ) ? GL.GL_RGBA : GL.GL_RGB; + data = Buffers.newDirectByteBuffer(bytesPerPixel * pixelWidth * pixelHeight); + reversedChannels = false; // RGB[A] + final boolean hasAlpha = 4 == bytesPerPixel; + int dataOff = bytesPerPixel * pixelWidth * pixelHeight - 1; // start at end-of-buffer, reverse store + for (int row = 0; row < pixelHeight; row++) { + final ImageLine l1 = pngr.readRow(row); + int lineOff = ( pixelWidth - 1 ) * bytesPerPixel ; // start w/ last pixel in line, reverse read + for (int j = pixelWidth - 1; j >= 0; j--) { + dataOff = getPixelRGBA8(data, dataOff, l1, lineOff, hasAlpha); + lineOff -= bytesPerPixel; + } + } + pngr.end(); + } + private final int pixelWidth, pixelHeight, glFormat, bytesPerPixel; + private boolean reversedChannels; + private final double[] dpi; + private final ByteBuffer data; + + /** Returns the width of the image. */ + public int getWidth() { return pixelWidth; } + + /** Returns the height of the image. */ + public int getHeight() { return pixelHeight; } + + /** Returns true if data has the channels reversed to BGR or BGRA, otherwise RGB or RGBA is expected. */ + public boolean getHasReversedChannels() { return reversedChannels; } + + /** Returns the dpi of the image. */ + public double[] getDpi() { return dpi; } + + /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */ + public int getGLFormat() { return glFormat; } + + /** Returns the bytes per pixel */ + public int getBytesPerPixel() { return bytesPerPixel; } + + /** Returns the raw data for this texture in the correct + (bottom-to-top) order for calls to glTexImage2D. */ + public ByteBuffer getData() { return data; } + + public void write(File out, boolean allowOverwrite) throws IOException { + final ImageInfo imi = new ImageInfo(pixelWidth, pixelHeight, 8, (4 == bytesPerPixel) ? true : false); // 8 bits per channel, no alpha + // open image for writing to a output stream + final OutputStream outs = new BufferedOutputStream(IOUtil.getFileOutputStream(out, allowOverwrite)); + try { + final PngWriter png = new PngWriter(outs, imi); + // add some optional metadata (chunks) + png.getMetadata().setDpi(dpi[0], dpi[1]); + png.getMetadata().setTimeNow(0); // 0 seconds fron now = now + png.getMetadata().setText(PngChunkTextVar.KEY_Title, "JogAmp PNGImage"); + // png.getMetadata().setText("my key", "my text"); + final boolean hasAlpha = 4 == bytesPerPixel; + final ImageLine l1 = new ImageLine(imi); + int dataOff = bytesPerPixel * pixelWidth * pixelHeight - 1; // start at end-of-buffer, reverse read + for (int row = 0; row < pixelHeight; row++) { + int lineOff = ( pixelWidth - 1 ) * bytesPerPixel ; // start w/ last pixel in line, reverse store + for (int j = pixelWidth - 1; j >= 0; j--) { + dataOff = setPixelRGBA8(l1, lineOff, data, dataOff, hasAlpha, reversedChannels); + lineOff -= bytesPerPixel; + } + png.writeRow(l1, row); + } + png.end(); + } finally { + IOUtil.close(outs, false); + } + } + + public String toString() { return "PNGImage["+pixelWidth+"x"+pixelHeight+", dpi "+dpi[0]+" x "+dpi[1]+", bytesPerPixel "+bytesPerPixel+", reversedChannels "+reversedChannels+", "+data+"]"; } +} diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java index c60c91bda..d35330f58 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java @@ -41,7 +41,8 @@ package com.jogamp.opengl.util.texture.spi; import java.io.*; import javax.media.opengl.*; -import com.jogamp.opengl.util.*; + +import com.jogamp.common.util.IOUtil; /** <p> Reads and writes SGI RGB/RGBA images. </p> @@ -584,7 +585,7 @@ public class SGIImage { if (DEBUG) System.err.println("total_size was " + total_size); - DataOutputStream stream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))); + DataOutputStream stream = new DataOutputStream(new BufferedOutputStream(IOUtil.getFileOutputStream(file, true))); writeHeader(stream, xsize, ysize, zsize, true); diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java index c64644350..e202c59b7 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java @@ -44,6 +44,8 @@ import java.nio.*; import java.nio.channels.*; import javax.media.opengl.*; +import com.jogamp.common.util.IOUtil; + /** * Targa image reader and writer adapted from sources of the <a href = * "http://java.sun.com/products/jimi/">Jimi</a> image I/O class library. @@ -379,7 +381,7 @@ public class TGAImage { /** Writes the image in Targa format to the specified file. */ public void write(File file) throws IOException { - FileOutputStream stream = new FileOutputStream(file); + FileOutputStream stream = IOUtil.getFileOutputStream(file, true); FileChannel chan = stream.getChannel(); ByteBuffer buf = ByteBuffer.allocate(header.size()); buf.order(ByteOrder.LITTLE_ENDIAN); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java index 668cdc607..a3182a30f 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java @@ -193,7 +193,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener { PrintWriter pw = new PrintWriter(sw); pw.printf("-%03dx%03d-Z%04d-T%04d-%s", drawable.getWidth(), drawable.getHeight(), (int)Math.abs(zoom), texSize[0], objName); - final String filename = dir + tech + sw +".tga"; + final String filename = dir + tech + sw +".png"; if(screenshot.readPixels(drawable.getGL(), drawable, false)) { screenshot.write(new File(filename)); } diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java index d9d2dd95a..d0093ad0c 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java @@ -179,7 +179,7 @@ public abstract class UIListenerBase01 implements GLEventListener { PrintWriter pw = new PrintWriter(sw); pw.printf("-%03dx%03d-Z%04d-T%04d-%s", drawable.getWidth(), drawable.getHeight(), (int)Math.abs(zoom), 0, objName); - final String filename = dir + tech + sw +".tga"; + final String filename = dir + tech + sw +".png"; if(screenshot.readPixels(drawable.getGL(), drawable, false)) { screenshot.write(new File(filename)); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBuffer2File.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBuffer2File.java index b829c8deb..9506d00e5 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBuffer2File.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/ReadBuffer2File.java @@ -31,7 +31,6 @@ package com.jogamp.opengl.test.junit.jogl.offscreen; import java.io.IOException; import javax.media.opengl.*; -import com.jogamp.opengl.util.texture.TextureIO; import java.io.File; public class ReadBuffer2File extends ReadBufferBase { @@ -51,7 +50,7 @@ public class ReadBuffer2File extends ReadBufferBase { return; } - File file = File.createTempFile("shot" + shotNum + "-", ".ppm"); + File file = File.createTempFile("shot" + shotNum + "-", ".png"); readBufferUtil.write(file); System.out.println("Wrote: " + file.getAbsolutePath() + ", ..."); shotNum++; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite01NEWT.java index 4bae83e74..ab8e54246 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite01NEWT.java @@ -68,7 +68,7 @@ public class TestGLReadBufferUtilTextureIOWrite01NEWT extends UITestCase { } @Test - public void testWriteTGAAndPAM() throws InterruptedException { + public void testWritePNG_TGA_PAM() throws InterruptedException { GLWindow glWindow = GLWindow.create(caps); Assert.assertNotNull(glWindow); glWindow.setTitle("Shared Gears NEWT Test"); @@ -79,8 +79,10 @@ public class TestGLReadBufferUtilTextureIOWrite01NEWT extends UITestCase { public void dispose(GLAutoDrawable drawable) {} public void display(GLAutoDrawable drawable) { // snapshot(drawable, false, true, getSimpleTestName(".")+"-rgb_-"+drawable.getGLProfile().getName()+".ppm"); + snapshot(drawable, true, false, getSimpleTestName(".")+"-rgba-"+drawable.getGLProfile().getName()+".png"); snapshot(drawable, true, false, getSimpleTestName(".")+"-rgba-"+drawable.getGLProfile().getName()+".tga"); snapshot(drawable, true, true, getSimpleTestName(".")+"-rgba-"+drawable.getGLProfile().getName()+".pam"); + snapshot(drawable, false, false, getSimpleTestName(".")+"-rgb_-"+drawable.getGLProfile().getName()+".png"); snapshot(drawable, false, false, getSimpleTestName(".")+"-rgb_-"+drawable.getGLProfile().getName()+".tga"); snapshot(drawable, false, true, getSimpleTestName(".")+"-rgb_-"+drawable.getGLProfile().getName()+".pam"); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite02NEWT.java index 0c48a10e5..79ae31612 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestGLReadBufferUtilTextureIOWrite02NEWT.java @@ -104,6 +104,42 @@ public class TestGLReadBufferUtilTextureIOWrite02NEWT extends UITestCase { glWindow.destroy(); } + @Test + public void testWritePNGWithResize() throws InterruptedException { + final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false); + GLWindow glWindow = GLWindow.create(caps); + Assert.assertNotNull(glWindow); + glWindow.setTitle("Shared Gears NEWT Test"); + glWindow.setSize(width, height); + glWindow.addGLEventListener(new GearsES2(1)); + glWindow.addGLEventListener(new GLEventListener() { + int i=0; + public void init(GLAutoDrawable drawable) {} + public void dispose(GLAutoDrawable drawable) {} + public void display(GLAutoDrawable drawable) { + StringWriter filename = new StringWriter(); + { + PrintWriter pw = new PrintWriter(filename); + pw.printf("%s-rgba-%s-%03dx%03d-n%03d.png", + getSimpleTestName("."), drawable.getGLProfile().getName(), + drawable.getWidth(), drawable.getHeight(), i++); + } + if(screenshot.readPixels(drawable.getGL(), drawable, false)) { + screenshot.write(new File(filename.toString())); + } + } + public void reshape(GLAutoDrawable drawable, int x, int y, + int width, int height) { } + }); + glWindow.setVisible(true); + Thread.sleep(60); + glWindow.setSize(300, 300); + Thread.sleep(60); + glWindow.setSize(400, 400); + Thread.sleep(60); + glWindow.destroy(); + } + public static void main(String args[]) { org.junit.runner.JUnitCore.main(TestGLReadBufferUtilTextureIOWrite02NEWT.class.getName()); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestPNGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestPNGImage01NEWT.java new file mode 100644 index 000000000..5a0c18de7 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestPNGImage01NEWT.java @@ -0,0 +1,41 @@ +package com.jogamp.opengl.test.junit.jogl.util; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URLConnection; + +import org.junit.Assert; +import org.junit.Test; + +import com.jogamp.common.util.IOUtil; +import com.jogamp.opengl.test.junit.util.UITestCase; +import com.jogamp.opengl.util.texture.spi.PNGImage; + +public class TestPNGImage01NEWT extends UITestCase { + @Test + public void testPNGReadWriteAndCompare() throws InterruptedException, IOException, MalformedURLException { + final File out1_f=new File(getSimpleTestName(".")+"-PNGImageTest1.png"); + final File out2_f=new File(getSimpleTestName(".")+"-PNGImageTest2.png"); + final String url_s="jogl/util/data/av/test-ntsc01-160x90.png"; + URLConnection urlConn = IOUtil.getResource(url_s, PNGImage.class.getClassLoader()); + PNGImage image0 = PNGImage.read(urlConn.getInputStream()); + System.err.println("PNGImage - Orig: "+image0); + image0.write(out1_f, true); + { + Assert.assertEquals(image0.getData(), PNGImage.read(IOUtil.toURL(out1_f).openStream()).getData()); + } + + final PNGImage image1 = PNGImage.createFromData(image0.getWidth(), image0.getHeight(), + image0.getDpi()[0], image0.getDpi()[1], + image0.getBytesPerPixel(), false, image0.getData()); + image1.write(out2_f, true); + { + Assert.assertEquals(image0.getData(), PNGImage.read(IOUtil.toURL(out2_f).openStream()).getData()); + } + } + + public static void main(String args[]) { + org.junit.runner.JUnitCore.main(TestPNGImage01NEWT.class.getName()); + } +} |