FGFS-4.1/OpenSceneGraph
4
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;

45
src/osgProducer/Viewer.cpp
View File

@@ -134,7 +134,6 @@ private:
//
Viewer::Viewer():
_done(false),
_kbmcb(0),
_recordingAnimationPath(false)
{
}
@@ -142,7 +141,6 @@ Viewer::Viewer():
Viewer::Viewer(Producer::CameraConfig *cfg):
OsgCameraGroup(cfg),
_done(false),
_kbmcb(0),
_recordingAnimationPath(false)
{
}
@@ -150,7 +148,6 @@ Viewer::Viewer(Producer::CameraConfig *cfg):
Viewer::Viewer(const std::string& configFile):
OsgCameraGroup(configFile),
_done(false),
_kbmcb(0),
_recordingAnimationPath(false)
{
}
@@ -158,7 +155,6 @@ Viewer::Viewer(const std::string& configFile):
Viewer::Viewer(osg::ArgumentParser& arguments):
OsgCameraGroup(arguments),
_done(false),
_kbmcb(0),
_recordingAnimationPath(false)
{
// report the usage options.
@@ -182,27 +178,46 @@ Viewer::Viewer(osg::ArgumentParser& arguments):
}
}
Viewer::~Viewer()
{
}
void Viewer::setKeyboardMouse(Producer::KeyboardMouse* kbm)
{
_kbm = kbm;
if (_kbm.valid() && _kbmcb.valid()) _kbm->setCallback(_kbmcb.get());
}
void Viewer::setKeyboardMouseCallback(KeyboardMouseCallback* kbmcb)
{
_kbmcb = kbmcb;
if (_kbm.valid() && _kbmcb.valid()) _kbm->setCallback(_kbmcb.get());
}
void Viewer::setUpViewer(unsigned int options)
{
// set up the keyboard and mouse handling.
Producer::InputArea *ia = getCameraConfig()->getInputArea();
Producer::KeyboardMouse *kbm = ia ?
(new Producer::KeyboardMouse(ia)) :
(new Producer::KeyboardMouse(getCamera(0)->getRenderSurface()));
if (!_kbm)
{
_kbm = ia ?
(new Producer::KeyboardMouse(ia)) :
(new Producer::KeyboardMouse(getCamera(0)->getRenderSurface()));
}
// set the keyboard mouse callback to catch the events from the windows.
if (!_kbmcb)
_kbmcb = new osgProducer::KeyboardMouseCallback( kbm, _done, (options & ESCAPE_SETS_DONE)!=0 );
_kbmcb = new osgProducer::KeyboardMouseCallback( _kbm.get(), _done, (options & ESCAPE_SETS_DONE)!=0 );
_kbmcb->setStartTick(_start_tick);
// register the callback with the keyboard mouse manger.
kbm->setCallback( _kbmcb );
_kbm->setCallback( _kbmcb.get() );
//kbm->allowContinuousMouseMotionUpdate(true);
kbm->startThread();
_kbm->startThread();
@@ -379,7 +394,7 @@ void Viewer::update()
{
// get the event since the last frame.
osgProducer::KeyboardMouseCallback::EventQueue queue;
if (_kbmcb) _kbmcb->getEventQueue(queue);
if (_kbmcb.valid()) _kbmcb->getEventQueue(queue);
// create an event to signal the new frame.
osg::ref_ptr<osgProducer::EventAdapter> frame_event = new osgProducer::EventAdapter;
@@ -566,7 +581,7 @@ void Viewer::selectCameraManipulator(unsigned int no)
void Viewer::requestWarpPointer(float x,float y)
{
if (_kbmcb)
if (_kbmcb.valid())
{
osg::notify(osg::INFO) << "requestWarpPointer x= "<<x<<" y="<<y<<std::endl;
@@ -579,7 +594,7 @@ void Viewer::requestWarpPointer(float x,float y)
void Viewer::getUsage(osg::ApplicationUsage& usage) const
{
if (_kbmcb && _kbmcb->getEscapeSetDone())
if (_kbmcb.valid() && _kbmcb->getEscapeSetDone())
{
usage.addKeyboardMouseBinding("Escape","Exit the application");
}