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

Added basic support for DatabasePager into osgViewer::Viewer

Browse Source
This commit is contained in:
Robert Osfield
2006-12-21 17:23:07 +00:00
parent 4fc9af7ea0
commit 28fb22568c
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgViewer/View.cpp
View File

@@ -170,8 +170,9 @@ void View::setUpViewAcrossAllScreens()
// Draw operation, that does a draw on the scene graph.
struct RenderingOperation : public osg::GraphicsContext::Operation
{
RenderingOperation(osgViewer::View* view, osg::Camera* camera, osg::FrameStamp* frameStamp):
osg::GraphicsContext::Operation("Render",true)
RenderingOperation(osgViewer::View* view, osg::Camera* camera, osgDB::DatabasePager* databasePager, osg::FrameStamp* frameStamp):
osg::GraphicsContext::Operation("Render",true),
_databasePager(databasePager)
{
_sceneView = new osgUtil::SceneView;
_sceneView->setDefaults();
@@ -180,15 +181,24 @@ struct RenderingOperation : public osg::GraphicsContext::Operation
_sceneView->setSceneData(view->getSceneData());
_sceneView->setFrameStamp(frameStamp);
_sceneView->getCullVisitor()->setDatabaseRequestHandler(_databasePager.get());
}
virtual void operator () (osg::GraphicsContext*)
{
_sceneView->cull();
_sceneView->draw();
if (_databasePager.valid())
{
double availableTime = 0.004; // 4 ms
_databasePager->compileGLObjects(*(_sceneView->getState()), availableTime);
_sceneView->flushDeletedGLObjects(availableTime);
}
}
osg::ref_ptr<osgUtil::SceneView> _sceneView;
osg::ref_ptr<osgUtil::SceneView> _sceneView;
osg::ref_ptr<osgDB::DatabasePager> _databasePager;
};
void View::setUpRenderingSupport()
@@ -197,7 +207,7 @@ void View::setUpRenderingSupport()
if (_camera.valid() && _camera->getGraphicsContext())
{
_camera->getGraphicsContext()->add(new RenderingOperation(this, _camera.get(), frameStamp));
_camera->getGraphicsContext()->add(new RenderingOperation(this, _camera.get(), _scene->getDatabasePager(), frameStamp));
}
for(unsigned i=0; i<getNumSlaves(); ++i)
@@ -205,7 +215,7 @@ void View::setUpRenderingSupport()
Slave& slave = getSlave(i);
if (slave._camera.valid() && slave._camera->getGraphicsContext())
{
slave._camera->getGraphicsContext()->add(new RenderingOperation(this, slave._camera.get(), frameStamp));
slave._camera->getGraphicsContext()->add(new RenderingOperation(this, slave._camera.get(), _scene->getDatabasePager(), frameStamp));
}
}
}

22
src/osgViewer/Viewer.cpp
View File

@@ -266,10 +266,17 @@ void Viewer::frameUpdateTraversal()
void Viewer::frameRenderingTraversals()
{
if (_done) return;
if (_done) return;
typedef std::set<osg::GraphicsContext*> GraphicsContexts;
GraphicsContexts contexts;
osgDB::DatabasePager* dp = _scene->getDatabasePager();
if (dp)
{
dp->signalBeginFrame(_scene->getFrameStamp());
}
typedef std::set<osg::GraphicsContext*> GraphicsContexts;
GraphicsContexts contexts;
if (_camera.valid() && _camera->getGraphicsContext())
{
@@ -292,6 +299,7 @@ void Viewer::frameRenderingTraversals()
}
}
}
for(GraphicsContexts::iterator itr = contexts.begin();
itr != contexts.end();
@@ -301,13 +309,19 @@ void Viewer::frameRenderingTraversals()
const_cast<osg::GraphicsContext*>(*itr)->makeCurrent();
const_cast<osg::GraphicsContext*>(*itr)->runOperations();
}
for(GraphicsContexts::iterator itr = contexts.begin();
itr != contexts.end();
++itr)
{
const_cast<osg::GraphicsContext*>(*itr)->swapBuffers();
}
if (dp)
{
dp->signalEndFrame();
}
}
void Viewer::releaseAllGLObjects()