Changeset 6170

Timestamp:

Nov 26, 2009, 11:29:20 PM (14 years ago)

Author:

rgrieder

Message:

Reduced camera lag induced by occasional high delta times.

Location:

code/branches/presentation2/src/orxonox/graphics

Files:

• Camera.cc (modified) (3 diffs)
• Camera.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/graphics/Camera.cc

@@ -69 +69 @@
         this->bDrag_ = false;
         this->nearClipDistance_ = 1;
+        this->lastDtLagged_ = false;
 
         this->setSyncMode(0x0);
@@ -111 +112 @@
         if (this->bDrag_)
         {
-            dt = dt / this->getTimeFactor();
             // this stuff here may need some adjustments
-            float coeff = std::min(1.0f, 15.0f * dt);
+            float coeff = 15.0f * dt / this->getTimeFactor();
+            // Only clamp if fps rate is actually falling. Occasional high dts should
+            // not be clamped to reducing lagging effects.
+            if (coeff > 1.0f)
+            {
+                if (this->lastDtLagged_)
+                    coeff = 1.0f;
+                else
+                    this->lastDtLagged_ = true;
+            }
+            else
+                this->lastDtLagged_ = false;
 
             Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
@@ -119 +130 @@
 
             this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
-            //this->cameraNode_->setOrientation(this->getWorldOrientation());
         }
     }

code/branches/presentation2/src/orxonox/graphics/Camera.h

@@ -73 +73 @@
             bool             bHasFocus_;
             bool             bDrag_;
+            bool             lastDtLagged_;
     };
 }