Merge pull request #1326 from proberts-cinesite/ResampleAlgoFromConstantSupportAllDataTypes

Resample algorithms (mesh, curves, points) from constant support all data types

Author: johnhaddon

Changes

@@ -1,3 +1,13 @@
+10.4.x.x (relative to 10.4.4.0)
+========
+
+Fixes
+---
+
+- CurvesAlgo.resamplePrimitiveVariable : From Constant now supports all data types.
+- MeshAlgo.resamplePrimitiveVariable : From Constant now supports all data types.
+- PointsAlgo.resamplePrimitiveVariable : From Constant now supports all data types.
+
 10.4.4.0 (relative to 10.4.3.1)
 ========
 

include/IECoreScene/private/PrimitiveAlgoUtils.h

@@ -117,7 +117,7 @@ struct AverageValueFromVector
 	}
 
 	template<typename T>
-	IECore::DataPtr operator()( const IECore::TypedData<std::vector<T> > *data, typename std::enable_if<IsArithmeticVectorTypedData<IECore::TypedData<std::vector<T> > >::value>::type *enabler = nullptr  )
+	IECore::DataPtr operator()( const IECore::TypedData<std::vector<T> > *data, typename std::enable_if<IsArithmeticVectorTypedData<IECore::TypedData<std::vector<T> > >::value>::type *enabler = nullptr )
 	{
 		const auto &src = data->readable();
 		if( !src.empty() )
@@ -133,61 +133,42 @@ struct AverageValueFromVector
 	}
 };
 
-
-inline IECore::DataPtr createArrayData( PrimitiveVariable& primitiveVariable, const Primitive *primitive, PrimitiveVariable::Interpolation interpolation )
+struct FillVectorFromValue
 {
-	if ( primitiveVariable.interpolation != PrimitiveVariable::Constant )
-		return nullptr;
+	template<typename T>
+	using IsVectorTypedDataDefined = std::negation< std::is_void< typename IECore::TypedDataTraits< std::vector< T > >::DataHolder > >;
+
+	explicit FillVectorFromValue( const size_t len )
+	: m_len( len )
+	{}
 
-	size_t len = primitive->variableSize( interpolation );
-	switch( primitiveVariable.data->typeId() )
+	template< typename T >
+	IECore::DataPtr operator()( const IECore::GeometricTypedData< T > *data, typename std::enable_if< IsVectorTypedDataDefined< T >::value >::type *enabler = nullptr ) const
 	{
-		case IECore::IntDataTypeId:
-		{
-			IECore::IntVectorDataPtr newData = new IECore::IntVectorData();
-			newData->writable().resize( len, static_cast< const IECore::IntData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		case IECore::FloatDataTypeId:
-		{
-			IECore::FloatVectorDataPtr newData = new IECore::FloatVectorData();
-			newData->writable().resize( len, static_cast< const IECore::FloatData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		case IECore::V2fDataTypeId:
-		{
-			IECore::V2fVectorDataPtr newData = new IECore::V2fVectorData();
-			newData->writable().resize( len, static_cast< const IECore::V2fData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		case IECore::V3fDataTypeId:
-		{
-			IECore::V3fVectorDataPtr newData = new IECore::V3fVectorData();
-			newData->writable().resize( len, static_cast< const IECore::V3fData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		case IECore::Color3fDataTypeId:
-		{
-			IECore::Color3fVectorDataPtr newData = new IECore::Color3fVectorData();
-			newData->writable().resize( len, static_cast< const IECore::Color3fData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		case IECore::StringDataTypeId:
-		{
-			IECore::StringVectorDataPtr newData = new IECore::StringVectorData();
-			newData->writable().resize( len, static_cast< const IECore::StringData * >( primitiveVariable.data.get() )->readable() );
-			return newData;
-		}
-			break;
-		default:
-			return nullptr;
+		using VectorT = IECore::GeometricTypedData< std::vector< T > >;
+		typename VectorT::Ptr newData = new VectorT();
+		newData->writable().resize( m_len, static_cast< const IECore::GeometricTypedData< T > * >( data )->readable() );
+		return newData;
 	}
-}
+
+	template< typename T >
+	IECore::DataPtr operator()( const IECore::TypedData< T > *data, typename std::enable_if< IsVectorTypedDataDefined< T >::value >::type *enabler = nullptr ) const
+	{
+		using VectorT = IECore::TypedData< std::vector< T > >;
+		typename VectorT::Ptr newData = new VectorT();
+		newData->writable().resize( m_len, static_cast< const IECore::TypedData< T > * >( data )->readable() );
+		return newData;
+	}
+
+	IECore::DataPtr operator()( const IECore::Data *data ) const
+	{
+		return nullptr;
+	}
+
+private:
+
+	size_t m_len;
+};
 
 /// template to dispatch only primvars which are supported by the SplitTask
 /// Numeric & string like arrays, which contain elements which can be added to a std::set

src/IECoreScene/CurvesAlgo.cpp

@@ -514,11 +514,8 @@ void resamplePrimitiveVariable( const CurvesPrimitive *curves, PrimitiveVariable
 	}
 	else if ( primitiveVariable.interpolation == PrimitiveVariable::Constant )
 	{
-		DataPtr arrayData = Detail::createArrayData(primitiveVariable, curves, interpolation);
-		if (arrayData)
-		{
-			dstData = arrayData;
-		}
+		Detail::FillVectorFromValue fn( curves->variableSize( interpolation ) );
+		dstData = dispatch( srcData.get(), fn );
 	}
 	else if ( interpolation == PrimitiveVariable::Uniform )
 	{

src/IECoreScene/MeshAlgoResample.cpp

@@ -329,7 +329,8 @@ void IECoreScene::MeshAlgo::resamplePrimitiveVariable( const MeshPrimitive *mesh
 
 	if ( primitiveVariable.interpolation == PrimitiveVariable::Constant )
 	{
-		DataPtr arrayData = Detail::createArrayData(primitiveVariable, mesh, interpolation);
+		Detail::FillVectorFromValue fn( mesh->variableSize( interpolation ) );
+		DataPtr arrayData = dispatch( srcData.get(), fn );
 		if (arrayData)
 		{
 			primitiveVariable = PrimitiveVariable(interpolation, arrayData);

src/IECoreScene/PointsAlgo.cpp

@@ -257,15 +257,16 @@ void resamplePrimitiveVariable( const PointsPrimitive *points, PrimitiveVariable
 
 	if ( primitiveVariable.interpolation == PrimitiveVariable::Constant )
 	{
-
-		DataPtr arrayData = Detail::createArrayData(primitiveVariable, points, interpolation);
+		Detail::FillVectorFromValue fn( points->variableSize( interpolation ) );
+		DataPtr arrayData = dispatch( srcData.get(), fn );
 		if (arrayData)
 		{
 			primitiveVariable = PrimitiveVariable(interpolation, arrayData);
 		}
 		return;
 	}
-	else if( interpolation == PrimitiveVariable::Uniform )
+
+	if( interpolation == PrimitiveVariable::Uniform )
 	{
 		if( primitiveVariable.interpolation == PrimitiveVariable::Vertex || primitiveVariable.interpolation == PrimitiveVariable::Varying || primitiveVariable.interpolation == PrimitiveVariable::FaceVarying )
 		{