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

Added checking of parents against switch and sequence into the

Browse Source 
RemoveRendundentNodeVisitor to prevent breaking of the orinal order of the nodes.
This commit is contained in:
Robert Osfield
2002-12-06 11:16:45 +00:00
parent 1be82ec697
commit 8b58a1df83
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgUtil/Optimizer.cpp
View File

@@ -8,6 +8,8 @@
#include <osg/GeoSet>
#include <osg/Notify>
#include <osg/OccluderNode>
#include <osg/Sequence>
#include <osg/Switch>
#include <typeinfo>
#include <algorithm>
@@ -838,7 +840,7 @@ void Optimizer::RemoveEmptyNodesVisitor::removeEmptyNodes()
++itr)
{
osg::Node* nodeToRemove = (*itr);
osg::ref_ptr<osg::Node> nodeToRemove = (*itr);
// take a copy of parents list since subsequent removes will modify the original one.
osg::Node::ParentList parents = nodeToRemove->getParents();
@@ -847,8 +849,13 @@ void Optimizer::RemoveEmptyNodesVisitor::removeEmptyNodes()
pitr!=parents.end();
++pitr)
{
(*pitr)->removeChild(nodeToRemove);
if ((*pitr)->getNumChildren()==0) newEmptyGroups.insert(*pitr);
osg::Group* parent = *pitr;
if (!dynamic_cast<osg::Sequence*>(parent) &&
!dynamic_cast<osg::Switch*>(parent))
{
parent->removeChild(nodeToRemove.get());
if (parent->getNumChildren()==0) newEmptyGroups.insert(*pitr);
}
}
}