FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge rev 8900 (Fix for FLT plugin user data handling) onto 2.6.1 branch.

Browse Source
This commit is contained in:
Paul MARTZ
2008-09-23 17:00:24 +00:00
parent 449448fd88
commit 3c9713ff60
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/osgPlugins/OpenFlight/FltExportVisitor.cpp
View File

@@ -256,22 +256,24 @@ FltExportVisitor::apply( osg::MatrixTransform& node )
(*m) *= *rm;
}
std::vector< osg::Referenced* > saveUserDataList;
typedef std::vector< osg::ref_ptr< osg::Referenced > > UserDataList;
UserDataList saveUserDataList( node.getNumChildren() );
unsigned int idx;
for( idx=0; idx<node.getNumChildren(); idx++ )
for( idx=0; idx<node.getNumChildren(); ++idx )
{
saveUserDataList.push_back( node.getChild( idx )->getUserData() );
saveUserDataList[ idx ] = node.getChild( idx )->getUserData();
node.getChild( idx )->setUserData( m.get() );
}
traverse( (osg::Node&)node );
// Restore saved UserData.
unsigned int nd = node.getNumChildren();
while (nd--)
node.getChild( nd )->setUserData(
saveUserDataList[ nd ] );
for( idx=0; idx< node.getNumChildren(); ++idx )
{
node.getChild( idx )->setUserData( saveUserDataList[ idx ].get() );
}
}
void
@@ -286,21 +288,23 @@ FltExportVisitor::apply( osg::PositionAttitudeTransform& node )
osg::Matrix::rotate( node.getAttitude() ) *
osg::Matrix::translate( node.getPosition() ) );
std::vector< osg::Referenced* > saveUserDataList;
typedef std::vector< osg::ref_ptr< osg::Referenced > > UserDataList;
UserDataList saveUserDataList( node.getNumChildren() );
unsigned int idx;
for( idx=0; idx<node.getNumChildren(); idx++ )
for( idx=0; idx<node.getNumChildren(); ++idx )
{
saveUserDataList.push_back( node.getChild( idx )->getUserData() );
saveUserDataList[ idx ] = node.getChild( idx )->getUserData();
node.getChild( idx )->setUserData( m.get() );
}
traverse( (osg::Node&)node );
// Restore saved UserData.
unsigned int nd = node.getNumChildren();
while (nd--)
node.getChild( nd )->setUserData(
saveUserDataList[ nd ] );
for( idx=0; idx<node.getNumChildren(); ++idx )
{
node.getChild( idx )->setUserData( saveUserDataList[ idx ].get() );
}
}