Changeset 9896

Timestamp:

03/11/09 11:50:03 (4 years ago)

Author:

robert

Message:

From Martin Beckett, added get/setScrollWheelZoomDelta() support for controlling the mouse scroll wheel zoom delta.

Location:

OpenSceneGraph/trunk

Files:

• include/osgGA/TrackballManipulator (modified) (2 diffs)
• src/osgGA/TrackballManipulator.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgGA/TrackballManipulator

@@ -79 +79 @@
         double getMinimumZoomScale() const { return _minimumZoomScale; }
 
+        /** set the mouse scroll wheel zoom delta.
+          * Range -1.0 to +1.0,  -ve value inverts wheel direction and zero switches off scroll wheel. */
+        void setScroolWheelZoomDelta(double zoomDelta) { _zoomDelta = zoomDelta; }
+
+        /** get the mouse scroll wheel zoom delta. */
+        double getScroolWheelZoomDelta() const { return _zoomDelta; }
+
         /** Set the center of the trackball. */
         void setCenter(const osg::Vec3d& center) { _center = center; }
@@ -140 +147 @@
         double       _distance;
         float        _trackballSize;
+        float        _zoomDelta;
 
 };

OpenSceneGraph/trunk/src/osgGA/TrackballManipulator.cpp

@@ -15 +15 @@
     _distance = 1.0f;
     _trackballSize = 0.8f;
+    _zoomDelta = 0.1f;
 }
 
@@ -246 +247 @@
 bool TrackballManipulator::calcMovement()
 {
-    // mosue scroll is only a single event
+    // mouse scroll is only a single event
     if (_ga_t0.get()==NULL) return false;
 
@@ -255 +256 @@
     if (_ga_t0->getEventType()==GUIEventAdapter::SCROLL)
     {
-        dy = _ga_t0->getScrollingMotion() == osgGA::GUIEventAdapter::SCROLL_DOWN ? -0.1 : 0.1;
+        dy = _ga_t0->getScrollingMotion() == osgGA::GUIEventAdapter::SCROLL_UP ? _zoomDelta : -_zoomDelta;
         buttonMask=GUIEventAdapter::SCROLL;
     }