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

Added more comprehensive releaseGLObjects(State*=0) throughout Nodes,

Browse Source 
Drawables,StateSet, and osgDB::Registry.

Added cleanup_frame() from to osgProducer::OsgCamerGroup to help with proper
clean of OpenGL objects before exit, and modified osgviewer, osghangglider,
osgwindows examples to do the extra frame call to cleanup_frame() before exit.
This commit is contained in:
Robert Osfield
2005-05-07 20:47:09 +00:00
parent 08d5f9f85a
commit d1a1b1d95c
23 changed files with 167 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgUtil/SceneView.cpp
View File

@@ -641,15 +641,14 @@ void SceneView::releaseAllGLObjects()
{
if (!_sceneData) return;
GLObjectsVisitor globjv(GLObjectsVisitor::RELEASE_DISPLAY_LISTS|GLObjectsVisitor::RELEASE_STATE_ATTRIBUTES);
globjv.setNodeMaskOverride(0xffffffff);
globjv.setState(_state.get());
_sceneData->accept(globjv);
_sceneData->releaseGLObjects(_state.get());
}
void SceneView::flushAllDeletedGLObjects()
{
osg::notify(osg::NOTICE)<<"SceneView::flushAllDeletedGLObjects()"<<std::endl;
_requiresFlush = false;
double availableTime = 100.0f;
@@ -660,7 +659,8 @@ void SceneView::flushAllDeletedGLObjects()
osg::Drawable::flushDeletedVertexBufferObjects(_state->getContextID(),currentTime,availableTime);
osg::VertexProgram::flushDeletedVertexProgramObjects(_state->getContextID(),currentTime,availableTime);
osg::FragmentProgram::flushDeletedFragmentProgramObjects(_state->getContextID(),currentTime,availableTime);
}
osg::Program::flushDeletedGlPrograms(_state->getContextID(),currentTime,availableTime);
}
void SceneView::flushDeletedGLObjects(double& availableTime)
{
@@ -672,6 +672,7 @@ void SceneView::flushDeletedGLObjects(double& availableTime)
osg::Drawable::flushDeletedVertexBufferObjects(_state->getContextID(),currentTime,availableTime);
osg::VertexProgram::flushDeletedVertexProgramObjects(_state->getContextID(),currentTime,availableTime);
osg::FragmentProgram::flushDeletedFragmentProgramObjects(_state->getContextID(),currentTime,availableTime);
osg::Program::flushDeletedGlPrograms(_state->getContextID(),currentTime,availableTime);
}
void SceneView::draw()