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

Updates for Gaffer 0.60 #49

Merged
merged 3 commits into from
Jun 23, 2021
Merged

Updates for Gaffer 0.60 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b41ca2
AtomsCrowdGenerator : Use modern scope methods
andrewkaufman Jun 23, 2021
2aaae20
AtomsCrowdReaderTest : Relax affects test
andrewkaufman Jun 23, 2021
bb611cf
AtomsCrowdGenerator : Add doc for destination plug
andrewkaufman Jun 23, 2021
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
1 change: 1 addition & 0 deletions include/AtomsGaffer/AtomsCrowdGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class AtomsCrowdGenerator : public GafferScene::BranchCreator
struct AgentScope : public Gaffer::Context::EditableScope
{
AgentScope( const Gaffer::Context *context, const ScenePath &branchPath );
ScenePath m_agentPath;
};

static size_t g_firstPlugIndex;
Expand Down
1 change: 1 addition & 0 deletions python/AtomsGafferTest/AtomsAttributesTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def testConstruct( self ) :
a = AtomsGaffer.AtomsAttributes()
self.assertEqual( a.getName(), "AtomsAttributes" )

@unittest.expectedFailure
def testCompute( self ) :

raise RuntimeError, "Write tests for AtomsAttributes"
Expand Down
11 changes: 6 additions & 5 deletions python/AtomsGafferTest/AtomsCrowdReaderTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import IECore
import IECoreScene

import Gaffer

import GafferTest
import GafferSceneTest

Expand Down Expand Up @@ -253,11 +255,10 @@ def testAffects( self ) :
ss = GafferTest.CapturingSlot( a.plugDirtiedSignal() )

a["name"].setValue( "army" )
self.assertEqual( len( ss ), 4 )
self.failUnless( ss[0][0].isSame( a["name"] ) )
self.failUnless( ss[1][0].isSame( a["out"]["childNames"] ) )
self.failUnless( ss[2][0].isSame( a["out"]["set"] ) )
self.failUnless( ss[3][0].isSame( a["out"] ) )
if Gaffer.About.compatibilityVersion() < 60 :
self.assertEqual( len( ss ), 4 )
else :
self.assertEqual( len( ss ), 7 )

del ss[:]

Expand Down
12 changes: 12 additions & 0 deletions python/AtomsGafferUI/AtomsCrowdGeneratorUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@

],

"destination" : [

"description",
"""
The location where the agents will be placed in the output scene.
When the destination is evaluated, the `${scene:path}` variable holds
the location of the crowd points, so the default value parents the agents
under the points.
"""

],

"variations" : [

"description",
Expand Down
23 changes: 11 additions & 12 deletions src/AtomsGaffer/AtomsCrowdGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Imath::Box3f AtomsCrowdGenerator::computeBranchBound( const ScenePath &parentPat
Imath::Box3d agentClothBBox;
ConstCompoundObjectPtr crowd;
{
ScenePlug::PathScope scope( context, parentPath );
ScenePlug::PathScope scope( context, &parentPath );
crowd = runTimeCast<const CompoundObject>( inPlug()->attributesPlug()->getValue() );
agentClothBBox = agentClothBoudingBox( parentPath, branchPath );
}
Expand Down Expand Up @@ -644,7 +644,7 @@ ConstCompoundObjectPtr AtomsCrowdGenerator::computeBranchAttributes( const Scene
int currentAgentIndex = std::atoi( branchPath[3].string().c_str() );

int agentIdPointIndex = -1;
ScenePlug::PathScope scope( context, parentPath );
ScenePlug::PathScope scope( context, &parentPath );
auto points = runTimeCast<const PointsPrimitive>( inPlug()->objectPlug()->getValue() );

if ( !points )
Expand Down Expand Up @@ -836,7 +836,7 @@ ConstObjectPtr AtomsCrowdGenerator::computeBranchObject( const ScenePath &parent
int agentIdPointIndex = -1;
auto& pointVariablesData = pointVariables.writable();
{
ScenePlug::PathScope scope(context, parentPath);
ScenePlug::PathScope scope(context, &parentPath);
points = runTimeCast<const PointsPrimitive>(inPlug()->objectPlug()->getValue());
}

Expand Down Expand Up @@ -1178,31 +1178,30 @@ ConstPathMatcherDataPtr AtomsCrowdGenerator::computeBranchSet( const ScenePath &

IECore::ConstCompoundDataPtr AtomsCrowdGenerator::agentChildNames( const ScenePath &parentPath, const Gaffer::Context *context ) const
{
ScenePlug::PathScope scope( context, parentPath );
ScenePlug::PathScope scope( context, &parentPath );
return agentChildNamesPlug()->getValue();
}

void AtomsCrowdGenerator::agentChildNamesHash( const ScenePath &parentPath, const Gaffer::Context *context, IECore::MurmurHash &h ) const
{
ScenePlug::PathScope scope( context, parentPath );
ScenePlug::PathScope scope( context, &parentPath );
agentChildNamesPlug()->hash( h );
}

AtomsCrowdGenerator::AgentScope::AgentScope( const Gaffer::Context *context, const ScenePath &branchPath )
: EditableScope( context )
{
ScenePath agentPath;
agentPath.reserve( 1 + ( branchPath.size() > 4 ? branchPath.size() - 4 : 0 ) );
m_agentPath.reserve( 1 + ( branchPath.size() > 4 ? branchPath.size() - 4 : 0 ) );
if( branchPath.size() > 1 )
agentPath.push_back( branchPath[1] );
m_agentPath.push_back( branchPath[1] );
if( branchPath.size() > 2 )
agentPath.push_back( branchPath[2] );
m_agentPath.push_back( branchPath[2] );
if( branchPath.size() > 4 )
{
agentPath.insert( agentPath.end(), branchPath.begin() + 4, branchPath.end() );
m_agentPath.insert( m_agentPath.end(), branchPath.begin() + 4, branchPath.end() );
}

set( ScenePlug::scenePathContextName, agentPath );
set( ScenePlug::scenePathContextName, &m_agentPath );
}

void AtomsCrowdGenerator::atomsPoseHash( const ScenePath &parentPath, const ScenePath &branchPath, const Gaffer::Context *context, MurmurHash &h ) const
Expand Down Expand Up @@ -1646,7 +1645,7 @@ Imath::M44f AtomsCrowdGenerator::agentRootMatrix(
{
ConstCompoundObjectPtr crowd;
{
ScenePlug::PathScope scope( context, parentPath );
ScenePlug::PathScope scope( context, &parentPath );
crowd = runTimeCast<const CompoundObject>( inPlug()->attributesPlug()->getValue() );
}

Expand Down