Skip to content

USD CameraAlgo : Fix writing of animated parameters #1529

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

Merged
murraystevenson merged 1 commit into from
Apr 9, 2026
Merged

USD CameraAlgo : Fix writing of animated parameters #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Improvements

- USDScene : Added loading of ArnoldProcedural prims as Cortex ExternalProcedural objects.

Fixes
-----

- USDScene : Fixed writing of animated camera parameters.

10.6.4.0 (relative to 10.6.3.1)
========

Expand Down
32 changes: 16 additions & 16 deletions contrib/IECoreUSD/src/IECoreUSD/CameraAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,27 @@ bool writeCamera( const IECoreScene::Camera *camera, const pxr::UsdStagePtr &sta
auto usdCamera = pxr::UsdGeomCamera::Define( stage, path );
if( camera->getProjection() == "orthographic" )
{
usdCamera.GetProjectionAttr().Set( pxr::UsdGeomTokens->orthographic );
usdCamera.GetProjectionAttr().Set( pxr::UsdGeomTokens->orthographic, time );

// For ortho cameras, USD uses aperture units of tenths of scene units
usdCamera.GetHorizontalApertureAttr().Set( 10.0f * camera->getAperture()[0] );
usdCamera.GetVerticalApertureAttr().Set( 10.0f * camera->getAperture()[1] );
usdCamera.GetHorizontalApertureOffsetAttr().Set( 10.0f * camera->getApertureOffset()[0] );
usdCamera.GetVerticalApertureOffsetAttr().Set( 10.0f * camera->getApertureOffset()[1] );
usdCamera.GetHorizontalApertureAttr().Set( 10.0f * camera->getAperture()[0], time );
usdCamera.GetVerticalApertureAttr().Set( 10.0f * camera->getAperture()[1], time );
usdCamera.GetHorizontalApertureOffsetAttr().Set( 10.0f * camera->getApertureOffset()[0], time );
usdCamera.GetVerticalApertureOffsetAttr().Set( 10.0f * camera->getApertureOffset()[1], time );
}
else if( camera->getProjection() == "perspective" )
{
usdCamera.GetProjectionAttr().Set( pxr::UsdGeomTokens->perspective );
usdCamera.GetProjectionAttr().Set( pxr::UsdGeomTokens->perspective, time );

// We store focalLength and aperture in arbitary units. USD uses tenths
// of scene units
float scale = 10.0f * camera->getFocalLengthWorldScale();

usdCamera.GetFocalLengthAttr().Set( camera->getFocalLength() * scale );
usdCamera.GetHorizontalApertureAttr().Set( camera->getAperture()[0] * scale );
usdCamera.GetVerticalApertureAttr().Set( camera->getAperture()[1] * scale );
usdCamera.GetHorizontalApertureOffsetAttr().Set( camera->getApertureOffset()[0] * scale );
usdCamera.GetVerticalApertureOffsetAttr().Set( camera->getApertureOffset()[1] * scale );
usdCamera.GetFocalLengthAttr().Set( camera->getFocalLength() * scale, time );
usdCamera.GetHorizontalApertureAttr().Set( camera->getAperture()[0] * scale, time );
usdCamera.GetVerticalApertureAttr().Set( camera->getAperture()[1] * scale, time );
usdCamera.GetHorizontalApertureOffsetAttr().Set( camera->getApertureOffset()[0] * scale, time );
usdCamera.GetVerticalApertureOffsetAttr().Set( camera->getApertureOffset()[1] * scale, time );
}
else
{
Expand All @@ -189,9 +189,9 @@ bool writeCamera( const IECoreScene::Camera *camera, const pxr::UsdStagePtr &sta
);
}

usdCamera.GetClippingRangeAttr().Set( pxr::GfVec2f( camera->getClippingPlanes().getValue() ) );
usdCamera.GetFStopAttr().Set( camera->getFStop() );
usdCamera.GetFocusDistanceAttr().Set( camera->getFocusDistance() );
usdCamera.GetClippingRangeAttr().Set( pxr::GfVec2f( camera->getClippingPlanes().getValue() ), time );
usdCamera.GetFStopAttr().Set( camera->getFStop(), time );
usdCamera.GetFocusDistanceAttr().Set( camera->getFocusDistance(), time );

if( camera->hasShutter() )
{
Expand All @@ -201,8 +201,8 @@ bool writeCamera( const IECoreScene::Camera *camera, const pxr::UsdStagePtr &sta
/// and Houdini plugin sources, I've been unable to find evidence for
/// anyone else doing this though, so maybe it's one of those things
/// everyone is just getting wrong?
usdCamera.GetShutterOpenAttr().Set( (double)camera->getShutter()[0] );
usdCamera.GetShutterCloseAttr().Set( (double)camera->getShutter()[1] );
usdCamera.GetShutterOpenAttr().Set( (double)camera->getShutter()[0], time );
usdCamera.GetShutterCloseAttr().Set( (double)camera->getShutter()[1], time );
}

return true;
Expand Down
34 changes: 31 additions & 3 deletions contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ def formatCameraName( **kw ) :
for name, cortexCam in testCameras.items() :

cG = pxr.UsdGeom.Camera.Get( usdFile, "/" + name )
c = cG.GetCamera()
c = cG.GetCamera( 0.0 )

self.assertEqual( c.projection.name.lower(), cortexCam.getProjection() )

Expand All @@ -1329,8 +1329,8 @@ def formatCameraName( **kw ) :
self.assertEqual( c.fStop, cortexCam.getFStop() )
self.assertEqual( c.focusDistance, cortexCam.getFocusDistance() )
if cortexCam.hasShutter() :
self.assertEqual( cG.GetShutterOpenAttr().Get(), cortexCam.getShutter()[0] )
self.assertEqual( cG.GetShutterCloseAttr().Get(), cortexCam.getShutter()[1] )
self.assertEqual( cG.GetShutterOpenAttr().Get( 0.0 ), cortexCam.getShutter()[0] )
self.assertEqual( cG.GetShutterCloseAttr().Get( 0.0 ), cortexCam.getShutter()[1] )
else :
self.assertFalse( cG.GetShutterOpenAttr().HasAuthoredValue() )
self.assertFalse( cG.GetShutterCloseAttr().HasAuthoredValue() )
Expand Down Expand Up @@ -1426,6 +1426,34 @@ def assertVectorsAlmostEqual( a, b,**kw ) :

self.assertEqual( camera, roundTripCamera )

def testWriteAnimatedCamera( self ) :

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

cameras = {}
for time in range( 0, 10 ) :

camera = IECoreScene.Camera()
camera.setProjection( "perspective" )
camera.setShutter( imath.V2f( time - 0.25, time + 0.25 ) )
camera.setFocalLength( 1.0 + time * 0.1 )
camera.setClippingPlanes( imath.V2f( time, 1000 ) )

child.writeObject( camera, time )
cameras[time] = camera

del child, root

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

for time in range( 0, 10 ) :
camera = child.readObject( time )
for parameter in ( "shutter", "focalLength", "clippingPlanes" ) :
self.assertEqual( camera.parameters()[parameter], cameras[time].parameters()[parameter] )

def testCornersAndCreases( self ) :

mesh = IECoreScene.MeshPrimitive.createPlane( imath.Box2f( imath.V2f( -1 ), imath.V2f( 1 ) ) )
Expand Down
Loading