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

Warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2009-05-02 07:50:37 +00:00
parent e40102c954
commit cd5fa24696
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/present3D/SlideEventHandler.h
View File

@@ -214,7 +214,7 @@ public:
enum WhichPosition
{
FIRST_POSITION = 0,
LAST_POSITION = 0xffffffff
LAST_POSITION = -1
};
void compileSlide(unsigned int slideNum);
@@ -222,11 +222,11 @@ public:
unsigned int getNumSlides();
unsigned int getActiveSlide() const { return _activeSlide; }
unsigned int getActiveLayer() const { return _activeLayer; }
int getActiveSlide() const { return _activeSlide; }
int getActiveLayer() const { return _activeLayer; }
bool selectSlide(unsigned int slideNum,unsigned int layerNum=FIRST_POSITION);
bool selectLayer(unsigned int layerNum);
bool selectSlide(int slideNum,int layerNum=FIRST_POSITION);
bool selectLayer(int layerNum);
bool nextLayerOrSlide();
bool previousLayerOrSlide();
@@ -284,10 +284,10 @@ protected:
unsigned int _activePresentation;
osg::ref_ptr<osg::Switch> _presentationSwitch;
unsigned int _activeSlide;
int _activeSlide;
osg::ref_ptr<osg::Switch> _slideSwitch;
unsigned int _activeLayer;
int _activeLayer;
bool _firstTraversal;
double _previousTime;