diff --git a/include/osgManipulator/Dragger b/include/osgManipulator/Dragger index 9a099692d..74c052e9b 100644 --- a/include/osgManipulator/Dragger +++ b/include/osgManipulator/Dragger @@ -220,6 +220,9 @@ class OSGMANIPULATOR_EXPORT Dragger : public osg::MatrixTransform void setActivationModKeyMask(unsigned int mask) { _activationModKeyMask = mask; } unsigned int getActivationModKeyMask() const { return _activationModKeyMask; } + void setActivationMouseButtonMask(unsigned int mask) { _activationMouseButtonMask = mask; } + unsigned int getActivationMouseButtonMask() const { return _activationMouseButtonMask; } + void setActivationKeyEvent(int key) { _activationKeyEvent = key; } int getActivationKeyEvent() const { return _activationKeyEvent; } @@ -278,8 +281,10 @@ class OSGMANIPULATOR_EXPORT Dragger : public osg::MatrixTransform bool _draggerActive; unsigned int _activationModKeyMask; + unsigned int _activationMouseButtonMask; int _activationKeyEvent; bool _activationPermittedByModKeyMask; + bool _activationPermittedByMouseButtonMask; bool _activationPermittedByKeyEvent; osgManipulator::PointerInfo _pointer; diff --git a/src/osgManipulator/Dragger.cpp b/src/osgManipulator/Dragger.cpp index b667ca599..3f48e1d22 100644 --- a/src/osgManipulator/Dragger.cpp +++ b/src/osgManipulator/Dragger.cpp @@ -166,8 +166,10 @@ Dragger::Dragger() : _handleEvents(false), _draggerActive(false), _activationModKeyMask(0), + _activationMouseButtonMask(0), _activationKeyEvent(0), _activationPermittedByModKeyMask(false), + _activationPermittedByMouseButtonMask(false), _activationPermittedByKeyEvent(false), _intersectionMask(0xffffffff) { @@ -183,12 +185,13 @@ Dragger::Dragger(const Dragger& rhs, const osg::CopyOp& copyop): _handleEvents(rhs._handleEvents), _draggerActive(false), _activationModKeyMask(rhs._activationModKeyMask), + _activationMouseButtonMask(rhs._activationMouseButtonMask), _activationKeyEvent(rhs._activationKeyEvent), _activationPermittedByModKeyMask(false), + _activationPermittedByMouseButtonMask(false), _activationPermittedByKeyEvent(false), _intersectionMask(0xffffffff) { - OSG_NOTICE<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<