Skip to content

IECoreUSD : Support IECore::Object references when determining primvar type. #1280

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
ivanimanishi merged 1 commit into from
Jul 5, 2022
Merged

IECoreUSD : Support IECore::Object references when determining primvar type. #1280

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
49 changes: 39 additions & 10 deletions contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ void SceneCacheData::loadPrimVars( const SceneInterface::Path& currentPath, TfTo
// variables
SceneInterface::Path variablesPath;
variablesPath.push_back( g_ioRoot );
for ( auto& p : currentPath )
for ( const auto& p : currentPath )
{
// avoid injecting the internal root because
// the path would be invalid in the IndexedIO hierarchy
Expand All @@ -675,20 +675,21 @@ void SceneCacheData::loadPrimVars( const SceneInterface::Path& currentPath, TfTo

variablesPath.insert( variablesPath.end(), g_staticIoVariablesPath.begin(), g_staticIoVariablesPath.end() );

if ( auto variables = m_sceneio->directory( variablesPath, IndexedIO::MissingBehaviour::NullIfMissing ) )
if ( const auto variables = m_sceneio->directory( variablesPath, IndexedIO::MissingBehaviour::NullIfMissing ) )
{
IndexedIO::EntryIDList variableLists;
variables->entryIds( variableLists );
for( auto& var: variableLists )

for( const auto& var: variableLists )
{
auto it = find( g_defaultPrimVars.cbegin(), g_defaultPrimVars.cend(), var.value() );
const auto it = find( g_defaultPrimVars.cbegin(), g_defaultPrimVars.cend(), var.value() );
if( it != g_defaultPrimVars.cend() )
{
continue;
}

// interpolation
auto variableIO = variables->subdirectory( var, IndexedIO::MissingBehaviour::NullIfMissing );
const auto variableIO = variables->subdirectory( var, IndexedIO::MissingBehaviour::NullIfMissing );
int interpolationValue = 0;
TfToken usdInterpolation;
if ( !variableIO || !variableIO->hasEntry( g_ioInterpolation ) )
Expand All @@ -701,17 +702,45 @@ void SceneCacheData::loadPrimVars( const SceneInterface::Path& currentPath, TfTo
usdInterpolation = PrimitiveAlgo::toUSD( static_cast<PrimitiveVariable::Interpolation>( interpolationValue ) );

// data type
auto dataType = variableIO->subdirectory( g_ioData, IndexedIO::MissingBehaviour::NullIfMissing );
std::string dataTypeValue;
if( !dataType || !dataType->hasEntry( g_ioType ) )
if( !variableIO->hasEntry( g_ioData ) )
{
IECore::msg( IECore::Msg::Warning, "SceneCacheData::loadPrimVars", boost::format( "Unable to find data for Primitive Variable \"%s\" at location \"%s\"." ) % var % primPath );
continue;
}

ConstIndexedIOPtr dataIO;
const IndexedIO::Entry dataEntry = variableIO->entry( g_ioData );
if( dataEntry.entryType() == IndexedIO::File)
{
if( dataEntry.dataType() != IndexedIO::InternedStringArray )
{
IECore::msg( IECore::Msg::Warning, "SceneCacheData::loadPrimVars", boost::format( "Unable to find reference to data for Primitive Variable \"%s\" at location \"%s\"." ) % var % primPath );
continue;
}
// IECore::Object has saved a reference to the data, so we need to follow the link to the referenced
// directory in order to find the dataType
IndexedIO::EntryIDList referencedPath( dataEntry.arrayLength() );
InternedString *p = referencedPath.data();
variableIO->read( g_ioData, p, dataEntry.arrayLength() );
dataIO = variableIO->directory( referencedPath, IndexedIO::MissingBehaviour::NullIfMissing );
}
else
{
// Get the data subdirectory
dataIO = variableIO->subdirectory( g_ioData, IndexedIO::MissingBehaviour::NullIfMissing );
}

if( !dataIO || !dataIO->hasEntry( g_ioType ) )
{
IECore::msg( IECore::Msg::Warning, "SceneCacheData::loadPrimVars", boost::format( "Unable to find data type for Primitive Variable \"%s\" at location \"%s\"." ) % var % primPath );
continue;
}
dataType->read( g_ioType, dataTypeValue );

std::string dataTypeValue;
dataIO->read( g_ioType, dataTypeValue );

// interpretation
auto interpretationData = dataType->subdirectory( g_ioData, IndexedIO::MissingBehaviour::NullIfMissing );
const auto interpretationData = dataIO->subdirectory( g_ioData, IndexedIO::MissingBehaviour::NullIfMissing );
IntDataPtr interpretationValue = nullptr;
if ( interpretationData && interpretationData->hasEntry( g_interpretation ) )
{
Expand Down
14 changes: 14 additions & 0 deletions contrib/IECoreUSD/test/IECoreUSD/SceneCacheFileFormatTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,9 @@ def testCustomPrimvars( self ):
mesh["customPoint"] = IECoreScene.PrimitiveVariable( IECoreScene.PrimitiveVariable.Interpolation.Vertex, v )
mesh["customIndexedInt"] = IECoreScene.PrimitiveVariable( IECoreScene.PrimitiveVariable.Interpolation.Uniform, IECore.IntVectorData( [12] ), IECore.IntVectorData( [ 0 ] * vertexSize ) )

# Test a shallow copy of a primvar which causes IECore.Object to write a reference into the IndexedIO file
mesh["Pref"] = mesh["P"]

box.writeObject( mesh, 1.0 )
del m, box

Expand Down Expand Up @@ -557,6 +560,14 @@ def testCustomPrimvars( self ):
customIndexedInt = prim.GetAttribute( "primvars:customIndexedInt" )
self.assertEqual( customIndexedInt.GetMetadata( "interpolation" ), pxr.UsdGeom.Tokens.uniform )

# Pref
Pref = prim.GetAttribute( "primvars:Pref" )
self.assertIsNotNone( Pref )
self.assertFalse( Pref.GetMetadata( "custom" ) )
self.assertEqual( Pref.GetMetadata( "typeName" ), pxr.Sdf.ValueTypeNames.Point3fArray )
self.assertEqual( Pref.Get( 24.0 ), pxr.UsdGeom.Mesh( prim ).GetPointsAttr().Get( 24.0 ) )
self.assertEqual( Pref.GetMetadata( "interpolation" ), pxr.UsdGeom.Tokens.vertex )

# round trip
exportPath = os.path.join( self.temporaryDirectory(), "testUSDExportCustomPrimVar.scc" )
stage.Export( exportPath )
Expand All @@ -581,6 +592,9 @@ def testCustomPrimvars( self ):
# indices
self.assertEqual( mesh["customIndexedInt"].indices, IECore.IntVectorData( [0] * vertexSize ) )

# copy
self.assertEqual( mesh["Pref"], mesh["P"] )

def testCornersAndCreases( self ):
fileName = os.path.join( self.temporaryDirectory(), "testUSDCornerAndCreases.scc" )
m = IECoreScene.SceneCache( fileName, IECore.IndexedIO.OpenMode.Write )
Expand Down