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

Added better invalidation of the inactive and active PageLOD lists when children are invalidated when parents are removed.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-18 15:33:59 +00:00
parent 4a0c21a5fc
commit 07e43822e6
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osgDB/DatabasePager.cpp
View File

@@ -1569,10 +1569,14 @@ public:
virtual void apply(osg::PagedLOD& plod)
{
++_numPagedLODs;
_pagedLODs.insert(&plod);
traverse(plod);
}
int _numPagedLODs;
typedef std::set<osg::PagedLOD*> PagedLODset;
PagedLODset _pagedLODs;
int _numPagedLODs;
};
void DatabasePager::removeExpiredSubgraphs(const osg::FrameStamp& frameStamp)
@@ -1684,15 +1688,16 @@ void DatabasePager::removeExpiredSubgraphs(const osg::FrameStamp& frameStamp)
for(PagedLODList::iterator itr = _inactivePagedLODList.begin();
itr!=_inactivePagedLODList.end() && countPagedLODsVisitor._numPagedLODs<numToPrune;
++itr)
)
{
osg::ref_ptr<osg::PagedLOD> plod = itr->lock();
if (plod.valid())
if (plod.valid() && countPagedLODsVisitor._pagedLODs.count(plod.get())==0)
{
osg::NodeList localChildrenRemoved;
plod->removeExpiredChildren(expiryTime, expiryFrame, localChildrenRemoved);
if (!localChildrenRemoved.empty())
{
for(osg::NodeList::iterator critr = localChildrenRemoved.begin();
critr!=localChildrenRemoved.end();
++critr)
@@ -1702,19 +1707,23 @@ void DatabasePager::removeExpiredSubgraphs(const osg::FrameStamp& frameStamp)
std::copy(localChildrenRemoved.begin(),localChildrenRemoved.end(),std::back_inserter(childrenRemoved));
}
// advance the iterator to the next element
++itr;
}
else
{
itr = _inactivePagedLODList.erase(itr);
OSG_NOTICE<<"DatabasePager::removeExpiredSubgraphs() _inactivePagedLOD has been invalidated, but ignored"<<std::endl;
}
}
for(PagedLODList::iterator itr = _activePagedLODList.begin();
itr!=_activePagedLODList.end() && countPagedLODsVisitor._numPagedLODs<numToPrune;
++itr)
)
{
osg::ref_ptr<osg::PagedLOD> plod = itr->lock();
if (plod.valid())
if (plod.valid() && countPagedLODsVisitor._pagedLODs.count(plod.get())==0)
{
osg::NodeList localChildrenRemoved;
plod->removeExpiredChildren(expiryTime, expiryFrame, localChildrenRemoved);
@@ -1729,9 +1738,13 @@ void DatabasePager::removeExpiredSubgraphs(const osg::FrameStamp& frameStamp)
std::copy(localChildrenRemoved.begin(),localChildrenRemoved.end(),std::back_inserter(childrenRemoved));
}
// advance the iterator to the next element
++itr;
}
else
{
itr = _inactivePagedLODList.erase(itr);
OSG_NOTICE<<"DatabasePager::removeExpiredSubgraphs() _activePagedLOD has been invalidated, but ignored"<<std::endl;
}
}