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

Added support for using the CompileContext to do GL object deletion.

Browse Source
This commit is contained in:
Robert Osfield
2007-07-22 20:33:20 +00:00
parent 14fcf4f8b3
commit ff267d1ad6
2 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgViewer/CompositeViewer.cpp
View File

@@ -564,6 +564,8 @@ struct CompositeViewerRenderingOperation : public osg::Operation
_databasePager(databasePager)
{
_sceneView->getCullVisitor()->setDatabaseRequestHandler(_databasePager.get());
_flushOperation = new osg::FlushDeletedGLObjectsOperation(0.1);
}
virtual void operator () (osg::Object*)
@@ -577,6 +579,9 @@ struct CompositeViewerRenderingOperation : public osg::Operation
osgViewer::View* view = dynamic_cast<osgViewer::View*>(_sceneView->getCamera()->getView());
if (view) _sceneView->setFusionDistance(view->getFusionDistanceMode(), view->getFusionDistanceValue());
osg::GraphicsContext* compileContext = osg::GraphicsContext::getCompileContext(_sceneView->getState()->getContextID());
osg::GraphicsThread* compileThread = compileContext ? compileContext->getGraphicsThread() : 0;
_sceneView->inheritCullSettings(*(_sceneView->getCamera()));
_sceneView->cull();
_sceneView->draw();
@@ -588,11 +593,19 @@ struct CompositeViewerRenderingOperation : public osg::Operation
_databasePager->compileGLObjects(*(_sceneView->getState()), availableTime);
}
_sceneView->flushDeletedGLObjects(availableTime);
if (compileThread)
{
compileThread->add(_flushOperation.get());
}
else
{
_sceneView->flushDeletedGLObjects(availableTime);
}
}
osg::observer_ptr<osgUtil::SceneView> _sceneView;
osg::observer_ptr<osgDB::DatabasePager> _databasePager;
osg::observer_ptr<osgUtil::SceneView> _sceneView;
osg::observer_ptr<osgDB::DatabasePager> _databasePager;
osg::ref_ptr<osg::FlushDeletedGLObjectsOperation> _flushOperation;
};
void CompositeViewer::setUpRenderingSupport()