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

Fixed handling of case of no graphics contexts being assigned

Browse Source
This commit is contained in:
Robert Osfield 2009-04-21 10:13:19 +00:00
parent 147486f57a
commit c6a4fc6680
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/osgDB/DatabasePager.cpp
View File

@ -111,7 +111,7 @@ RefPtrAdapter<FuncObj> refPtrAdapt(const FuncObj& func)
class DatabasePager::FindCompileableGLObjectsVisitor : public osg::NodeVisitor
{
public:
FindCompileableGLObjectsVisitor(DatabasePager::DataToCompile& dataToCompile,
FindCompileableGLObjectsVisitor(DatabasePager::DataToCompile* dataToCompile,
bool changeAutoUnRef, bool valueAutoUnRef,
bool changeAnisotropy, float valueAnisotropy,
DatabasePager::DrawablePolicy drawablePolicy,
@ -127,7 +127,6 @@ public:
{
_kdTreeBuilder = osgDB::Registry::instance()->getKdTreeBuilder()->clone();
}
}
META_NodeVisitor("osgDB","FindCompileableGLObjectsVisitor")
@ -154,7 +153,6 @@ public:
{
geode.accept(*_kdTreeBuilder);
}
}
inline void apply(osg::StateSet* stateset)
@ -197,9 +195,9 @@ public:
}
}
}
if (compileStateSet)
if (compileStateSet && _dataToCompile)
{
_dataToCompile.first.insert(stateset);
_dataToCompile->first.insert(stateset);
}
}
@ -240,14 +238,14 @@ public:
//
// XXX This "compiles" VBOs too, but compilation doesn't do
// anything for VBOs, does it?
if (drawable->getUseDisplayList() && !_pager->isCompiled(drawable))
if (_dataToCompile && drawable->getUseDisplayList() && !_pager->isCompiled(drawable))
{
// osg::notify(osg::NOTICE)<<" Found compilable drawable"<<std::endl;
_dataToCompile.second.push_back(drawable);
_dataToCompile->second.push_back(drawable);
}
}
DatabasePager::DataToCompile& _dataToCompile;
DatabasePager::DataToCompile* _dataToCompile;
bool _changeAutoUnRef;
bool _valueAutoUnRef;
bool _changeAnisotropy;
@ -595,8 +593,12 @@ void DatabasePager::DatabaseThread::run()
// merged with the main scene graph and large computeBound() isn't incurred.
ActiveGraphicsContexts::iterator itr = _pager->_activeGraphicsContexts.begin();
DataToCompile& dtc = databaseRequest->_dataToCompileMap[*itr];
++itr;
DataToCompile* dtc = 0;
if (itr != _pager->_activeGraphicsContexts.end())
{
dtc = &(databaseRequest->_dataToCompileMap[*itr]);
++itr;
}
// find all the compileable rendering objects
DatabasePager::FindCompileableGLObjectsVisitor frov(dtc,
@ -619,7 +621,7 @@ void DatabasePager::DatabaseThread::run()
if (_pager->_doPreCompile &&
!_pager->_activeGraphicsContexts.empty())
{
if (!dtc.first.empty() || !dtc.second.empty())
if (!dtc->first.empty() || !dtc->second.empty())
{
loadedObjectsNeedToBeCompiled = true;
@ -628,7 +630,7 @@ void DatabasePager::DatabaseThread::run()
itr != _pager->_activeGraphicsContexts.end();
++itr)
{
databaseRequest->_dataToCompileMap[*itr] = dtc;
databaseRequest->_dataToCompileMap[*itr] = *dtc;
}
}
}
@ -644,7 +646,7 @@ void DatabasePager::DatabaseThread::run()
++itr;
// find all the compileable rendering objects
DatabasePager::FindCompileableGLObjectsVisitor frov(dtc,
DatabasePager::FindCompileableGLObjectsVisitor frov(&dtc,
_pager->_changeAutoUnRef, _pager->_valueAutoUnRef,
_pager->_changeAnisotropy, _pager->_valueAnisotropy,
_pager->_drawablePolicy,
@ -1493,7 +1495,7 @@ public:
{
}
META_NodeVisitor("osgDB","FindCompileableGLObjectsVisitor")
META_NodeVisitor("osgDB","MarkPagedLODsVisitor")
virtual void apply(osg::PagedLOD& plod)
{