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

USDScene animation fixes #1452

Merged
merged 3 commits into from
Feb 6, 2025
Merged

USDScene animation fixes #1452

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
f530b71
USDScene : Rename `getTime()` to `timeCode()`
johnhaddon Feb 4, 2025
5257c71
USDScene : Fix timecodes used by `writeAttribute()`
johnhaddon Feb 4, 2025
0a75d21
USDScene : Fix timecodes used by `writeBound()`
johnhaddon Feb 4, 2025
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
10 changes: 10 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
10.5.x.x (relative to 10.5.12.0)
========

Fixes
-----

- USDScene :
- Fixed timecodes used when writing animated attributes.
- Fixed timecodes used when writing animated bounds.

10.5.12.0 (relative to 10.5.11.0)
========

Expand Down
30 changes: 15 additions & 15 deletions contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ class USDScene::IO : public RefCounted
return m_stage;
}

pxr::UsdTimeCode getTime( double timeSeconds ) const
pxr::UsdTimeCode timeCode( double timeSeconds ) const
{
return timeSeconds * m_timeCodesPerSecond;
}
Expand Down Expand Up @@ -937,7 +937,7 @@ Imath::Box3d USDScene::readBound( double time ) const
}

pxr::VtArray<pxr::GfVec3f> extents;
attr.Get( &extents, m_root->getTime( time ) );
attr.Get( &extents, m_root->timeCode( time ) );

// When coming from UsdGeomModelAPI, `extents` may contain several bounds,
// on a per-purpose basis. Take the union, since the SceneInterface API only
Expand Down Expand Up @@ -965,12 +965,12 @@ ConstDataPtr USDScene::readTransform( double time ) const

Imath::M44d USDScene::readTransformAsMatrix( double time ) const
{
return localTransform( m_location->prim, m_root->getTime( time ) );
return localTransform( m_location->prim, m_root->timeCode( time ) );
}

ConstObjectPtr USDScene::readObject( double time, const Canceller *canceller ) const
{
return ObjectAlgo::readObject( m_location->prim, m_root->getTime( time ), canceller );
return ObjectAlgo::readObject( m_location->prim, m_root->timeCode( time ), canceller );
}

SceneInterface::Name USDScene::name() const
Expand Down Expand Up @@ -1008,7 +1008,7 @@ void USDScene::writeBound( const Imath::Box3d &bound, double time )
extent.push_back( DataAlgo::toUSD( Imath::V3f( bound.max ) ) );

pxr::UsdAttribute extentAttr = boundable.CreateExtentAttr();
extentAttr.Set( pxr::VtValue( extent ) );
extentAttr.Set( pxr::VtValue( extent ), m_root->timeCode( time ) );
}

