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

Add osg_ref<Producer::KeyboardMouse> to osgProducer::Viewer to ensuer that

Browse Source 
the keyboard mousr desctructor is being called correctly.
This commit is contained in:
Robert Osfield
2003-08-23 20:48:36 +00:00
parent 12133c6db5
commit db9b6d10c6
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/osgProducer/Viewer
View File

@@ -44,7 +44,7 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction
Viewer(osg::ArgumentParser& arguments);
virtual ~Viewer() {}
virtual ~Viewer();
enum ViewerOptions
@@ -116,11 +116,13 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction
bool computeIntersections(float x,float y,osgUtil::IntersectVisitor::HitList& hits);
Producer::KeyboardMouse* getKeyboardMouse() { return _kbmcb==0?0:_kbmcb->getKeyboardMouse(); }
const Producer::KeyboardMouse* getKeyboardMouse() const { return _kbmcb==0?0:_kbmcb->getKeyboardMouse(); }
void setKeyboardMouse(Producer::KeyboardMouse* kbm);
Producer::KeyboardMouse* getKeyboardMouse() { return _kbm.get(); }
const Producer::KeyboardMouse* getKeyboardMouse() const { return _kbm.get(); }
KeyboardMouseCallback* getKeyboardMouseCallback() { return _kbmcb; }
const KeyboardMouseCallback* getKeyboardMouseCallback() const { return _kbmcb; }
void setKeyboardMouseCallback(KeyboardMouseCallback* kbmcb);
KeyboardMouseCallback* getKeyboardMouseCallback() { return _kbmcb.get(); }
const KeyboardMouseCallback* getKeyboardMouseCallback() const { return _kbmcb.get(); }
@@ -151,7 +153,10 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction
bool _done;
osgProducer::KeyboardMouseCallback* _kbmcb;
osg::ref_ptr<Producer::KeyboardMouse> _kbm;
osg::ref_ptr<osgProducer::KeyboardMouseCallback> _kbmcb;
EventHandlerList _eventHandlerList;
osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> _keyswitchManipulator;