Changeset 6195 for code/branches/presentation2/src/orxonox/graphics

Timestamp:

Dec 2, 2009, 2:40:22 PM (15 years ago)

Author:

wirthmi

Message:

More camera easing, new center overlay and pauseControl/resumeControl

File:

• code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) (2 diffs)

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

@@ -114 +114 @@
         {
             // this stuff here may need some adjustments
-            float coeff = 15.0f * dt / this->getTimeFactor();
+            float poscoeff = 15.0f * dt / this->getTimeFactor();
+            float anglecoeff = 7.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 (poscoeff > 1.0f)
             {
                 if (this->lastDtLagged_)
-                    coeff = 1.0f;
+                    poscoeff = 1.0f;
+                else
+                    this->lastDtLagged_ = true;
+            }
+            else
+                this->lastDtLagged_ = false;
+
+            if (anglecoeff > 1.0f)
+            {
+                if (this->lastDtLagged_)
+                    anglecoeff = 1.0f;
                 else
                     this->lastDtLagged_ = true;
@@ -128 +139 @@
 
             Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
-            this->cameraNode_->translate(coeff * offset);
+            this->cameraNode_->translate(poscoeff * offset);
 
-            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
+            this->cameraNode_->setOrientation(Quaternion::Slerp(anglecoeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
         }