void USDScene::writeTransform( const Data *transform, double time )
Expand All @@ -1023,7 +1023,7 @@ void USDScene::writeTransform( const Data *transform, double time )
if( xformable )
{
pxr::UsdGeomXformOp transformOp = xformable.MakeMatrixXform();
const pxr::UsdTimeCode timeCode = m_root->getTime( time );
const pxr::UsdTimeCode timeCode = m_root->timeCode( time );
transformOp.Set( DataAlgo::toUSD( m44->readable() ), timeCode );
}
}
Expand Down Expand Up @@ -1182,7 +1182,7 @@ ConstObjectPtr USDScene::readAttribute( const SceneInterface::Name &name, double
{
return nullptr;
}
pxr::TfToken value; attr.Get( &value, m_root->getTime( time ) );
pxr::TfToken value; attr.Get( &value, m_root->timeCode( time ) );
if( value == pxr::UsdGeomTokens->inherited )
{
return new BoolData( true );
Expand Down Expand Up @@ -1227,15 +1227,15 @@ ConstObjectPtr USDScene::readAttribute( const SceneInterface::Name &name, double
{
pxr::UsdAttribute attr = pxr::UsdGeomGprim( m_location->prim ).GetDoubleSidedAttr();
bool doubleSided;
if( attr.HasAuthoredValue() && attr.Get( &doubleSided, m_root->getTime( time ) ) )
if( attr.HasAuthoredValue() && attr.Get( &doubleSided, m_root->timeCode( time ) ) )
{
return new BoolData( doubleSided );
}
return nullptr;
}
else if( pxr::UsdAttribute attribute = AttributeAlgo::findUSDAttribute( m_location->prim, name.string() ) )
{
return DataAlgo::fromUSD( attribute, m_root->getTime( time ) );
return DataAlgo::fromUSD( attribute, m_root->timeCode( time ) );
}
else
{
Expand All @@ -1260,7 +1260,7 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
pxr::UsdGeomImageable imageable( m_location->prim );
imageable.GetVisibilityAttr().Set(
data->readable() ? pxr::UsdGeomTokens->inherited : pxr::UsdGeomTokens->invisible,
m_root->getTime( time )
m_root->timeCode( time )
);
}
}
Expand Down Expand Up @@ -1293,7 +1293,7 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
pxr::UsdGeomGprim gprim( m_location->prim );
if( gprim )
{
gprim.GetDoubleSidedAttr().Set( data->readable(), m_root->getTime( time ) );
gprim.GetDoubleSidedAttr().Set( data->readable(), m_root->timeCode( time ) );
}
else
{
Expand Down Expand Up @@ -1341,7 +1341,7 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
pxr::TfToken( g.first.string().substr( 10 ) ),
DataAlgo::valueTypeName( d )
);
globalAttribute.Set( DataAlgo::toUSD( d ) );
globalAttribute.Set( DataAlgo::toUSD( d ), m_root->timeCode( time ) );
}
}
}
Expand All @@ -1357,14 +1357,14 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
pxr::UsdGeomPrimvar usdPrimvar = primvarsAPI.CreatePrimvar(
usdName.name, DataAlgo::valueTypeName( data ), pxr::UsdGeomTokens->constant
);
usdPrimvar.Set( DataAlgo::toUSD( data ), time );
usdPrimvar.Set( DataAlgo::toUSD( data ), m_root->timeCode( time ) );
}
else
{
pxr::UsdAttribute newAttribute = m_location->prim.CreateAttribute(
usdName.name, DataAlgo::valueTypeName( data )
);
newAttribute.Set( DataAlgo::toUSD( data ), time );
newAttribute.Set( DataAlgo::toUSD( data ), m_root->timeCode( time ) );
}
}
}
Expand Down Expand Up @@ -1488,7 +1488,7 @@ PrimitiveVariableMap USDScene::readObjectPrimitiveVariables( const std::vector<I

void USDScene::writeObject( const Object *object, double time )
{
if( !ObjectAlgo::writeObject( object, m_root->getStage(), m_location->prim.GetPath(), m_root->getTime( time ) ) )
if( !ObjectAlgo::writeObject( object, m_root->getStage(), m_location->prim.GetPath(), m_root->timeCode( time ) ) )
{
IECore::msg(
IECore::Msg::Warning, "USDScene::writeObject",
Expand Down
35 changes: 35 additions & 0 deletions contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2809,6 +2809,41 @@ def testAttributeBadPrefix( self ):
self.assertEqual( set( root.child( "loc" ).attributeNames() ), set( ['ai:testAttribute' ] ) )
self.assertEqual( root.child( "loc" ).readAttribute( 'ai:testAttribute', 0 ), IECore.FloatData( 9 ) )

def testWriteAnimatedAttribute( self ) :

fileName = os.path.join( self.temporaryDirectory(), "test.usda" )
root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Write )
child = root.createChild( "child" )

for t in ( 0.0, 0.5, 1.0 ) :
child.writeAttribute( "user:test", IECore.FloatData( t ), t )

del child, root

root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
child = root.child( "child" )

for t in ( 0.0, 0.5, 1.0 ) :
self.assertEqual( child.readAttribute( "user:test", t ), IECore.FloatData( t ) )

def testWriteAnimatedBound( self ) :

fileName = os.path.join( self.temporaryDirectory(), "test.usda" )
root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Write )
child = root.createChild( "child" )

for t in ( 1.0, 1.5, 2.0 ) :
child.writeObject( IECoreScene.SpherePrimitive( t ), t )
child.writeBound( imath.Box3d( imath.V3d( -t ), imath.V3d( t ) ), t )

del child, root

root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
child = root.child( "child" )

for t in ( 1.0, 1.5, 2.0 ) :
self.assertEqual( child.readBound( t ), imath.Box3d( imath.V3d( -t ), imath.V3d( t ) ) )

def testShaders( self ) :

# Write shaders
Expand Down