Using new IMG_DeepPixelWriter

Author: andrewkaufman

include/IECoreHoudini/RATDeepImageWriter.h

@@ -36,6 +36,7 @@
 #define IECOREHOUDINI_RATDEEPIMAGEWRITER_H
 
 #include "IMG/IMG_DeepShadow.h"
+#include "UT/UT_Version.h"
 
 #include "IECore/DeepImageWriter.h"
 
@@ -76,6 +77,13 @@ class RATDeepImageWriter : public IECore::DeepImageWriter
 		void open();
 
 		IMG_DeepShadow *m_outputFile;
+
+#if UT_MAJOR_VERSION_INT >= 13
+
+		IMG_DeepPixelWriter *m_ratPixel;
+
+#endif
+
 		std::string m_outputFileName;
 		int m_dataSize;
 		int m_alphaOffset;

src/IECoreHoudini/RATDeepImageWriter.cpp

@@ -52,12 +52,29 @@ IE_CORE_DEFINERUNTIMETYPED( RATDeepImageWriter );
 const DeepImageWriter::DeepImageWriterDescription<RATDeepImageWriter> RATDeepImageWriter::g_writerDescription( "rat" );
 
 RATDeepImageWriter::RATDeepImageWriter()
+#if UT_MAJOR_VERSION_INT >= 13
+
+	: DeepImageWriter( "Writes Houdini RAT deep texture file format." ), m_outputFile( 0 ), m_ratPixel( 0 )
+
+#else
+
 	: DeepImageWriter( "Writes Houdini RAT deep texture file format." ), m_outputFile( 0 )
+
+#endif
 {
 }
 
 RATDeepImageWriter::RATDeepImageWriter( const std::string &fileName )
+#if UT_MAJOR_VERSION_INT >= 13
+
+	: DeepImageWriter( "Writes Houdini RAT deep texture file format." ), m_outputFile( 0 ), m_ratPixel( 0 )
+
+#else
+
 	: DeepImageWriter( "Writes Houdini RAT deep texture file format." ), m_outputFile( 0 )
+
+#endif
+
 {
 	m_fileNameParameter->setTypedValue( fileName );
 }
@@ -68,7 +85,13 @@ RATDeepImageWriter::~RATDeepImageWriter()
 	{
 		m_outputFile->close();
 	}
-	
+
+#if UT_MAJOR_VERSION_INT >= 13
+
+	delete m_ratPixel;
+
+#endif
+
 	delete m_outputFile;
 }
 
@@ -105,7 +128,20 @@ void RATDeepImageWriter::doWritePixel( int x, int y, const DeepPixel *pixel )
 
 	y = m_resolutionParameter->getTypedValue().y - y - 1;
 
+#if UT_MAJOR_VERSION_INT >= 13
+
+	if ( !m_ratPixel->open( x, y ) )
+	{
+		return;
+	}
+	
+	m_ratPixel->writeRawSamples( true );
+
+#else
+
 	m_outputFile->pixelStart( x, y );
+
+#endif
 
 	unsigned numChannels = pixel->numChannels();
 	unsigned numSamples = pixel->numSamples();
@@ -130,10 +166,28 @@ void RATDeepImageWriter::doWritePixel( int x, int y, const DeepPixel *pixel )
 			}
 		}
 
+#if UT_MAJOR_VERSION_INT >= 13
+
+		m_ratPixel->writeOrdered( pixel->getDepth( i ), adjustedData, m_dataSize );
+
+#else
+
 		m_outputFile->pixelWriteOrdered( pixel->getDepth( i ), adjustedData, m_dataSize );
+
+#endif
+
 	}
 
+#if UT_MAJOR_VERSION_INT >= 13
+
+	m_ratPixel->close();
+
+#else
+
 	m_outputFile->pixelClose();
+
+#endif
+
 }
 
 void RATDeepImageWriter::open()
@@ -144,6 +198,13 @@ void RATDeepImageWriter::open()
 		return;
 	}
 
+#if UT_MAJOR_VERSION_INT >= 13
+
+	delete m_ratPixel;
+	m_ratPixel = 0;
+
+#endif
+
 	delete m_outputFile;
 	m_outputFile = new IMG_DeepShadow;
 	m_outputFileName = "";
@@ -213,6 +274,8 @@ void RATDeepImageWriter::open()
 
 #if UT_MAJOR_VERSION_INT >= 13
 
+		m_ratPixel = new IMG_DeepPixelWriter( *m_outputFile );
+		
 		UT_SharedPtr<UT_Options> options = m_outputFile->getTextureOptions();
 
 #else
@@ -228,6 +291,14 @@ void RATDeepImageWriter::open()
 	}
 	else
 	{
+
+#if UT_MAJOR_VERSION_INT >= 13
+
+		delete m_ratPixel;
+		m_ratPixel = 0;
+
+#endif
+		
 		delete m_outputFile;
 		m_outputFile = 0;
 		m_outputFileName = "";