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

Added handling of auto stepping to ON_DEMAND handling.

Browse Source
This commit is contained in:
Robert Osfield
2016-03-10 19:58:35 +00:00
parent 68430ee8e5
commit faea95b5fb
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgPresentation/SlideEventHandler.cpp
View File

@@ -19,6 +19,7 @@
#include <osg/TexEnvCombine>
#include <osg/LightSource>
#include <osg/AlphaFunc>
#include <osg/Timer>
#include <osg/io_utils>
#include <osgUtil/TransformCallback>
@@ -1009,6 +1010,7 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction
_previousTime += getCurrentTimeDelayBetweenSlides();
nextLayerOrSlide();
aa.requestRedraw();
}
else
{
@@ -1676,6 +1678,17 @@ bool SlideEventHandler::checkNeedToDoFrame()
if (_slideSwitch->getChild(_activeLayer)->getNumChildrenRequiringUpdateTraversal()>0) return true;
}
else if (_viewer->getSceneData()!=0 && _viewer->getSceneData()->getNumChildrenRequiringUpdateTraversal()>0) return true;
if (_autoSteppingActive)
{
if (_firstTraversal) return true;
else
{
osg::Timer_t tick = osg::Timer::instance()->tick();
double currentTime = osg::Timer::instance()->delta_s(_viewer->getStartTick(), tick);
if ((currentTime-_previousTime)>=getCurrentTimeDelayBetweenSlides()) return true;
}
}
}
// check if events are available and need processing