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

Changed HelpHandler so it supports use with CompositeViewer and Viewer

Browse Source
This commit is contained in:
Robert Osfield 2007-09-30 19:15:32 +00:00
parent a5ed021066
commit 4cf73d4c87
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/osgcompositeviewer/osgcompositeviewer.cpp
View File

@ -249,8 +249,8 @@ int main( int argc, char **argv )
view->addEventHandler( statesetManipulator.get() );
osg::ref_ptr<osgViewer::StatsHandler> statsHandler = new osgViewer::StatsHandler;
view->addEventHandler( statsHandler.get() );
view->addEventHandler( new osgViewer::StatsHandler );
view->addEventHandler( new osgViewer::HelpHandler );
}
// view two
@ -283,6 +283,7 @@ int main( int argc, char **argv )
}
while (arguments.read("-s")) { viewer.setThreadingModel(osgViewer::CompositeViewer::SingleThreaded); }
while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::CompositeViewer::ThreadPerContext); }
while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::CompositeViewer::ThreadPerCamera); }

4
include/osgViewer/ViewerEventHandlers
View File

@ -50,9 +50,9 @@ class OSGVIEWER_EXPORT HelpHandler : public osgGA::GUIEventHandler
protected:
void setUpHUDCamera(osgViewer::Viewer* viewer);
void setUpHUDCamera(osgViewer::ViewerBase* viewer);
void setUpScene(osgViewer::Viewer* viewer);
void setUpScene(osgViewer::ViewerBase* viewer);
osg::ref_ptr<osg::ApplicationUsage> _applicationUsage;

9
src/osgViewer/HelpHandler.cpp
View File

@ -40,7 +40,10 @@ void HelpHandler::reset()
bool HelpHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
{
osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
if (!view) return false;
osgViewer::ViewerBase* viewer = view->getViewerBase();
if (!viewer) return false;
if (ea.getHandled()) return false;
@ -77,7 +80,7 @@ bool HelpHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapt
}
void HelpHandler::setUpHUDCamera(osgViewer::Viewer* viewer)
void HelpHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
{
osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
@ -106,7 +109,7 @@ void HelpHandler::setUpHUDCamera(osgViewer::Viewer* viewer)
_initialized = true;
}
void HelpHandler::setUpScene(osgViewer::Viewer* viewer)
void HelpHandler::setUpScene(osgViewer::ViewerBase* viewer)
{
_switch = new osg::Switch;