Changeset 7860 for code/trunk/src/orxonox/worldentities

Timestamp:

Feb 12, 2011, 11:37:25 AM (14 years ago)

Author:

landauf

Message:

fixed a few issues related to the free mouse look mode (default CTRL key):

• cursor is now moved to the center of the screen after leaving the mouse look mode
• spaceship doesn't spin anymore after leaving the mode
• camera doesn't drag back to the original position after leaving the mode, but jumps back immediately

Location:

code/trunk/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (3 diffs)
• pawns/SpaceShip.cc (modified) (4 diffs)

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -40 +40 @@
 #include "Scene.h"
 #include "infos/PlayerInfo.h"
-#include "controllers/Controller.h"
+#include "controllers/NewHumanController.h"
 #include "graphics/Camera.h"
 #include "worldentities/CameraPosition.h"
@@ -204 +204 @@
                 this->currentCameraPosition_ = 0;
             }
-            
+
             // disable mouse look if the new camera position doesn't allow it
             if (this->currentCameraPosition_ && !this->currentCameraPosition_->getAllowMouseLook() && this->bMouseLook_)
                 this->mouseLook();
+
+            // disable drag if in mouse look
+            if (this->bMouseLook_)
+                this->getCamera()->setDrag(false);
         }
     }
@@ -219 +223 @@
 
             if (!this->bMouseLook_)
+            {
                 this->cameraPositionRootNode_->setOrientation(Quaternion::IDENTITY);
+                this->cameraPositionRootNode_->_update(true, false); // update the camera node because otherwise the camera will drag back in position which looks strange
+
+                NewHumanController* controller = dynamic_cast<NewHumanController*>(this->getController());
+                if (controller)
+                    controller->centerCursor();
+            }
+
             if (this->getCamera())
             {

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -142 +142 @@
                 this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
                 this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
-                this->localAngularAcceleration_.setValue(0, 0, 0);
-            }
-            
+            }
+
+            this->localAngularAcceleration_.setValue(0, 0, 0);
+
             if(!this->bBoostCooldown_ && this->boostPower_ < this->initialBoostPower_)
             {
@@ -161 +162 @@
         }
     }
-    
+
     void SpaceShip::boostCooledDown(void)
     {
@@ -205 +206 @@
         Pawn::rotateRoll(value);
     }
-    
+
     // TODO: something seems to call this function every tick, could probably handled a little more efficiently!
     void SpaceShip::setBoost(bool bBoost)
@@ -211 +212 @@
         if(bBoost == this->bBoost_)
             return;
-    
+
         if(bBoost)
             this->boost();