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

Fixed the return value of SlideEventHandler::selectLayer() so that the 'n' now works correctly.

Browse Source
This commit is contained in:
Robert Osfield 2012-01-03 15:59:19 +00:00
parent b828f5c083
commit 329f98c83b
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgPresentation/SlideEventHandler.cpp
View File

@ -1087,8 +1087,11 @@ bool SlideEventHandler::selectLayer(int layerNum)
{
if (!_slideSwitch) return false;
bool withinSlide = true;
if (layerNum>=static_cast<int>(_slideSwitch->getNumChildren()))
{
withinSlide = false;
layerNum = LAST_POSITION;
}
@ -1106,14 +1109,19 @@ bool SlideEventHandler::selectLayer(int layerNum)
OSG_INFO<<"Selected layer '"<<_slideSwitch->getChild(_activeLayer)->getName()<<"' num="<<_activeLayer<< std::endl;
return true;
return withinSlide;
}
bool SlideEventHandler::nextLayerOrSlide()
{
OSG_INFO<<"nextLayerOrSlide()"<<std::endl;
if (nextLayer()) return true;
else return nextSlide();
if (nextLayer())
{
return true;
}
else
{
return nextSlide();
}
}
bool SlideEventHandler::previousLayerOrSlide()
@ -1171,8 +1179,6 @@ bool SlideEventHandler::previousSlide()
bool SlideEventHandler::nextLayer()
{
OSG_INFO<<"nextLayer()"<<std::endl;
LayerAttributes* la = (_slideSwitch.valid() && _activeLayer<static_cast<int>(_slideSwitch->getNumChildren())) ? dynamic_cast<LayerAttributes*>(_slideSwitch->getChild(_activeLayer)->getUserData()) : 0;
if (la)
{
@ -1200,6 +1206,7 @@ bool SlideEventHandler::nextLayer()
}
}
OSG_INFO<<"nextLayer() calling selectLayer("<<_activeLayer+1<<")"<<std::endl;
return selectLayer(_activeLayer+1);
}