Changeset 1465

Timestamp:

May 28, 2008, 11:12:18 PM (16 years ago)

Author:

rgrieder

Message:

• fixed bug with shaking camera
• made part of camera adjustments more fps independent
• fixed a bug in KeyBinder

Location:

code/branches/network/src

Files:

• core/InputManager.cc (modified) (1 diff)
• core/KeyBinder.cc (modified) (1 diff)
• orxonox/objects/Camera.cc (modified) (1 diff)

code/branches/network/src/core/InputManager.cc

@@ -560 +560 @@
       case IS_NODETECT:
         _restoreState();
+        keysDown_.clear();
+        mouseButtonsDown_.clear();
+        joyStickButtonsDown_[0].clear();
         state_ = IS_NODETECT;
         stateRequest_ = savedState_;

code/branches/network/src/core/KeyBinder.cc

@@ -341 +341 @@
       paramCommands_[i] = cmds[i];
     paramCommands_[i] = command;
-    delete[] cmds;
+    if (nParamCommands_ > 1)
+      delete[] cmds;
     return true;
   }

code/branches/network/src/orxonox/objects/Camera.cc

@@ -76 +76 @@
   void Camera::tick(float dt)
   {
-    if(this->positionNode_ != NULL) {
+    if (this->positionNode_ != NULL)
+    {
       // this stuff here may need some adjustments
-      Vector3 offset = this->positionNode_->getWorldPosition() - this->cameraNode_->getPosition();
-      this->cameraNode_->translate(15*dt*offset);
+      Vector3 offset = this->positionNode_->getWorldPosition() - this->cameraNode_->getWorldPosition();
+      float coeff = 15.0f * dt;
+      if (coeff > 1.0f)
+        coeff = 1.0f;
 
-      this->cameraNode_->setOrientation(Quaternion::Slerp(0.7, this->positionNode_->getWorldOrientation(), this->cameraNode_->getWorldOrientation(), false));
+      this->cameraNode_->translate(coeff * offset);
+
+      this->cameraNode_->setOrientation(Quaternion::Slerp(7.0f * dt, this->positionNode_->getWorldOrientation(), this->cameraNode_->getWorldOrientation(), false));
     }
   }