Changeset 10454 for OpenSceneGraph/trunk/src/osgWrappers/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/osgWrappers/osgManipulator/Dragger.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgWrappers/osgManipulator/Dragger.cpp

@@ -216 +216 @@
                   "",
                   "");
-        I_Method1(void, setDraggerActive, IN, bool, active,
-                  Properties::NON_VIRTUAL,
-                  __void__setDraggerActive__bool,
-                  "",
-                  "");
-        I_Method0(bool, getDraggerActive,
-                  Properties::NON_VIRTUAL,
-                  __bool__getDraggerActive,
+        I_Method1(void, setActivationModKeyMask, IN, unsigned int, mask,
+                  Properties::NON_VIRTUAL,
+                  __void__setActivationModKeyMask__unsigned_int,
+                  "",
+                  "");
+        I_Method0(unsigned int, getActivationModKeyMask,
+                  Properties::NON_VIRTUAL,
+                  __unsigned_int__getActivationModKeyMask,
+                  "",
+                  "");
+        I_Method1(void, setActivationKeyEvent, IN, int, key,
+                  Properties::NON_VIRTUAL,
+                  __void__setActivationKeyEvent__int,
+                  "",
+                  "");
+        I_Method0(int, getActivationKeyEvent,
+                  Properties::NON_VIRTUAL,
+                  __int__getActivationKeyEvent,
                   "",
                   "");
@@ -315 +325 @@
                            "",
                            "");
+        I_ProtectedMethod1(void, setDraggerActive, IN, bool, active,
+                           Properties::NON_VIRTUAL,
+                           Properties::NON_CONST,
+                           __void__setDraggerActive__bool,
+                           "",
+                           "");
+        I_ProtectedMethod0(bool, getDraggerActive,
+                           Properties::NON_VIRTUAL,
+                           Properties::CONST,
+                           __bool__getDraggerActive,
+                           "",
+                           "");
+        I_SimpleProperty(int, ActivationKeyEvent, 
+                         __int__getActivationKeyEvent, 
+                         __void__setActivationKeyEvent__int);
+        I_SimpleProperty(unsigned int, ActivationModKeyMask, 
+                         __unsigned_int__getActivationModKeyMask, 
+                         __void__setActivationModKeyMask__unsigned_int);
         I_SimpleProperty(osgManipulator::CompositeDragger *, Composite, 
                          __CompositeDragger_P1__getComposite, 
@@ -321 +349 @@
                          __Constraints_R1__getConstraints, 
                          0);
-        I_SimpleProperty(bool, DraggerActive, 
-                         __bool__getDraggerActive, 
-                         __void__setDraggerActive__bool);
         I_SimpleProperty(osgManipulator::Dragger::DraggerCallbacks &, DraggerCallbacks, 
                          __DraggerCallbacks_R1__getDraggerCallbacks,