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

Moved switching off of the cursor till after the slide event handler has had a chance to switch off the scene.

Browse Source
This commit is contained in:
Robert Osfield 2011-10-24 13:40:29 +00:00
parent 1538ecf113
commit 9b380c8d49
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
applications/present3D/present3D.cpp
View File

@ -827,6 +827,19 @@ int main( int argc, char **argv )
viewerInitialized = true; viewerInitialized = true;
} }
// pass the model to the slide event handler so it knows which to manipulate.
seh->set(loadedModel.get());
seh->selectSlide(0);
seh->home();
if (!outputFileName.empty())
{
osgDB::writeNodeFile(*loadedModel,outputFileName);
return 0;
}
if (!cursorFileName.empty()) if (!cursorFileName.empty())
{ {
// have to add a frame in here to avoid problems with X11 threading issue on switching off the cursor // have to add a frame in here to avoid problems with X11 threading issue on switching off the cursor
@ -845,18 +858,6 @@ int main( int argc, char **argv )
} }
} }
// pass the model to the slide event handler so it knows which to manipulate.
seh->set(loadedModel.get());
seh->selectSlide(0);
seh->home();
if (!outputFileName.empty())
{
osgDB::writeNodeFile(*loadedModel,outputFileName);
return 0;
}
osg::Timer_t startOfFrameTick = osg::Timer::instance()->tick(); osg::Timer_t startOfFrameTick = osg::Timer::instance()->tick();
double targetFrameTime = 1.0/targetFrameRate; double targetFrameTime = 1.0/targetFrameRate;