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

Restructed handling of LAST_POSITION

Browse Source
This commit is contained in:
Robert Osfield
2016-06-24 15:33:24 +01:00
parent a1ac4dc906
commit 803fd8ac5d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPresentation/SlideEventHandler.cpp
View File

@@ -1305,19 +1305,11 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
OSG_INFO<<"selectSlide("<<slideNum<<","<<layerNum<<")"<<std::endl;
if (slideNum>=static_cast<int>(_presentationSwitch->getNumChildren()))
{
slideNum = LAST_POSITION;
}
if (slideNum<=LAST_POSITION && _presentationSwitch->getNumChildren()>0)
if (slideNum<0 || slideNum>=static_cast<int>(_presentationSwitch->getNumChildren()))
{
slideNum = _presentationSwitch->getNumChildren()-1;
}
if (slideNum>=static_cast<int>(_presentationSwitch->getNumChildren())) return false;
osg::Timer_t tick = osg::Timer::instance()->tick();
if (_firstSlideOrLayerChange)
@@ -1408,7 +1400,7 @@ bool SlideEventHandler::selectLayer(int layerNum)
layerNum = LAST_POSITION;
}
if (layerNum<=LAST_POSITION && _slideSwitch->getNumChildren()>0)
if (layerNum<0)
{
layerNum = _slideSwitch->getNumChildren()-1;
}