Merge pull request #192 from andrewkaufman/sccSopPrimVarTransform

SceneCache SOP transforms all Point and Normal primitive variables.

Author: johnhaddon

include/IECoreHoudini/SOP_SceneCacheSource.h

@@ -104,6 +104,15 @@ class SOP_SceneCacheSource : public SceneCacheNode<SOP_Node>
 		{
 			bool operator() ( const IECore::SceneInterface::Name &i, const IECore::SceneInterface::Name &j );
 		};
+		
+		/// Utility for detecting geometric primitive variables that need transforming
+		struct TransformGeometricData
+		{
+			typedef bool ReturnType;
+			
+			template<typename T>
+			ReturnType operator()( typename T::ConstPtr data ) const;
+		};
 
 };
 

src/IECoreHoudini/SOP_SceneCacheSource.cpp

@@ -39,10 +39,12 @@
 #include "UT/UT_WorkArgs.h"
 
 #include "IECore/CoordinateSystem.h"
+#include "IECore/DespatchTypedData.h"
 #include "IECore/Group.h"
 #include "IECore/MeshPrimitive.h"
 #include "IECore/PointsPrimitive.h"
 #include "IECore/TransformOp.h"
+#include "IECore/TypeTraits.h"
 #include "IECore/VisibleRenderable.h"
 
 #include "IECoreHoudini/GU_CortexPrimitive.h"
@@ -451,6 +453,13 @@ ConstObjectPtr SOP_SceneCacheSource::modifyObject( const IECore::Object *object,
 	return result;
 }
 
+template<typename T>
+SOP_SceneCacheSource::TransformGeometricData::ReturnType SOP_SceneCacheSource::TransformGeometricData::operator()( typename T::ConstPtr data ) const
+{
+	GeometricData::Interpretation interp = data->getInterpretation();
+	return ( interp == GeometricData::Point || interp == GeometricData::Normal || interp == GeometricData::Vector );
+}
+
 ConstObjectPtr SOP_SceneCacheSource::transformObject( const IECore::Object *object, const Imath::M44d &transform, Parameters &params )
 {
 	if ( const Primitive *primitive = IECore::runTimeCast<const Primitive>( object ) )
@@ -459,19 +468,27 @@ ConstObjectPtr SOP_SceneCacheSource::transformObject( const IECore::Object *obje
 		transformer->inputParameter()->setValue( const_cast<Primitive*>( primitive ) ); // safe because we set the copy parameter
 		transformer->copyParameter()->setTypedValue( true );
 		transformer->matrixParameter()->setValue( new M44dData( transform ) );
-		ObjectPtr result = transformer->operate();
 
+		// add all Point and Normal prim vars to the transformation list
+		const PrimitiveVariableMap &variables = primitive->variables;
 		std::vector<std::string> &primVars = transformer->primVarsParameter()->getTypedValue();
-		for ( std::vector<std::string>::iterator it = primVars.begin(); it != primVars.end(); ++it )
+		primVars.clear();
+		for ( PrimitiveVariableMap::const_iterator it = variables.begin(); it != variables.end(); ++it )
 		{
-			if ( std::find( params.animatedPrimVars.begin(), params.animatedPrimVars.end(), *it ) == params.animatedPrimVars.end() )
+			if ( despatchTypedData<TransformGeometricData, IECore::TypeTraits::IsGeometricTypedData, DespatchTypedDataIgnoreError>( it->second.data ) )
 			{
-				params.animatedPrimVars.push_back( *it );
-				params.hasAnimatedPrimVars = true;
+				primVars.push_back( it->first );
+				
+				// add the transforming prim vars to the animated list
+				if ( std::find( params.animatedPrimVars.begin(), params.animatedPrimVars.end(), it->first ) == params.animatedPrimVars.end() )
+				{
+					params.animatedPrimVars.push_back( it->first );
+					params.hasAnimatedPrimVars = true;
+				}
 			}
 		}
 
-		return result;
+		return transformer->operate();
 	}
 	else if ( const Group *group = IECore::runTimeCast<const Group>( object ) )
 	{

test/IECoreHoudini/SceneCacheTest.py

@@ -496,6 +496,47 @@ def testSopSpaceModes( self ) :
 		self.assertEqual( prims[1].vertices()[0].point().position(), hou.Vector3( 0.5, 0.5, 0.5 ) )
 		self.assertEqual( prims[2].vertices()[0].point().position(), hou.Vector3( 0.5, 0.5, 0.5 ) )
 
+	def testSopTransformsPrimvars( self ) :
+		
+		def writeTestFile() :
+			
+			scene = IECore.SceneCache( TestSceneCache.__testFile, IECore.IndexedIO.OpenMode.Write )
+			
+			sc = scene.createChild( str( 1 ) )
+			matrix = IECore.M44d.createTranslated( IECore.V3d( 1, 0, 0 ) )
+			sc.writeTransform( IECore.M44dData( matrix ), 0 )
+			
+			sc = sc.createChild( str( 2 ) )
+			matrix = IECore.M44d.createTranslated( IECore.V3d( 2, 0, 0 ) )
+			sc.writeTransform( IECore.M44dData( matrix ), 0 )
+			
+			sc = sc.createChild( str( 3 ) )
+			matrix = IECore.M44d.createTranslated( IECore.V3d( 3, 0, 0 ) )
+			sc.writeTransform( IECore.M44dData( matrix ), 0 )
+			
+			mesh = IECore.MeshPrimitive.createBox(IECore.Box3f(IECore.V3f(0),IECore.V3f(1)))
+			mesh["Pref"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Vertex, mesh["P"].data.copy() )
+			mesh["otherP"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Vertex, mesh["P"].data.copy() )
+			mesh["Cs"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Vertex, IECore.V3fVectorData( [ IECore.V3f( 0, 0, 1 ) ] * 8 ) )
+			sc.writeObject( mesh, 0 )
+		
+		writeTestFile()
+		
+		node = self.sop()
+		node.parm( "geometryType" ).set( IECoreHoudini.SceneCacheNode.GeometryType.Houdini )
+		node.parm( "space" ).set( IECoreHoudini.SceneCacheNode.Space.World )
+		prims = node.geometry().prims()
+		self.assertEqual( len(prims), 6 )
+		self.assertEqual( sorted( [ x.name() for x in node.geometry().pointAttribs() ] ), ["Cd", "P", "Pw", "otherP", "rest"] )
+		
+		# P is transformed
+		self.assertEqual( prims[0].vertex( 0 ).point().position(), hou.Vector3( 6, 0, 0 ) )
+		# other Point data is as well
+		self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "rest" ), ( 6, 0, 0 ) )
+		self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "otherP" ), ( 6, 0, 0 ) )
+		# other data is not
+		self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "Cd" ), ( 0, 0, 1 ) )
+	
 	def testSopShapeFilter( self ) :
 
 		self.writeSCC()