Changeset 8729 for code/trunk/src/libraries/core/input

Timestamp:

Jul 4, 2011, 2:47:44 AM (13 years ago)

Author:

rgrieder

Message:

Merged unity_build branch back to trunk.

Features:

• Implemented fully automatic build units to speed up compilation if requested
• Added DOUT macro for quick debug output
• Activated text colouring in the POSIX IOConsole
• DeclareToluaInterface is not necessary anymore

Improvements:

• Output levels now change appropriately when switch back and forth from dev mode
• Log level for the file output is now also correct during startup
• Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

• Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

• It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/InputHandler.h (modified) (1 diff)
• src/libraries/core/input/InputManager.cc (modified) (6 diffs)
• src/libraries/core/input/InputManager.h (modified) (4 diffs)
• src/libraries/core/input/InputPrereqs.h (modified) (1 diff)
• src/libraries/core/input/InputState.cc (modified) (1 diff)
• src/libraries/core/input/InputState.h (modified) (3 diffs)
• src/libraries/core/input/JoyStick.h (modified) (1 diff)
• src/libraries/core/input/JoyStickQuantityListener.h (modified) (1 diff)
• src/libraries/core/input/KeyBinderManager.h (modified) (1 diff)
• src/libraries/core/input/KeyDetector.h (modified) (1 diff)
• src/libraries/core/input/Keyboard.h (modified) (1 diff)
• src/libraries/core/input/Mouse.cc (modified) (1 diff)

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

@@ -31 +31 @@
 
 #include "InputPrereqs.h"
-#include "util/Math.h"
 
 namespace orxonox
 {
+    /// A Vector class containing two integers @a x and @a y.
+    class IntVector2
+    {
+    public:
+        IntVector2() : x(0), y(0) { }
+        IntVector2(int _x, int _y) : x(_x), y(_y) { }
+        int x;
+        int y;
+    };
+
     namespace ButtonEvent
     {

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

@@ -94 +94 @@
         , oisInputManager_(0)
         , devices_(2)
-        , exclusiveMouse_(TriBool::False)
+        , exclusiveMouse_(false)
         , emptyState_(0)
         , calibratorCallbackHandler_(0)
@@ -108 +108 @@
 
         if (GraphicsManager::getInstance().isFullScreen())
-            exclusiveMouse_ = TriBool::True;
+            exclusiveMouse_ = true;
         this->loadDevices();
 
@@ -161 +161 @@
         paramList.insert(StringPair("w32_keyboard", "DISCL_FOREGROUND"));
         paramList.insert(StringPair("w32_mouse", "DISCL_FOREGROUND"));
-        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ || GraphicsManager::getInstance().isFullScreen())
         {
             // Disable Windows key plus special keys (like play, stop, next, etc.)
@@ -174 +174 @@
         paramList.insert(StringPair("XAutoRepeatOn", "true"));
 
-        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ || GraphicsManager::getInstance().isFullScreen())
         {
             if (CommandLineParser::getValue("keyboard_no_grab").getBool())
@@ -447 +447 @@
 
         // Check whether we have to change the mouse mode
-        TriBool::Value requestedMode = TriBool::Dontcare;
+        tribool requestedMode = dontcare;
         std::vector<InputState*>& mouseStates = devices_[InputDeviceEnumerator::Mouse]->getStateListRef();
         if (mouseStates.empty())
-            requestedMode = TriBool::False;
+            requestedMode = false;
         else
             requestedMode = mouseStates.front()->getMouseExclusive();
-        if (requestedMode != TriBool::Dontcare && exclusiveMouse_ != requestedMode)
-        {
-            exclusiveMouse_ = requestedMode;
+        if (requestedMode != dontcare && exclusiveMouse_ != requestedMode)
+        {
+            assert(requestedMode != dontcare);
+            exclusiveMouse_ = (requestedMode == true);
             if (!GraphicsManager::getInstance().isFullScreen())
                 this->reloadInternal();
@@ -644 +645 @@
     }
 
-    bool InputManager::setMouseExclusive(const std::string& name, TriBool::Value value)
+    bool InputManager::setMouseExclusive(const std::string& name, tribool value)
     {
         if (name == "empty")

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

@@ -33 +33 @@
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
@@ -39 +38 @@
 
 #include "util/Singleton.h"
-#include "util/TriBool.h"
+#include "util/tribool.h"
 #include "core/WindowEventListener.h"
 
@@ -169 +168 @@
             True if the call was successful, fals if the name was not found
         */
-        bool setMouseExclusive(const std::string& name, TriBool::Value value); // tolua_export
+        bool setMouseExclusive(const std::string& name, tribool value); // tolua_export
 
         //-------------------------------
@@ -215 +214 @@
         OIS::InputManager*                  oisInputManager_;      //!< OIS input manager
         std::vector<InputDevice*>           devices_;              //!< List of all input devices (keyboard, mouse, joy sticks)
-        TriBool::Value                      exclusiveMouse_;       //!< Currently applied mouse mode
+        bool                                exclusiveMouse_;       //!< Currently applied mouse mode
 
         // some internally handled states and handlers

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

@@ -41 +41 @@
 #include <ois/OISKeyboard.h>
 #include <ois/OISMouse.h>
-#include <ois/OISJoyStick.h>
 #include "util/OrxEnum.h"
 

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

@@ -37 +37 @@
         , bAlwaysGetsInput_(bAlwaysGetsInput)
         , bTransparent_(bTransparent)
-        , exclusiveMouse_(TriBool::Dontcare)
+        , exclusiveMouse_(dontcare)
         , bExpired_(true)
         , handlers_(2)

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

@@ -38 +38 @@
 #include <boost/bind.hpp>
 
-#include "util/TriBool.h"
+#include "util/tribool.h"
 #include "InputHandler.h"
 #include "InputManager.h"
@@ -112 +112 @@
         void setHandler        (InputHandler* handler);
 
-        void setMouseExclusive(TriBool::Value value) { exclusiveMouse_ = value; this->bExpired_ = true; }
-        TriBool::Value getMouseExclusive() const { return exclusiveMouse_; }
+        void setMouseExclusive(tribool value) { exclusiveMouse_ = value; this->bExpired_ = true; }
+        tribool getMouseExclusive() const { return exclusiveMouse_; }
 
         //! Returns the name of the state (which is unique!)
@@ -166 +166 @@
         const bool                  bAlwaysGetsInput_;      //!< See class declaration for explanation
         const bool                  bTransparent_;          //!< See class declaration for explanation
-        TriBool::Value              exclusiveMouse_;        //!< See class declaration for explanation
+        tribool                     exclusiveMouse_;        //!< See class declaration for explanation
         int                         priority_;              //!< Current priority (might change)
         bool                        bExpired_;              //!< See hasExpired()

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

@@ -34 +34 @@
 #include <string>
 #include <vector>
+#include <ois/OISJoyStick.h>
 #include "InputDevice.h"
 

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

@@ -36 +36 @@
 
 #include "InputPrereqs.h"
+
+#include <vector>
 #include "core/OrxonoxClass.h"
 

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

@@ -34 +34 @@
 #include <map>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #include "util/Singleton.h"

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

@@ -32 +32 @@
 #include "InputPrereqs.h"
 
-#include <boost/shared_ptr.hpp>
 #include "util/Singleton.h"
 #include "KeyBinder.h"

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

@@ -31 +31 @@
 
 #include "InputPrereqs.h"
-
-#include "InputHandler.h"
 #include "InputDevice.h"
 

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

@@ -37 +37 @@
 // include this as last, X11 seems to define some macros...
 #include <ois/linux/LinuxMouse.h>
+#undef Success
 #endif