Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Created a Transform2dPlug and it's test cases. #234

Merged
merged 4 commits into from
May 3, 2013
Merged

Created a Transform2dPlug and it's test cases. #234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8f0fa3
Created a Transform2dPlug and it's test cases.
goddardl Apr 30, 2013
3bb8aa2
Changed getChild() calls to use an index from the first plug rather t…
goddardl May 3, 2013
c705966
Rebased and added Recursive Child Iterator.
goddardl May 3, 2013
7297d13
Renamed Transform2dPlug to Transform2DPlug
goddardl May 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Renamed Transform2dPlug to Transform2DPlug
  • Loading branch information
@goddardl
goddardl committed May 3, 2013
commit 7297d139cf224d5a59d298efa9d99c5c0b3a33a2
22 changes: 11 additions & 11 deletions include/Gaffer/Transform2dPlug.h → include/Gaffer/Transform2DPlug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
namespace Gaffer
{

class Transform2dPlug : public CompoundPlug
class Transform2DPlug : public CompoundPlug
{

public :

Transform2dPlug( const std::string &name = staticTypeName(), Direction direction=In, unsigned flags = Default );
virtual ~Transform2dPlug();
Transform2DPlug( const std::string &name = staticTypeName(), Direction direction=In, unsigned flags = Default );
virtual ~Transform2DPlug();

IE_CORE_DECLARERUNTIMETYPEDEXTENSION( Transform2dPlug, Transform2dPlugTypeId, CompoundPlug );
IE_CORE_DECLARERUNTIMETYPEDEXTENSION( Transform2DPlug, Transform2DPlugTypeId, CompoundPlug );

virtual bool acceptsChild( const GraphComponent *potentialChild ) const;
virtual PlugPtr createCounterpart( const std::string &name, Direction direction ) const;
Expand All @@ -71,15 +71,15 @@ class Transform2dPlug : public CompoundPlug
static size_t g_firstPlugIndex;
};

IE_CORE_DECLAREPTR( Transform2dPlug );
IE_CORE_DECLAREPTR( Transform2DPlug );

typedef FilteredChildIterator<PlugPredicate<Plug::Invalid, Transform2dPlug> > Transform2dPlugIterator;
typedef FilteredChildIterator<PlugPredicate<Plug::In, Transform2dPlug> > InputTransform2dPlugIterator;
typedef FilteredChildIterator<PlugPredicate<Plug::Out, Transform2dPlug> > OutputTransform2dPlugIterator;
typedef FilteredChildIterator<PlugPredicate<Plug::Invalid, Transform2DPlug> > Transform2DPlugIterator;
typedef FilteredChildIterator<PlugPredicate<Plug::In, Transform2DPlug> > InputTransform2DPlugIterator;
typedef FilteredChildIterator<PlugPredicate<Plug::Out, Transform2DPlug> > OutputTransform2DPlugIterator;

typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::Invalid, Transform2dPlug> > RecursiveTransform2dPlugPlugIterator;
typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::In, Transform2dPlug> > RecursiveInputTransform2dPlugPlugIterator;
typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::Out, Transform2dPlug> > RecursiveOutputTransform2dPlugPlugIterator;
typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::Invalid, Transform2DPlug> > RecursiveTransform2DPlugPlugIterator;
typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::In, Transform2DPlug> > RecursiveInputTransform2DPlugPlugIterator;
typedef FilteredRecursiveChildIterator<PlugPredicate<Gaffer::Plug::Out, Transform2DPlug> > RecursiveOutputTransform2DPlugPlugIterator;

} // namespace Gaffer

Expand Down
2 changes: 1 addition & 1 deletion include/Gaffer/TypeIds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ enum TypeId
ExecutableNodeTypeId = 110055,
ExecutableOpHolderTypeId = 110056,
DespatcherTypeId = 110057,
Transform2dPlugTypeId = 110058,
Transform2DPlugTypeId = 110058,
LastTypeId = 110200,

};
Expand Down
2 changes: 1 addition & 1 deletion ...e/GafferBindings/Transform2dPlugBinding.h → ...e/GafferBindings/Transform2DPlugBinding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
namespace GafferBindings
{

void bindTransform2dPlug();
void bindTransform2DPlug();

} // namespace GafferBindings

