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

Improved the handling of data attached to proxy nodes

Browse Source
This commit is contained in:
Robert Osfield
2005-05-17 14:25:11 +00:00
parent 83d3f7639f
commit 5947b97cde
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/osgUtil/Optimizer.cpp
View File

@@ -1326,21 +1326,50 @@ void Optimizer::RemoveLoadedProxyNodesVisitor::removeRedundantNodes()
osg::ref_ptr<osg::Group> group = dynamic_cast<osg::Group*>(*itr);
if (group.valid())
{
// take a copy of parents list since subsequent removes will modify the original one.
osg::Node::ParentList parents = group->getParents();
// first check to see if data was attached to the ProxyNode that we need to keep.
bool keepData = false;
if (!group->getName().empty()) keepData = true;
if (!group->getDescriptions().empty()) keepData = true;
if (group->getNodeMask()) keepData = true;
if (group->getUpdateCallback()) keepData = true;
if (group->getEventCallback()) keepData = true;
if (group->getCullCallback()) keepData = true;
for(unsigned int i=0;i<group->getNumChildren();++i)
if (keepData)
{
osg::Node* child = group->getChild(i);
// create a group to store all proxy's children and data.
osg::ref_ptr<osg::Group> newGroup = new osg::Group(*group,osg::CopyOp::SHALLOW_COPY);
// take a copy of parents list since subsequent removes will modify the original one.
osg::Node::ParentList parents = group->getParents();
for(osg::Node::ParentList::iterator pitr=parents.begin();
pitr!=parents.end();
++pitr)
{
(*pitr)->replaceChild(group.get(),child);
(*pitr)->replaceChild(group.get(),newGroup.get());
}
}
else
{
// take a copy of parents list since subsequent removes will modify the original one.
osg::Node::ParentList parents = group->getParents();
for(unsigned int i=0;i<group->getNumChildren();++i)
{
osg::Node* child = group->getChild(i);
for(osg::Node::ParentList::iterator pitr=parents.begin();
pitr!=parents.end();
++pitr)
{
(*pitr)->replaceChild(group.get(),child);
}
}
}
}
else
{