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

Standardize the call to setUpThreading() in CompositeViewer/Viewer::realize().

Browse Source 
Standardize the call to scene->resizeGLObjects().


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14944 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-07-13 16:03:51 +00:00
parent 1859e27501
commit e94c3334f9
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgViewer/CompositeViewer.cpp
View File

@ -639,14 +639,15 @@ void CompositeViewer::realize()
}
startThreading();
// initialize the global timer to be relative to the current time.
osg::Timer::instance()->setStartTick();
// pass on the start tick to all the associated eventqueues
setStartTick(osg::Timer::instance()->getStartTick());
// configure threading.
setUpThreading();
if (osg::DisplaySettings::instance()->getCompileContextsHint())
{
int numProcessors = OpenThreads::GetNumberOfProcessors();

1
src/osgViewer/Viewer.cpp
View File

@ -587,6 +587,7 @@ void Viewer::realize()
// pass on the start tick to all the associated event queues
setStartTick(osg::Timer::instance()->getStartTick());
// configure threading.
setUpThreading();
if (osg::DisplaySettings::instance()->getCompileContextsHint())

11
src/osgViewer/ViewerBase.cpp
View File

@ -177,6 +177,17 @@ void ViewerBase::setUpThreading()
Scenes scenes;
getScenes(scenes);
for(Scenes::iterator scitr = scenes.begin();
scitr != scenes.end();
++scitr)
{
if ((*scitr)->getSceneData())
{
// update the scene graph so that it has enough GL object buffer memory for the graphics contexts that will be using it.
(*scitr)->getSceneData()->resizeGLObjectBuffers(osg::DisplaySettings::instance()->getMaxNumberOfGraphicsContexts());
}
}
}
}
}