Expand Down
12 changes: 6 additions & 6 deletions python/GafferTest/Transform2dPlugTest.py → python/GafferTest/Transform2DPlugTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
import Gaffer
import math

class Transform2dPlugTest( unittest.TestCase ) :
class Transform2DPlugTest( unittest.TestCase ) :

def testMatrix( self ) :

p = Gaffer.Transform2dPlug()
p = Gaffer.Transform2DPlug()

p["pivot"].setValue( IECore.V2f( 1, 1 ) )
p["translate"].setValue( IECore.V2f( 1, 2 ) )
Expand Down Expand Up @@ -73,7 +73,7 @@ def testMatrix( self ) :

def testTransformOrderExplicit( self ) :

plug = Gaffer.Transform2dPlug()
plug = Gaffer.Transform2DPlug()

t = IECore.V2f( 100, 0 )
r = 90
Expand All @@ -97,16 +97,16 @@ def testTransformOrderExplicit( self ) :

def testCreateCounterpart( self ) :

t = Gaffer.Transform2dPlug()
t = Gaffer.Transform2DPlug()
t2 = t.createCounterpart( "a", Gaffer.Plug.Direction.Out )

self.assertEqual( t2.getName(), "a" )
self.assertEqual( t2.direction(), Gaffer.Plug.Direction.Out )
self.assertTrue( isinstance( t2, Gaffer.Transform2dPlug ) )
self.assertTrue( isinstance( t2, Gaffer.Transform2DPlug ) )

def testRunTimeTyped( self ) :

p = Gaffer.Transform2dPlug()
p = Gaffer.Transform2DPlug()
self.failIf( p.typeId() == Gaffer.CompoundPlug.staticTypeId() )
self.failUnless( p.isInstanceOf( Gaffer.CompoundPlug.staticTypeId() ) )

Expand Down
34 changes: 17 additions & 17 deletions src/Gaffer/Transform2dPlug.cpp → src/Gaffer/Transform2DPlug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@

#include "IECore/AngleConversion.h"

#include "Gaffer/Transform2dPlug.h"
#include "Gaffer/Transform2DPlug.h"

using namespace Imath;
using namespace Gaffer;

IE_CORE_DEFINERUNTIMETYPED( Transform2dPlug );
IE_CORE_DEFINERUNTIMETYPED( Transform2DPlug );

size_t Transform2dPlug::g_firstPlugIndex = 0;
size_t Transform2DPlug::g_firstPlugIndex = 0;

