Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Improvements

- MeshAlgo : Changed `reverseWinding()` so that the first vertex of each face remains unchanged. This matches the algorithm used in other DCCs.

Fixes
-----

- USD : Fixed loading when a `primvars:*` attribute conflicts with a primitive variable loaded from a schema attribute, for instance `PointBased.points`. The schema attribute now takes precedence and a warning is emitted.

Breaking Changes
----------------

Expand Down
4 changes: 3 additions & 1 deletion contrib/IECoreUSD/src/IECoreUSD/CurvesAlgo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ IECore::ObjectPtr readCurves( pxr::UsdGeomCurves &curves, pxr::UsdTimeCode time,

Canceller::check( canceller );
IECoreScene::CurvesPrimitivePtr newCurves = new IECoreScene::CurvesPrimitive( countData.get(), basis, wrap );
PrimitiveAlgo::readPrimitiveVariables( curves, time, newCurves.get(), canceller );

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariable(
curves.GetWidthsAttr(), time, newCurves.get(), "width", PrimitiveAlgo::fromUSD( curves.GetWidthsInterpolation() )
);

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariables( curves, time, newCurves.get(), canceller );

return newCurves;
}

Expand Down
6 changes: 3 additions & 3 deletions contrib/IECoreUSD/src/IECoreUSD/GaussianSplatAlgo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ IECore::ObjectPtr readGaussianSplat( pxr::UsdVolParticleField3DGaussianSplat &sp
PrimitiveAlgo::readPrimitiveVariable( splats.GetProjectionModeHintAttr(), time, newPoints.get(), "projectionModeHint", PrimitiveVariable::Interpolation::Constant );
PrimitiveAlgo::readPrimitiveVariable( splats.GetSortingModeHintAttr(), time, newPoints.get(), "sortingModeHint", PrimitiveVariable::Interpolation::Constant );

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariables( pxr::UsdGeomPrimvarsAPI( splats.GetPrim() ), time, newPoints.get(), canceller );

Canceller::check( canceller );
pxr::UsdAttribute orientationsAttr;
splats.UsesFloatOrientations( &orientationsAttr );
Expand Down Expand Up @@ -163,6 +160,9 @@ IECore::ObjectPtr readGaussianSplat( pxr::UsdVolParticleField3DGaussianSplat &sp
}
}

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariables( pxr::UsdGeomPrimvarsAPI( splats.GetPrim() ), time, newPoints.get(), canceller );

return newPoints;
}

Expand Down
4 changes: 3 additions & 1 deletion contrib/IECoreUSD/src/IECoreUSD/PointsAlgo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ namespace
IECore::ObjectPtr readPoints( pxr::UsdGeomPoints &points, pxr::UsdTimeCode time, const Canceller *canceller )
{
IECoreScene::PointsPrimitivePtr newPoints = new IECoreScene::PointsPrimitive( points.GetPointCount( time ) );
PrimitiveAlgo::readPrimitiveVariables( points, time, newPoints.get(), canceller );

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariable( points.GetIdsAttr(), time, newPoints.get(), "id" );
Expand All @@ -73,6 +72,9 @@ IECore::ObjectPtr readPoints( pxr::UsdGeomPoints &points, pxr::UsdTimeCode time,
points.GetWidthsAttr(), time, newPoints.get(), "width", PrimitiveAlgo::fromUSD( points.GetWidthsInterpolation() )
);

Canceller::check( canceller );
PrimitiveAlgo::readPrimitiveVariables( points, time, newPoints.get(), canceller );

return newPoints;
}

Expand Down
26 changes: 16 additions & 10 deletions contrib/IECoreUSD/src/IECoreUSD/PrimitiveAlgo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ void addPrimitiveVariableIfValid( IECoreScene::Primitive *primitive, const std::
return;
}

if( primitive->variables.find( name ) != primitive->variables.end() )
{
IECore::msg( IECore::MessageHandler::Level::Warning, "IECoreUSD::PrimitiveAlgo", "Ignoring duplicate primitive variable \"{}\"", source.GetPath().GetAsString() );
return;
}

