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

Set the delete of expired subgraphs in the database thread to false, to

Browse Source 
prevent problems with osgText.  Will need to solve the dirtyTextureObject
issue.
This commit is contained in:
Robert Osfield
2004-01-26 14:51:01 +00:00
parent a32759eafb
commit f21a70a4e7
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osgDB/DatabasePager.cpp
View File

@@ -27,7 +27,7 @@ DatabasePager::DatabasePager()
_threadPriorityDuringFrame = PRIORITY_MIN;
_threadPriorityOutwithFrame = PRIORITY_NOMINAL;
_deleteRemovedSubgraphsInDatabaseThread = true;
_deleteRemovedSubgraphsInDatabaseThread = false;//true;
_expiryDelay = 1.0;
@@ -550,19 +550,6 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime)
//osg::notify(osg::INFO)<<" PagedLOD "<<plod<<" refcount "<<plod->referenceCount()<<std::endl;
}
}
// for all the subgraphs to remove find all the textures and drawables and
// strip them from the display lists.
{
ReleaseTexturesAndDrawablesVisitor rtadv;
for(osg::NodeList::iterator nitr=childrenRemoved.begin();
nitr!=childrenRemoved.end();
++nitr)
{
(*nitr)->accept(rtadv);
}
}
if (osgDB::Registry::instance()->getSharedStateManager())
osgDB::Registry::instance()->getSharedStateManager()->prune();
@@ -570,6 +557,16 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime)
if (_deleteRemovedSubgraphsInDatabaseThread)
{
// for all the subgraphs to remove find all the textures and drawables and
// strip them from the display lists.
ReleaseTexturesAndDrawablesVisitor rtadv;
for(osg::NodeList::iterator nitr=childrenRemoved.begin();
nitr!=childrenRemoved.end();
++nitr)
{
(*nitr)->accept(rtadv);
}
// transfer the removed children over to the to delete list so the database thread can delete them.
_childrenToDeleteListMutex.lock();
_childrenToDeleteList.insert(_childrenToDeleteList.begin(),childrenRemoved.begin(),childrenRemoved.end());