[Orxonox-commit 1939] r6656 - code/branches/gamestate/src/libraries/core/input

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-03-30 11:28:21 +0200 (Tue, 30 Mar 2010)
New Revision: 6656

Modified:
   code/branches/gamestate/src/libraries/core/input/InputManager.h
   code/branches/gamestate/src/libraries/core/input/InputPrereqs.h
   code/branches/gamestate/src/libraries/core/input/InputState.h
Log:
Moved InputStatePriority from InputState.h to InputPrereqs.h

Modified: code/branches/gamestate/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/gamestate/src/libraries/core/input/InputManager.h	2010-03-29 21:27:36 UTC (rev 6655)
+++ code/branches/gamestate/src/libraries/core/input/InputManager.h	2010-03-30 09:28:21 UTC (rev 6656)
@@ -39,7 +39,6 @@
 #include "util/Singleton.h"
 #include "util/TriBool.h"
 #include "core/WindowEventListener.h"
-#include "InputState.h"
 
 // tolua_begin
 namespace orxonox

Modified: code/branches/gamestate/src/libraries/core/input/InputPrereqs.h
===================================================================
--- code/branches/gamestate/src/libraries/core/input/InputPrereqs.h	2010-03-29 21:27:36 UTC (rev 6655)
+++ code/branches/gamestate/src/libraries/core/input/InputPrereqs.h	2010-03-30 09:28:21 UTC (rev 6656)
@@ -41,6 +41,7 @@
 #include <ois/OISKeyboard.h>
 #include <ois/OISMouse.h>
 #include <ois/OISJoyStick.h>
+#include "util/OrxEnum.h"
 
 namespace orxonox
 {
@@ -447,6 +448,20 @@
             FirstJoyStick = 2
         };
     }
+
+    //! Enumeration wrapper for input state priorities
+    struct InputStatePriority : OrxEnum<InputStatePriority>
+    {
+        OrxEnumConstructors(InputStatePriority);
+
+        static const int Empty        = -1;
+        static const int Dynamic      = 0;
+
+        static const int HighPriority = 1000;
+        static const int Console      = HighPriority + 0;
+        static const int Calibrator   = HighPriority + 1;
+        static const int Detector     = HighPriority + 2;
+    };
 }
 
 #endif /* _InputPrereqs_H__ */

Modified: code/branches/gamestate/src/libraries/core/input/InputState.h
===================================================================
--- code/branches/gamestate/src/libraries/core/input/InputState.h	2010-03-29 21:27:36 UTC (rev 6655)
+++ code/branches/gamestate/src/libraries/core/input/InputState.h	2010-03-30 09:28:21 UTC (rev 6656)
@@ -35,28 +35,12 @@
 #include <string>
 #include <vector>
 
-#include "util/OrxEnum.h"
 #include "util/TriBool.h"
 #include "InputHandler.h"
 #include "JoyStickQuantityListener.h"
 
 namespace orxonox
 {
-    //! Enumeration wrapper for input state priorities
-    struct InputStatePriority : OrxEnum<InputStatePriority>
-    {
-        OrxEnumConstructors(InputStatePriority);
-
-        static const int Empty        = -1;
-        static const int Dynamic      = 0;
-
-        static const int HighPriority = 1000;
-        static const int Console      = HighPriority + 0;
-        static const int Calibrator   = HighPriority + 1;
-        static const int Detector     = HighPriority + 2;
-    };
-
-
     /**
     @brief
         InputStates allow you to customise the input event targets at runtime.