Transform2dPlug::Transform2dPlug( const std::string &name, Direction direction, unsigned flags )
Transform2DPlug::Transform2DPlug( const std::string &name, Direction direction, unsigned flags )
: CompoundPlug( name, direction, flags )
{
storeIndexOfNextChild( g_firstPlugIndex );
Expand Down Expand Up @@ -96,61 +96,61 @@ Transform2dPlug::Transform2dPlug( const std::string &name, Direction direction,

}

Transform2dPlug::~Transform2dPlug()
Transform2DPlug::~Transform2DPlug()
{
}

bool Transform2dPlug::acceptsChild( const GraphComponent *potentialChild ) const
bool Transform2DPlug::acceptsChild( const GraphComponent *potentialChild ) const
{
return children().size() != 4;
}

PlugPtr Transform2dPlug::createCounterpart( const std::string &name, Direction direction ) const
PlugPtr Transform2DPlug::createCounterpart( const std::string &name, Direction direction ) const
{
return new Transform2dPlug( name, direction, getFlags() );
return new Transform2DPlug( name, direction, getFlags() );
}

V2fPlug *Transform2dPlug::pivotPlug()
V2fPlug *Transform2DPlug::pivotPlug()
{
return getChild<V2fPlug>( g_firstPlugIndex+3 );
}

const V2fPlug *Transform2dPlug::pivotPlug() const
const V2fPlug *Transform2DPlug::pivotPlug() const
{
return getChild<V2fPlug>( g_firstPlugIndex+3 );
}

V2fPlug *Transform2dPlug::translatePlug()
V2fPlug *Transform2DPlug::translatePlug()
{
return getChild<V2fPlug>( g_firstPlugIndex );
}

const V2fPlug *Transform2dPlug::translatePlug() const
const V2fPlug *Transform2DPlug::translatePlug() const
{
return getChild<V2fPlug>( g_firstPlugIndex );
}

FloatPlug *Transform2dPlug::rotatePlug()
FloatPlug *Transform2DPlug::rotatePlug()
{
return getChild<FloatPlug>( g_firstPlugIndex+1 );
}

const FloatPlug *Transform2dPlug::rotatePlug() const
const FloatPlug *Transform2DPlug::rotatePlug() const
{
return getChild<FloatPlug>( g_firstPlugIndex+1 );
}

V2fPlug *Transform2dPlug::scalePlug()
V2fPlug *Transform2DPlug::scalePlug()
{
return getChild<V2fPlug>( g_firstPlugIndex+2 );
}

const V2fPlug *Transform2dPlug::scalePlug() const
const V2fPlug *Transform2DPlug::scalePlug() const
{
return getChild<V2fPlug>( g_firstPlugIndex+2 );
}

Imath::M33f Transform2dPlug::matrix() const
Imath::M33f Transform2DPlug::matrix() const
{
M33f p;
p.translate( pivotPlug()->getValue() );
Expand Down
14 changes: 7 additions & 7 deletions ...GafferBindings/Transform2dPlugBinding.cpp → ...GafferBindings/Transform2DPlugBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@

#include "IECorePython/RunTimeTypedBinding.h"

#include "Gaffer/Transform2dPlug.h"
#include "Gaffer/Transform2DPlug.h"

#include "GafferBindings/PlugBinding.h"
#include "GafferBindings/Transform2dPlugBinding.h"
#include "GafferBindings/Transform2DPlugBinding.h"

using namespace boost::python;
using namespace GafferBindings;
using namespace Gaffer;

void GafferBindings::bindTransform2dPlug()
void GafferBindings::bindTransform2DPlug()
{
IECorePython::RunTimeTypedClass<Transform2dPlug>()
IECorePython::RunTimeTypedClass<Transform2DPlug>()
.def(
init< const std::string &, Gaffer::Plug::Direction, unsigned >
(
(
arg( "name" ) = Gaffer::Transform2dPlug::staticTypeName(),
arg( "name" ) = Gaffer::Transform2DPlug::staticTypeName(),
arg( "direction" ) = Gaffer::Plug::In,
arg( "flags" ) = Gaffer::Plug::Default
)
)
)
.GAFFERBINDINGS_DEFPLUGWRAPPERFNS( Transform2dPlug )
.def( "matrix", &Transform2dPlug::matrix )
.GAFFERBINDINGS_DEFPLUGWRAPPERFNS( Transform2DPlug )
.def( "matrix", &Transform2DPlug::matrix )
;
}
4 changes: 2 additions & 2 deletions src/GafferModule/GafferModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#include "GafferBindings/BoxPlugBinding.h"
#include "GafferBindings/ExpressionBinding.h"
#include "GafferBindings/TransformPlugBinding.h"
#include "GafferBindings/Transform2dPlugBinding.h"
#include "GafferBindings/Transform2DPlugBinding.h"
#include "GafferBindings/CompoundDataPlugBinding.h"
#include "GafferBindings/RandomBinding.h"
#include "GafferBindings/DependencyNodeBinding.h"
Expand Down Expand Up @@ -111,7 +111,7 @@ BOOST_PYTHON_MODULE( _Gaffer )
bindBoxPlug();
bindExpression();
bindTransformPlug();
bindTransform2dPlug();
bindTransform2DPlug();
bindCompoundDataPlug();
bindRandom();
bindBox();
Expand Down