primitive->variables[name] = primitiveVariable;
}

Expand Down Expand Up @@ -558,28 +564,28 @@ void IECoreUSD::PrimitiveAlgo::readPrimitiveVariables( const pxr::UsdGeomPrimvar

void IECoreUSD::PrimitiveAlgo::readPrimitiveVariables( const pxr::UsdGeomPointBased &pointBased, pxr::UsdTimeCode time, IECoreScene::Primitive *primitive, const Canceller *canceller )
{
readPrimitiveVariables( pxr::UsdGeomPrimvarsAPI( pointBased.GetPrim() ), time, primitive, canceller );

pxr::UsdSkelRoot skelRoot = pxr::UsdSkelRoot::Find( pointBased.GetPrim() );
if( !skelRoot || !::readPrimitiveVariables( skelRoot, pointBased, time, primitive, canceller ) )
{
Canceller::check( canceller );
readPrimitiveVariable( pointBased.GetPointsAttr(), time, primitive, "P" );

Canceller::check( canceller );
if( !primitive->variables.count( "N" ) )
{
// Only load `PointBased::GetNormalsAttr()` if we didn't already load `primvars:normals`.
// From the USD API docs : "If normals and primvars:normals are both specified, the latter has precedence."
readPrimitiveVariable( pointBased.GetNormalsAttr(), time, primitive, "N", PrimitiveAlgo::fromUSD( pointBased.GetNormalsInterpolation() ) );
}
}

Canceller::check( canceller );
readPrimitiveVariable( pointBased.GetVelocitiesAttr(), time, primitive, "velocity" );

Canceller::check( canceller );
readPrimitiveVariable( pointBased.GetAccelerationsAttr(), time, primitive, "acceleration" );

readPrimitiveVariables( pxr::UsdGeomPrimvarsAPI( pointBased.GetPrim() ), time, primitive, canceller );

Canceller::check( canceller );
if( !primitive->variables.count( "N" ) )
{
// Only load `PointBased::GetNormalsAttr()` if we didn't already load `primvars:normals`.
// From the USD API docs : "If normals and primvars:normals are both specified, the latter has precedence."
readPrimitiveVariable( pointBased.GetNormalsAttr(), time, primitive, "N", PrimitiveAlgo::fromUSD( pointBased.GetNormalsInterpolation() ) );
}
}

void IECoreUSD::PrimitiveAlgo::readPrimitiveVariable( const pxr::UsdAttribute &attribute, pxr::UsdTimeCode timeCode, IECoreScene::Primitive *primitive, const std::string &name, IECoreScene::PrimitiveVariable::Interpolation interpolation )
Expand Down
86 changes: 86 additions & 0 deletions contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4156,6 +4156,92 @@ def testPointInstancerOrientationTypes( self ) :
else :
self.assertEqual( data[0], imath.Quatf( halfOrientation.GetReal(), *halfOrientation.GetImaginary() ) )

def testPrimvarsDontClobberPrimitiveVariablesFromSchemas( self ) :

schemaTypes = [ pxr.UsdGeom.Mesh, pxr.UsdGeom.BasisCurves, pxr.UsdGeom.Points, pxr.UsdGeom.PointInstancer ]
if pxr.Usd.GetVersion() >= ( 0, 26, 3 ) :
gSplatSchemaType = pxr.UsdVol.ParticleField3DGaussianSplat
schemaTypes.append( gSplatSchemaType )
else :
gSplatSchemaType = type( None )

for schemaType in schemaTypes :

with self.subTest( schemaType = schemaType ) :

fileName = os.path.join( self.temporaryDirectory(), f"clashingPrimvars{schemaType.__name__}.usda" )
stage = pxr.Usd.Stage.CreateNew( fileName )
schema = schemaType.Define( stage, "/object" )

if hasattr( schema, "CreatePointsAttr" ) :
schema.CreatePointsAttr( [ ( 1, 1, 1 ) ] * 3 )
else :
# PointInstancer uses a different name for some reason.
schema.CreatePositionsAttr( [ ( 1, 1, 1 ) ] * 3 )

if hasattr( schema, "CreateWidthsAttr" ) :
schema.CreateWidthsAttr().Set( [ 1 ] * 3 )

if hasattr( schema, "CreateScalesAttr" ) :
schema.CreateScalesAttr().Set( [ ( 1, 1, 1 ) ] * 3 )

if isinstance( schema, pxr.UsdGeom.Mesh ) :
schema.CreateFaceVertexCountsAttr().Set( [ 3 ] )
schema.CreateFaceVertexIndicesAttr().Set( [ 0, 1, 2 ] )
elif isinstance( schema, pxr.UsdGeom.BasisCurves ) :
schema.CreateTypeAttr().Set( pxr.UsdGeom.Tokens.linear )
schema.CreateCurveVertexCountsAttr().Set( [ 3 ] )

primvars = pxr.UsdGeom.PrimvarsAPI( schema )
p = primvars.CreatePrimvar( "P", pxr.Sdf.ValueTypeNames.Point3fArray, "vertex" )
p.Set( [ ( 0, 0, 0 ) ] * 3 )
width = primvars.CreatePrimvar( "width", pxr.Sdf.ValueTypeNames.FloatArray, "vertex" )
width.Set( [ 0, 0, 0 ] )
scaleName = "scales" if isinstance( schema, gSplatSchemaType ) else "scale"
scale = primvars.CreatePrimvar( scaleName, pxr.Sdf.ValueTypeNames.Float3Array, "vertex" )
scale.Set( [ ( 0, 0, 0 ) ] * 3 )

stage.GetRootLayer().Save()

root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
with IECore.CapturingMessageHandler() as mh :
primitive = root.child( "object" ).readObject( 0 )

# "P" will clash for all schema types.

self.assertEqual( primitive["P"].data, IECore.V3fVectorData( [ imath.V3f( 1, 1, 1 ) ] * 3, IECore.GeometricData.Interpretation.Point ) )
self.assertGreaterEqual( len( mh.messages ), 1 )
self.assertEqual( mh.messages[0].level, IECore.Msg.Level.Warning )
self.assertEqual( mh.messages[0].context, "IECoreUSD::PrimitiveAlgo" )
self.assertEqual( mh.messages[0].message, 'Ignoring duplicate primitive variable "/object.primvars:P"' )
del mh.messages[0]

# But "widths" will only clash for schemas that have it.

if hasattr( schema, "CreateWidthsAttr" ) :
self.assertEqual( primitive["width"].data, IECore.FloatVectorData( [ 1, 1, 1 ] ) )
self.assertGreaterEqual( len( mh.messages ), 1 )
self.assertEqual( mh.messages[0].level, IECore.Msg.Level.Warning )
self.assertEqual( mh.messages[0].context, "IECoreUSD::PrimitiveAlgo" )
self.assertEqual( mh.messages[0].message, 'Ignoring duplicate primitive variable "/object.primvars:width"' )
del mh.messages[0]
else :
self.assertEqual( primitive["width"].data, IECore.FloatVectorData( [ 0, 0, 0 ] ) )

# Likewise for "scales".

if hasattr( schema, "CreateScalesAttr" ) :
self.assertEqual( primitive[scaleName].data, IECore.V3fVectorData( [ imath.V3f( 1, 1, 1 ) ] * 3 ) )
self.assertGreaterEqual( len( mh.messages ), 1 )
self.assertEqual( mh.messages[0].level, IECore.Msg.Level.Warning )
self.assertEqual( mh.messages[0].context, "IECoreUSD::PrimitiveAlgo" )
self.assertEqual( mh.messages[0].message, f'Ignoring duplicate primitive variable "/object.primvars:{scaleName}"' )
del mh.messages[0]
else :
self.assertEqual( primitive[scaleName].data, IECore.V3fVectorData( [ imath.V3f( 0, 0, 0 ) ] * 3 ) )

self.assertEqual( len( mh.messages ), 0 )

def testArnoldArrayInputs( self ) :

def assertExpectedArrayInputs( network ) :
Expand Down
Loading