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

Changed the Viewer::realize() calls across to not using the threading paramter

Browse Source 
leaving it up to the Viewer to specify the mode (which by default is MultiThreaded).
Added a check for the presence of osgParticle systems so that threading is
disabled in this case.
This commit is contained in:
Robert Osfield
2003-04-08 15:18:45 +00:00
parent afef5ad2fa
commit e928bca4c9
41 changed files with 105 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgProducer/Viewer.cpp
View File

@@ -172,16 +172,23 @@ unsigned int Viewer::addCameraManipulator(osgGA::CameraManipulator* cm)
return num;
}
void Viewer::realize( ThreadingModel thread_model)
bool Viewer::realize( ThreadingModel thread_model )
{
if( _realized ) return _realized;
_thread_model = thread_model;
return realize();
}
OsgCameraGroup::realize( thread_model );
bool Viewer::realize()
{
if (_realized) return _realized;
OsgCameraGroup::realize();
// force a sync before we intialize the keyswitch manipulator to home
// so that Producer has a chance to set up the windows before we do
// any work on them.
//OsgCameraGroup::sync();
OsgCameraGroup::sync();
if (_keyswitchManipulator.valid() && _keyswitchManipulator->getCurrentCameraManipulator())
{
@@ -201,6 +208,7 @@ void Viewer::realize( ThreadingModel thread_model)
(*p)->setCamera(_old_style_osg_camera.get());
}
return _realized;
}
void Viewer::sync()