IECoreUSD::ShaderAlgo : Use new expandSplines / collapseSplines

Author: danieldresser-ie

contrib/IECoreUSD/src/IECoreUSD/ShaderAlgo.cpp

@@ -187,8 +187,6 @@ IECore::InternedString readShaderNetworkWalk( const pxr::SdfPath &anchorPath, co
 
 	readAdditionalLightParameters( usdShader.GetPrim(), parameters );
 
-	parametersData = boost::const_pointer_cast< IECore::CompoundData >( IECoreScene::ShaderNetworkAlgo::collapseSplineParameters( parametersData ) );
-
 	IECoreScene::ShaderPtr newShader = new IECoreScene::Shader( shaderName, shaderType, parametersData );
 	pxr::VtValue metadataValue;
 	if( usdShader.GetPrim().GetMetadata( g_adapterLabelToken, &metadataValue ) && metadataValue.Get<bool>() )
@@ -224,6 +222,7 @@ IECoreScene::ShaderNetwork::Parameter readShaderNetworkWalk( const pxr::SdfPath
 pxr::UsdShadeOutput IECoreUSD::ShaderAlgo::writeShaderNetwork( const IECoreScene::ShaderNetwork *shaderNetwork, pxr::UsdPrim shaderContainer )
 {
 	IECoreScene::ShaderNetworkPtr shaderNetworkWithAdapters = shaderNetwork->copy();
+	IECoreScene::ShaderNetworkAlgo::expandSplines( shaderNetworkWithAdapters.get() );
 	IECoreScene::ShaderNetworkAlgo::addComponentConnectionAdapters( shaderNetworkWithAdapters.get() );
 
 	IECoreScene::ShaderNetwork::Parameter networkOutput = shaderNetworkWithAdapters->getOutput();
@@ -258,11 +257,7 @@ pxr::UsdShadeOutput IECoreUSD::ShaderAlgo::writeShaderNetwork( const IECoreScene
 		}
 		usdShader.SetShaderId( pxr::TfToken( typePrefix + shader.second->getName() ) );
 
-
-		IECore::ConstCompoundDataPtr expandedParameters = IECoreScene::ShaderNetworkAlgo::expandSplineParameters(
-			shader.second->parametersData()
-		);
-		for( const auto &p : expandedParameters->readable() )
+		for( const auto &p : shader.second->parametersData()->readable() )
 		{
 			pxr::UsdShadeInput input = usdShader.CreateInput(
 				toUSDParameterName( p.first ),
@@ -355,6 +350,7 @@ IECoreScene::ShaderNetworkPtr IECoreUSD::ShaderAlgo::readShaderNetwork( const px
 	result->setOutput( outputHandle );
 
 	IECoreScene::ShaderNetworkAlgo::removeComponentConnectionAdapters( result.get() );
+	IECoreScene::ShaderNetworkAlgo::collapseSplines( result.get() );
 
 	return result;
 }

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -2632,6 +2632,12 @@ def testShaders( self ) :
 		dest.parameters["a"] = IECore.Color3fData( imath.Color3f( 0.0 ) )
 		dest.parameters["b"] = IECore.Color3fData( imath.Color3f( 0.0 ) )
 		dest.parameters["c"] = IECore.FloatData( 0.0 )
+		dest.parameters["sf"] = IECore.SplineffData( IECore.Splineff( IECore.CubicBasisf.catmullRom(),
+			( ( 0, 1 ), ( 10, 2 ), ( 20, 0 ), ( 30, 1 ) )
+		) )
+		dest.parameters["sc"] = IECore.SplinefColor3fData( IECore.SplinefColor3f( IECore.CubicBasisf.linear(),
+			( ( 0, imath.Color3f(1) ), ( 10, imath.Color3f(2) ), ( 20, imath.Color3f(0) ) )
+		) )
 
 		componentConnectionNetwork = IECoreScene.ShaderNetwork()
 		componentConnectionNetwork.addShader( "source1", add1 )
@@ -2664,6 +2670,24 @@ def testShaders( self ) :
 		) )
 		componentConnectionNetwork.setOutput( IECoreScene.ShaderNetwork.Parameter( "dest", "" ) )
 
+		# Float to spline element connection
+		componentConnectionNetwork.addConnection( IECoreScene.ShaderNetwork.Connection(
+			IECoreScene.ShaderNetwork.Parameter( "source1", "out" ),
+			IECoreScene.ShaderNetwork.Parameter( "dest", "sf[3].y" )
+		) )
+
+		# Color to spline element connection
+		componentConnectionNetwork.addConnection( IECoreScene.ShaderNetwork.Connection(
+			IECoreScene.ShaderNetwork.Parameter( "source3", "out" ),
+			IECoreScene.ShaderNetwork.Parameter( "dest", "sc[2].y" )
+		) )
+
+		# Float to spline element component connection
+		componentConnectionNetwork.addConnection( IECoreScene.ShaderNetwork.Connection(
+			IECoreScene.ShaderNetwork.Parameter( "source1", "out" ),
+			IECoreScene.ShaderNetwork.Parameter( "dest", "sc[0].y.g" )
+		) )
+
 		# If we manually create the shaders that are used as adapters for component connections,
 		# they should not be automatically removed on import.  ( This is implemented using
 		# a label for automatically created adapters, stored as blindData in Cortex that is