CoordinateSystem : Remove transform

This is unused now we've removed Renderer. In Gaffer's representation, the transform is held outside the CoordinateSystem anyway, and having an internal one was confusing and prone to error.

Author: johnhaddon

Changes

@@ -13,6 +13,7 @@ Breaking Changes
 ----------------
 
 - Renderable : Removed `render()` method.
+- CoordinateSystem : Removed transform.
 - Renderer, AttributeBlock, EditBlock, MotionBlock, TransformBlock, WorldBlock : Removed.
 - IECoreHoudini : Removed.
 - IECoreMaya : Removed.

include/IECoreScene/CoordinateSystem.h

@@ -41,37 +41,23 @@
 namespace IECoreScene
 {
 
-IE_CORE_FORWARDDECLARE( Transform )
-
-/// This calls allows the specification of coordinate systems to
-/// Renderers.
+/// Allows the specification of coordinate systems to Renderers.
 /// \ingroup renderingGroup
 class IECORESCENE_API CoordinateSystem : public StateRenderable
 {
 	public:
 
-		CoordinateSystem();
-		CoordinateSystem( const std::string &name, TransformPtr transform=nullptr );
+		CoordinateSystem( const std::string &name = "unspecified" );
 		~CoordinateSystem() override;
 
 		IE_CORE_DECLAREEXTENSIONOBJECT( CoordinateSystem, CoordinateSystemTypeId, StateRenderable );
 
 		const std::string &getName() const;
 		void setName( const std::string &name );
 
-		/// Returns the Transform applied to the coordinate system.
-		/// This is the local transform relative to the parent of
-		/// the coordinate system (usually a Group). May return 0
-		/// if no transform has been applied.
-		Transform *getTransform();
-		const Transform *getTransform() const;
-		/// Sets the Transform applied to the coordinate system.
-		void setTransform( TransformPtr transform );
-
 	private:
 
 		std::string m_name;
-		TransformPtr m_transform;
 
 		static const unsigned int m_ioVersion;
 };

src/IECoreScene/CoordinateSystem.cpp

@@ -34,8 +34,6 @@
 
 #include "IECoreScene/CoordinateSystem.h"
 
-#include "IECoreScene/Transform.h"
-
 #include "IECore/MurmurHash.h"
 
 using namespace IECore;
@@ -47,13 +45,8 @@ static IndexedIO::EntryID g_transformEntry("transform");
 const unsigned int CoordinateSystem::m_ioVersion = 0;
 IE_CORE_DEFINEOBJECTTYPEDESCRIPTION( CoordinateSystem );
 
-CoordinateSystem::CoordinateSystem()
-	: m_name( "unspecified" ), m_transform( nullptr )
-{
-}
-
-CoordinateSystem::CoordinateSystem( const std::string &name, TransformPtr transform )
-	: m_name( name ), m_transform( transform )
+CoordinateSystem::CoordinateSystem( const std::string &name )
+	:	m_name( name )
 {
 }
 
@@ -71,21 +64,6 @@ void CoordinateSystem::setName( const std::string &name )
 	m_name = name;
 }
 
-Transform *CoordinateSystem::getTransform()
-{
-	return m_transform.get();
-}
-
-const Transform *CoordinateSystem::getTransform() const
-{
-	return m_transform.get();
-}
-
-void CoordinateSystem::setTransform( TransformPtr transform )
-{
-	m_transform = transform;
-}
-
 bool CoordinateSystem::isEqualTo( const Object *other ) const
 {
 	if( !StateRenderable::isEqualTo( other ) )
@@ -97,51 +75,27 @@ bool CoordinateSystem::isEqualTo( const Object *other ) const
 	{
 		return false;
 	}
-	if( (bool)m_transform != (bool)c->m_transform )
-	{
-		return false;
-	}
-	if( m_transform )
-	{
-		return m_transform->isEqualTo( c->m_transform.get() );
-	}
 	return true;
 }
 
 void CoordinateSystem::memoryUsage( Object::MemoryAccumulator &a ) const
 {
 	StateRenderable::memoryUsage( a );
 	a.accumulate( m_name.capacity() + sizeof( m_name ) );
-	if( m_transform )
-	{
-		a.accumulate( m_transform.get() );
-	}
 }
 
 void CoordinateSystem::copyFrom( const Object *other, CopyContext *context )
 {
 	StateRenderable::copyFrom( other, context );
 	const CoordinateSystem *c = static_cast<const CoordinateSystem *>( other );
 	m_name = c->m_name;
-	if( c->m_transform )
-	{
-		m_transform = context->copy<Transform>( c->m_transform.get() );
-	}
-	else
-	{
-		m_transform = nullptr;
-	}
 }
 
 void CoordinateSystem::save( SaveContext *context ) const
 {
 	StateRenderable::save( context );
 	IndexedIOPtr container = context->container( staticTypeName(), m_ioVersion );
 	container->write( g_nameEntry, m_name );
-	if( m_transform )
-	{
-		context->save( m_transform.get(), container.get(), g_transformEntry );
-	}
 }
 
 void CoordinateSystem::load( LoadContextPtr context )
@@ -150,22 +104,10 @@ void CoordinateSystem::load( LoadContextPtr context )
 	unsigned int v = m_ioVersion;
 	ConstIndexedIOPtr container = context->container( staticTypeName(), v );
 	container->read( g_nameEntry, m_name );
