Changeset 10454 for OpenSceneGraph/trunk/src/osgManipulator/Dragger.cpp

Timestamp:

07/03/09 21:16:53 (3 years ago)

Author:

robert

Message:

Added Dragger::s/getActivationModKeyMask(..) and Dragger::s/getActivationKeyEvent(...) methods to make it possible to have draggers that only respond when you press a specified modified key or standard key.

Changed the optional dragger in osgvolume to require the shift key to be pressed for the dragger to become active.

Files:

• OpenSceneGraph/trunk/src/osgManipulator/Dragger.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgManipulator/Dragger.cpp

@@ -126 +126 @@
 Dragger::Dragger() :
     _handleEvents(false),
-    _draggerActive(false)
+    _draggerActive(false),
+    _activationModKeyMask(0),
+    _activationKeyEvent(0),
+    _activationPermittedByModKeyMask(false),
+    _activationPermittedByKeyEvent(false)
 {
     _parentDragger = this;
@@ -136 +140 @@
 
 Dragger::Dragger(const Dragger& rhs, const osg::CopyOp& copyop):
-    osg::MatrixTransform(rhs, copyop)
+    osg::MatrixTransform(rhs, copyop),
+    _handleEvents(rhs._handleEvents),
+    _draggerActive(false),
+    _activationModKeyMask(rhs._activationModKeyMask),
+    _activationKeyEvent(rhs._activationKeyEvent),
+    _activationPermittedByModKeyMask(false),
+    _activationPermittedByKeyEvent(false)
 {
     osg::notify(osg::NOTICE)<<"CompositeDragger::CompositeDragger(const CompositeDragger& rhs, const osg::CopyOp& copyop) not Implemented yet."<<std::endl;
@@ -251 +261 @@
     bool handled = false;
 
-    switch (ea.getEventType())
-    {
-        case osgGA::GUIEventAdapter::PUSH:
-        {
-            osgUtil::LineSegmentIntersector::Intersections intersections;
-
-            _pointer.reset();
-
-            if (view->computeIntersections(ea.getX(),ea.getY(),intersections))
+    bool activationPermitted = true;
+    if (_activationModKeyMask!=0 || _activationKeyEvent!=0)
+    {
+        _activationPermittedByModKeyMask = (_activationModKeyMask!=0) ?
+            ((ea.getModKeyMask() & _activationModKeyMask)!=0) :
+            false;
+
+        if (_activationKeyEvent!=0)
+        {
+            switch (ea.getEventType())
             {
-                _pointer.setCamera(view->getCamera());
-                _pointer.setMousePosition(ea.getX(), ea.getY());
-
-                for(osgUtil::LineSegmentIntersector::Intersections::iterator hitr = intersections.begin();
-                    hitr != intersections.end();
-                    ++hitr)
+                case osgGA::GUIEventAdapter::KEYDOWN:
                 {
-                    _pointer.addIntersection(hitr->nodePath, hitr->getLocalIntersectPoint());
+                    if (ea.getKey()==_activationKeyEvent) _activationPermittedByKeyEvent = true;
+                    break;
                 }
-                for (osg::NodePath::iterator itr = _pointer._hitList.front().first.begin();
-                        itr != _pointer._hitList.front().first.end();
-                        ++itr)
+                case osgGA::GUIEventAdapter::KEYUP:
                 {
-                    osgManipulator::Dragger* dragger = dynamic_cast<osgManipulator::Dragger*>(*itr);
-                    if (dragger)
+                    if (ea.getKey()==_activationKeyEvent) _activationPermittedByKeyEvent = false;
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+
+        activationPermitted =  _activationPermittedByModKeyMask || _activationPermittedByKeyEvent;
+
+    }
+
+    if (activationPermitted || _draggerActive)
+    {
+        switch (ea.getEventType())
+        {
+            case osgGA::GUIEventAdapter::PUSH:
+            {
+                osgUtil::LineSegmentIntersector::Intersections intersections;
+
+                _pointer.reset();
+
+                if (view->computeIntersections(ea.getX(),ea.getY(),intersections))
+                {
+                    _pointer.setCamera(view->getCamera());
+                    _pointer.setMousePosition(ea.getX(), ea.getY());
+
+                    for(osgUtil::LineSegmentIntersector::Intersections::iterator hitr = intersections.begin();
+                        hitr != intersections.end();
+                        ++hitr)
                     {
-                        if (dragger==this)
+                        _pointer.addIntersection(hitr->nodePath, hitr->getLocalIntersectPoint());
+                    }
+                    for (osg::NodePath::iterator itr = _pointer._hitList.front().first.begin();
+                            itr != _pointer._hitList.front().first.end();
+                            ++itr)
+                    {
+                        osgManipulator::Dragger* dragger = dynamic_cast<osgManipulator::Dragger*>(*itr);
+                        if (dragger)
                         {
-                            dragger->handle(_pointer, ea, aa);
-                            dragger->setDraggerActive(true);
-                            handled = true;
+                            if (dragger==this)
+                            {
+                                dragger->handle(_pointer, ea, aa);
+                                dragger->setDraggerActive(true);
+                                handled = true;
+                            }
                         }
                     }
                 }
             }
-        }
-        case osgGA::GUIEventAdapter::DRAG:
-        case osgGA::GUIEventAdapter::RELEASE:
-        {
-            if (_draggerActive)
+            case osgGA::GUIEventAdapter::DRAG:
+            case osgGA::GUIEventAdapter::RELEASE:
             {
-                _pointer._hitIter = _pointer._hitList.begin();
-                _pointer.setCamera(view->getCamera());
-                _pointer.setMousePosition(ea.getX(), ea.getY());
-
-                handle(_pointer, ea, aa);                
-
-                handled = true;
+                if (_draggerActive)
+                {
+                    _pointer._hitIter = _pointer._hitList.begin();
+                    _pointer.setCamera(view->getCamera());
+                    _pointer.setMousePosition(ea.getX(), ea.getY());
+
+                    handle(_pointer, ea, aa);
+
+                    handled = true;
+                }
+                break;
             }
-            break;
-        }
-        default:
-            break;
-    }
-
-    if (_draggerActive && ea.getEventType() == osgGA::GUIEventAdapter::RELEASE)
-    {
-        setDraggerActive(false);
-        _pointer.reset();
+            default:
+                break;
+        }
+
+        if (_draggerActive && ea.getEventType() == osgGA::GUIEventAdapter::RELEASE)
+        {
+            setDraggerActive(false);
+            _pointer.reset();
+        }
     }