Skip to content

Commit 1dfcee0

Browse files
committed
LiveScene: renamed objects -> objectNum to better convey the meaning
1 parent 9f99dd7 commit 1dfcee0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

include/IECoreNuke/LiveScene.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class IECORENUKE_API LiveScene : public IECoreScene::SceneInterface
122122

123123
DD::Image::GeometryList geometryList( const double& frame ) const;
124124
DD::Image::GeometryList geometryList( DD::Image::Op* op, const double& frame ) const;
125+
unsigned objectNum( const double* time=nullptr ) const;
125126
DD::Image::GeoInfo* object( const unsigned& index, const double* time=nullptr ) const;
126127

127128
std::string geoInfoPath( const int& index ) const;

src/IECoreNuke/LiveScene.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void LiveScene::cacheGeometryList( const double& frame ) const
195195
}
196196
}
197197

198-
unsigned LiveScene::objects( const double* time) const
198+
unsigned LiveScene::objectNum( const double* time) const
199199
{
200200
double frame;
201201
if ( time )
@@ -348,7 +348,7 @@ Imath::Box3d LiveScene::readBound( double time ) const
348348
bound.makeEmpty();
349349
std::string rootPathStr;
350350
IECoreScene::SceneInterface::Path currentPath;
351-
for( unsigned i=0; i < objects( &time ); ++i )
351+
for( unsigned i=0; i < objectNum( &time ); ++i )
352352
{
353353
auto nameValue = geoInfoPath( i );
354354
auto result = m_pathMatcher.match( nameValue );
@@ -393,7 +393,7 @@ void LiveScene::writeBound( const Imath::Box3d &bound, double time )
393393

394394
ConstDataPtr LiveScene::readTransform( double time ) const
395395
{
396-
for( unsigned i=0; i < objects( &time ); ++i )
396+
for( unsigned i=0; i < objectNum( &time ); ++i )
397397
{
398398
auto nameValue = geoInfoPath( i );
399399
auto result = m_pathMatcher.match( nameValue );
@@ -476,7 +476,7 @@ void LiveScene::hashSet( const Name& setName, IECore::MurmurHash &h ) const
476476

477477
bool LiveScene::hasObject() const
478478
{
479-
for( unsigned i=0; i < objects(); ++i )
479+
for( unsigned i=0; i < objectNum(); ++i )
480480
{
481481
auto nameValue = geoInfoPath( i );
482482
auto result = m_pathMatcher.match( nameValue );
@@ -491,7 +491,7 @@ bool LiveScene::hasObject() const
491491

492492
ConstObjectPtr LiveScene::readObject( double time, const IECore::Canceller *canceller) const
493493
{
494-
for( unsigned i=0; i < objects(); ++i )
494+
for( unsigned i=0; i < objectNum(); ++i )
495495
{
496496
auto nameValue = geoInfoPath( i );
497497
auto result = m_pathMatcher.match( nameValue );
@@ -533,7 +533,7 @@ void LiveScene::childNames( NameList &childNames ) const
533533
childNames.clear();
534534
std::vector<std::string> allPaths;
535535

536-
for( unsigned i=0; i < objects(); ++i )
536+
for( unsigned i=0; i < objectNum(); ++i )
537537
{
538538
auto nameValue = geoInfoPath( i );
539539
auto result = m_pathMatcher.match( nameValue );

0 commit comments

Comments
 (0)