-	m_transform = nullptr;
-	try
-	{
-		m_transform = context->load<Transform>( container.get(), g_transformEntry );
-	}
-	catch( ... )
-	{
-	}
 }
 
 void CoordinateSystem::hash( MurmurHash &h ) const
 {
 	StateRenderable::hash( h );
 	h.append( m_name );
-	if( m_transform )
-	{
-		m_transform->hash( h );
-	}
 }

src/IECoreScene/bindings/CoordinateSystemBinding.cpp

@@ -37,7 +37,6 @@
 #include "CoordinateSystemBinding.h"
 
 #include "IECoreScene/CoordinateSystem.h"
-#include "IECoreScene/Transform.h"
 
 #include "IECorePython/RunTimeTypedBinding.h"
 
@@ -51,13 +50,9 @@ namespace IECoreSceneModule
 void bindCoordinateSystem()
 {
 	RunTimeTypedClass<CoordinateSystem>()
-		.def( init<>() )
-		.def( init<const std::string &>() )
-		.def( init<const std::string &, TransformPtr>() )
+		.def( init<const std::string &>( ( arg( "name" ) = "unspecified" ) ) )
 		.def( "getName", &CoordinateSystem::getName, return_value_policy<copy_const_reference>() )
 		.def( "setName", &CoordinateSystem::setName )
-		.def( "getTransform", (Transform *(CoordinateSystem::*)())&CoordinateSystem::getTransform, return_value_policy<CastToIntrusivePtr>() )
-		.def( "setTransform", &CoordinateSystem::setTransform )
 	;
 }
 

test/IECoreScene/CoordinateSystemTest.py

@@ -70,57 +70,10 @@ def testHash( self ) :
 		b.setName( "a" )
 		self.assertEqual( a.hash(), b.hash() )
 
-		b.setTransform( IECoreScene.MatrixTransform( imath.M44f().translate( imath.V3f( 1 ) ) ) )
-		self.assertNotEqual( a.hash(), b.hash() )
-
-	def testTransform( self ) :
-
-		c = IECoreScene.CoordinateSystem()
-		self.assertEqual( c.getTransform(), None )
-
-		c = IECoreScene.CoordinateSystem( "test" )
-		self.assertEqual( c.getName(), "test" )
-		self.assertEqual( c.getTransform(), None )
-		self.assertEqual( c, c.copy() )
-
-		c = IECoreScene.CoordinateSystem( "test", IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertEqual( c.getName(), "test" )
-		self.assertEqual( c.getTransform(), IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertEqual( c, c.copy() )
-
-		cc = c.copy()
-		self.assertEqual( cc.getTransform(), IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertFalse( c.getTransform().isSame( cc.getTransform() ) )
-
-		c.setTransform( IECoreScene.MatrixTransform( imath.M44f().translate( imath.V3f( 1 ) ) ) )
-		self.assertEqual( c.getTransform(), IECoreScene.MatrixTransform( imath.M44f().translate( imath.V3f( 1 ) ) ) )
-
-		c.setTransform( None )
-		self.assertEqual( c.getTransform(), None )
-
-		cc = c.copy()
-		self.assertEqual( cc.getTransform(), None )
-
 	def testLoadCobFromBeforeTransforms( self ) :
 
 		c = IECore.ObjectReader( os.path.join( "test", "IECore", "data", "cobFiles", "coordinateSystemBeforeTransforms.cob" ) ).read()
-
 		self.assertEqual( c.getName(), "test" )
-		self.assertEqual( c.getTransform(), None )
-
-	def testLoadCobWithTransform( self ) :
-
-		c = IECoreScene.CoordinateSystem( "test", IECoreScene.MatrixTransform( imath.M44f() ) )
-		IECore.ObjectWriter( c, os.path.join( "test", "IECore", "data", "coordSys.cob" ) ).write()
-		c = IECore.ObjectReader( os.path.join( "test", "IECore", "data", "coordSys.cob" ) ).read()
-
-		self.assertEqual( c.getTransform(), IECoreScene.MatrixTransform( imath.M44f() ) )
-
-		c = IECoreScene.CoordinateSystem( "test", None )
-		IECore.ObjectWriter( c, os.path.join( "test", "IECore", "data", "coordSys.cob" ) ).write()
-		c = IECore.ObjectReader( os.path.join( "test", "IECore", "data", "coordSys.cob" ) ).read()
-
-		self.assertEqual( c.getTransform(), None )
 
 	def testEquality( self ) :
 
@@ -134,21 +87,6 @@ def testEquality( self ) :
 		self.assertNotEqual( c2, c1 )
 		c1.setName( "test" )
 
-		c1.setTransform( IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertNotEqual( c1, c2 )
-		self.assertNotEqual( c2, c1 )
-
-		c2.setTransform( IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertEqual( c1, c2 )
-		self.assertEqual( c2, c1 )
-
-	def testMemoryUsage( self ) :
-
-		c = IECoreScene.CoordinateSystem( "test" )
-		m = c.memoryUsage()
-		c.setTransform( IECoreScene.MatrixTransform( imath.M44f() ) )
-		self.assertTrue( c.memoryUsage() > m )
-
 	def tearDown( self ) :
 
 		if os.path.exists( os.path.join( "test", "IECore", "data", "coordSys.cob" ) ) :