Fixed transformation segments over 2. Simplified shutter logic on cameras.

Author: boberfly

src/GafferCycles/IECoreCyclesPreview/CameraAlgo.cpp

@@ -113,25 +113,18 @@ ccl::Camera *convertCommon( const IECoreScene::Camera *camera, const std::string
 
 	// Shutter TODO: Need to see if this is correct or not, cycles also has a shutter curve...
 	const Imath::V2f &shutter = camera->getShutter();
-	if ((shutter.x > 0.0) && (shutter.y > 0.0))
+	ccam->shuttertime = abs(shutter.x) + abs(shutter.y);
+	if( (shutter.x == 0.0) && (shutter.y > shutter.x) )
 	{
 		ccam->motion_position = ccl::Camera::MOTION_POSITION_START;
-		ccam->shuttertime = shutter.x + shutter.y;
 	}
-	else if ((shutter.x < 0.0) && (shutter.y > 0.0))
-	{
-		ccam->motion_position = ccl::Camera::MOTION_POSITION_CENTER;
-		ccam->shuttertime = abs(shutter.x) + shutter.y;
-	}
-	else if ((shutter.x < 0.0) && (shutter.y <= 0.0))
+	else if( (shutter.x < shutter.y) && (shutter.y == 0.0) )
 	{
 		ccam->motion_position = ccl::Camera::MOTION_POSITION_END;
-		ccam->shuttertime = abs(shutter.x) + abs(shutter.y);
 	}
 	else
 	{
 		ccam->motion_position = ccl::Camera::MOTION_POSITION_CENTER;
-		ccam->shuttertime = 1.0;
 	}
 
 	for( CompoundDataMap::const_iterator it = camera->parameters().begin(), eIt = camera->parameters().end(); it != eIt; ++it )

src/GafferCycles/IECoreCyclesPreview/Renderer.cpp

@@ -2463,7 +2463,8 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 
 			if( object->mesh->use_motion_blur )
 			{
-				object->motion = ccl::array<ccl::Transform>( object->mesh->motion_steps );
+				object->motion.clear();
+				object->motion.resize( object->mesh->motion_steps, ccl::transform_empty() );
 				for( int i = 0; i < object->motion.size(); ++i )
 				{
 					object->motion[i] = object->tfm;
@@ -2486,7 +2487,7 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 			{
 				IECore::msg( IECore::Msg::Error, "IECoreCycles::Renderer", boost::format( "Transform step size on \"%s\" must match deformation step size." ) % object->name.c_str() );
 				object->tfm = SocketAlgo::setTransform( samples.front() );
-				object->motion = ccl::array<ccl::Transform>( object->mesh->motion_steps );
+				object->motion.resize( object->mesh->motion_steps, ccl::transform_empty() );
 				for( int i = 0; i < object->motion.size(); ++i )
 				{
 					object->motion[i] = object->tfm;
@@ -2513,7 +2514,7 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 
 			if( numSamples % 2 ) // Odd numSamples
 			{
-				object->motion = ccl::array<ccl::Transform>( numSamples );
+				object->motion.resize( numSamples, ccl::transform_empty() );
 
 				for( int i = 0; i < numSamples; ++i )
 				{
@@ -2528,7 +2529,7 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 			else if( numSamples == 2 )
 			{
 				Imath::M44f matrix;
-				object->motion = ccl::array<ccl::Transform>( numSamples+1 );
+				object->motion.resize( numSamples+1, ccl::transform_empty() );
 				IECore::LinearInterpolator<Imath::M44f>()( samples[0], samples[1], 0.5f, matrix );
 
 				if( frameIdx == -1 ) // Center frame
@@ -2549,7 +2550,7 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 			}
 			else // Even numSamples
 			{
-				object->motion = ccl::array<ccl::Transform>( numSamples );
+				object->motion.resize( numSamples, ccl::transform_empty() );
 
 				if( frameIdx == -1 ) // Center frame
 				{
@@ -2573,6 +2574,11 @@ class CyclesObject : public IECoreScenePreview::Renderer::ObjectInterface
 				}
 			}
 
+			if( !object->mesh->use_motion_blur )
+			{
+				object->mesh->motion_steps = object->motion.size();
+			}
+
 			if( object->mesh->subd_params )
 			{
 				object->mesh->subd_params->objecttoworld = object->tfm;