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

Refactored the click_to_run implementation to avoid bug associated with running the first click_to_run entry in a layer when

Browse Source 
subsequent click to run's are called.
This commit is contained in:
Robert Osfield
2012-01-24 14:27:17 +00:00
parent 76b1c8e20e
commit 6aa6e9a38c
2 changed files with 47 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgPresentation/SlideShowConstructor
View File

@@ -387,6 +387,8 @@ public:
void layerClickToDoOperation(const std::string& command, Operation operation, bool relativeJump=true, int slideNum=0, int layerNum=0);
void layerClickEventOperation(const KeyPosition& keyPos, bool relativeJump=true, int slideNum=0, int layerNum=0);
void addToCurrentLayer(osg::Node* subgraph);
void addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData);
void addParagraph(const std::string& paragraph, PositionData& positionData, FontData& fontData);
@@ -511,6 +513,10 @@ protected:
osg::ref_ptr<FilePathData> _filePathData;
osg::ref_ptr<osg::Group> _layerToApplyEventCallbackTo;
osg::ref_ptr<osgGA::GUIEventHandler> _currentEventCallbackToApply;
std::string findFileAndRecordPath(const std::string& filename);
void recordOptionsFilePath(const osgDB::Options* options);