Changeset 10454 for OpenSceneGraph/trunk/include/osgManipulator/Dragger

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/include/osgManipulator/Dragger (modified) (1 diff)

OpenSceneGraph/trunk/include/osgManipulator/Dragger

@@ -218 +218 @@
         bool getHandleEvents() const { return _handleEvents; }
 
+        void setActivationModKeyMask(unsigned int mask) { _activationModKeyMask = mask; }
+        unsigned int getActivationModKeyMask() const { return _activationModKeyMask; }
+
+        void setActivationKeyEvent(int key) { _activationKeyEvent = key; }
+        int getActivationKeyEvent() const { return _activationKeyEvent; }
+
+
+        virtual void traverse(osg::NodeVisitor& nv);
+
+        virtual bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa);
+        virtual bool handle(const PointerInfo&, const osgGA::GUIEventAdapter&, osgGA::GUIActionAdapter&) { return false; }
+
+
+        typedef std::vector< osg::ref_ptr<Constraint> > Constraints;
+
+        void addConstraint(Constraint* constraint);
+        void removeConstraint(Constraint* constraint);
+
+        Constraints& getConstraints() { return _constraints; }
+        const Constraints& getConstraints() const { return _constraints; }
+
+
+        typedef std::vector< osg::ref_ptr<DraggerCallback> > DraggerCallbacks;
+
+        void addDraggerCallback(DraggerCallback* dc);
+        void removeDraggerCallback(DraggerCallback* dc);
+
+        DraggerCallbacks& getDraggerCallbacks() { return _draggerCallbacks; }
+        const DraggerCallbacks& getDraggerCallbacks() const { return _draggerCallbacks; }
+
+        void addTransformUpdating(MatrixTransform* transform);
+        void removeTransformUpdating(MatrixTransform* transform);
+
+        /** Setup default geometry for dragger. */
+        virtual void setupDefaultGeometry() {}
+
+    protected:
+
+        Dragger();
+        Dragger(const Dragger& rhs, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
+
+        virtual ~Dragger();
+
+        virtual bool receive(const MotionCommand& command);
+        void dispatch(MotionCommand& command);
+
         void setDraggerActive(bool active) { _draggerActive = active; }
         bool getDraggerActive() const { return _draggerActive; }
 
-
-        virtual void traverse(osg::NodeVisitor& nv);
-
-        virtual bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa);
-        virtual bool handle(const PointerInfo&, const osgGA::GUIEventAdapter&, osgGA::GUIActionAdapter&) { return false; }
-
-
-        typedef std::vector< osg::ref_ptr<Constraint> > Constraints;
-
-        void addConstraint(Constraint* constraint);
-        void removeConstraint(Constraint* constraint);
-
-        Constraints& getConstraints() { return _constraints; }
-        const Constraints& getConstraints() const { return _constraints; }
-
-
-        typedef std::vector< osg::ref_ptr<DraggerCallback> > DraggerCallbacks;
-
-        void addDraggerCallback(DraggerCallback* dc);
-        void removeDraggerCallback(DraggerCallback* dc);
-
-        DraggerCallbacks& getDraggerCallbacks() { return _draggerCallbacks; }
-        const DraggerCallbacks& getDraggerCallbacks() const { return _draggerCallbacks; }
-
-        void addTransformUpdating(MatrixTransform* transform);
-        void removeTransformUpdating(MatrixTransform* transform);
-
-        /** Setup default geometry for dragger. */
-        virtual void setupDefaultGeometry() {}
-
-    protected:
-
-        Dragger();
-        Dragger(const Dragger& rhs, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
-
-        virtual ~Dragger();
-
-        virtual bool receive(const MotionCommand& command);
-        void dispatch(MotionCommand& command);
-
         bool                            _handleEvents;
         bool                            _draggerActive;
+
+        unsigned int                    _activationModKeyMask;
+        int                             _activationKeyEvent;
+        bool                            _activationPermittedByModKeyMask;
+        bool                            _activationPermittedByKeyEvent;
+
         osgManipulator::PointerInfo     _pointer;