Changeset 7859 for code/trunk

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

Files:

• libraries/core/input/HalfAxis.h (modified) (2 diffs)
• libraries/core/input/KeyBinder.cc (modified) (1 diff)
• libraries/core/input/KeyBinder.h (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (3 diffs)
• orxonox/controllers/NewHumanController.h (modified) (1 diff)

code/trunk/src/libraries/core/input/HalfAxis.h

@@ -58 +58 @@
         bool addParamCommand(ParamCommand* command);
         void clear();
+        void reset();
 
         // axis related
@@ -77 +78 @@
         return success;
     }
+
+    inline void HalfAxis::reset()
+    {
+        this->relVal_ = 0.0f;
+        this->absVal_ = 0.0f;
+        this->hasChanged_ = true;
+    }
 }
 

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -388 +388 @@
     {
         for (unsigned int iDev = 0; iDev < joySticks_.size(); ++iDev)
-        {
             for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)
-            {
-                (*joyStickAxes_[iDev])[i].absVal_ = 0.0f;
-                (*joyStickAxes_[iDev])[i].relVal_ = 0.0f;
-            }
-        }
+                (*joyStickAxes_[iDev])[i].reset();
+    }
+
+    /**
+        @brief Sets the position of the mouse back to 0/0.
+    */
+    void KeyBinder::resetMouseAxes()
+    {
+        this->mousePosition_[0] = 0.0f;
+        this->mousePosition_[1] = 0.0f;
+
+        for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
+            mouseAxes_[i].reset();
     }
 

code/trunk/src/libraries/core/input/KeyBinder.h

@@ -74 +74 @@
         void setConfigValues();
         void resetJoyStickAxes();
+        void resetMouseAxes();
 
     protected: // functions

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();