Changeset 10419

Timestamp:

06/25/09 20:11:29 (4 years ago)

Author:

robert

Message:

From Lee Bulter, "I noticed that when "throwing" things the rate of motion once thrown was
dependent on the complexity of the geometry. For complex scenes this
meant that it looked like you were "throwing" the display into molasses.
For simple geometry things get over-excited once thrown.

The fix is to factor in the frame rendering time to the caluclated
motion. I've implemented this for rotation and panning.

Now when things are thrown they maintain a rate very close to what was
happening when the mouse button was released."

Location:

OpenSceneGraph/trunk

Files:

• include/osgGA/TrackballManipulator (modified) (1 diff)
• src/osgGA/TrackballManipulator.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/include/osgGA/TrackballManipulator

@@ -150 +150 @@
         bool _thrown;
         
+
+        /** Indicates whether "thrown" display should match rate of motion at time of throw.
+          * This is significant on systems where the delta between mouse events can be radically different
+          * from the delta in display update events.
+          */
+        bool _rate_sensitive;
+
+        /** The approximate amount of time it is currently taking to draw a frame. 
+          * This is used to compute the delta in translation/rotation during a thrown display update.
+          * It allows us to match an delta in position/rotation independent of the rendering frame rate.
+          */
+        double _delta_frame_time; 
+
+        /** The time the last frame started.
+          * Used when _rate_sensitive is true so that we can match display update rate to rotation/translation rate.
+          */
+        double _last_frame_time;
+
         osg::Vec3d   _center;
         osg::Quat    _rotation;

OpenSceneGraph/trunk/src/osgGA/TrackballManipulator.cpp

@@ -13 +13 @@
     _allowThrow = true;
     _thrown = false;
+    _rate_sensitive = true;
 
     _distance = 1.0f;
@@ -82 +83 @@
     {
         case(GUIEventAdapter::FRAME):
+        {
+            double current_frame_time = ea.getTime();
+
+            _delta_frame_time = current_frame_time - _last_frame_time;
+            _last_frame_time = current_frame_time;
+
             if (_thrown && _allowThrow)
             {
@@ -87 +94 @@
             }
             return false;
+        }
         default:
             break;
@@ -322 +330 @@
 
         osg::Quat new_rotate;
-        new_rotate.makeRotate(angle,axis);
+
+        if (_thrown && _rate_sensitive && _ga_t0.valid() && _ga_t1.valid())
+        {
+            // frame_time / delta_event_time
+            double rate = _delta_frame_time / (_ga_t0->getTime() - _ga_t1->getTime());
+            new_rotate.makeRotate(angle * rate,axis);
+        } else {
+            new_rotate.makeRotate(angle,axis);
+        }
         
         _rotation = _rotation*new_rotate;
@@ -339 +355 @@
         osg::Matrix rotation_matrix;
         rotation_matrix.makeRotate(_rotation);
+
+        if (_thrown && _rate_sensitive && _ga_t0.valid() && _ga_t1.valid())
+        {
+            // frame_time / delta_event_time
+            double rate = _delta_frame_time / (_ga_t0->getTime() - _ga_t1->getTime());
+            scale *= rate;
+        }
 
         osg::Vec3 dv(dx*scale,dy*scale,0.0f);