Changeset 7859 for code/trunk/src/orxonox/controllers

Timestamp:

Feb 12, 2011, 11:34:40 AM (14 years ago)

Author:

landauf

Message:

implemented feature to reset the mouse cursor to the center
used in NewHumanController to set cursor to the center of the screen every time the ControllableEntity is changed
avoids turning of the spaceship right after spawn, if the player looked around in spectator mode

needs testing with derived mouse input (joysticks should be unchanged).
input system experts may have a look at this.

Location:

code/trunk/src/orxonox/controllers

Files:

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

code/trunk/src/orxonox/controllers/NewHumanController.cc

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommand.h"
+#include "core/input/KeyBinder.h"
+#include "core/input/KeyBinderManager.h"
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
@@ -347 +349 @@
         this->firemode_ = -1;
         hideArrows();
+    }
+
+    void NewHumanController::centerCursor()
+    {
+        this->currentYaw_ = 0;
+        this->currentPitch_ = 0;
+
+        KeyBinderManager::getInstance().getCurrent()->resetMouseAxes();
     }
 
@@ -481 +491 @@
     {
         this->controlMode_ = 0;
-        this->currentYaw_ = 0;
-        this->currentPitch_ = 0;
+        this->centerCursor();
         if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
         {

code/trunk/src/orxonox/controllers/NewHumanController.h

@@ -61 +61 @@
             virtual void doUnfire();
 
+            void centerCursor();
+
             static void changeMode();