Changeset 6656

Timestamp:

Mar 30, 2010, 11:28:21 AM (15 years ago)

Author:

rgrieder

Message:

Moved InputStatePriority from InputState.h to InputPrereqs.h

Location:

code/branches/gamestate/src/libraries/core/input

Files:

• InputManager.h (modified) (1 diff)
• InputPrereqs.h (modified) (2 diffs)
• InputState.h (modified) (2 diffs)

code/branches/gamestate/src/libraries/core/input/InputManager.h

@@ -40 +40 @@
 #include "util/TriBool.h"
 #include "core/WindowEventListener.h"
-#include "InputState.h"
 
 // tolua_begin

code/branches/gamestate/src/libraries/core/input/InputPrereqs.h

@@ -42 +42 @@
 #include <ois/OISMouse.h>
 #include <ois/OISJoyStick.h>
+#include "util/OrxEnum.h"
 
 namespace orxonox
@@ -448 +449 @@
         };
     }
+
+    //! 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;
+    };
 }
 

code/branches/gamestate/src/libraries/core/input/InputState.h

@@ -36 +36 @@
 #include <vector>
 
-#include "util/OrxEnum.h"
 #include "util/TriBool.h"
 #include "InputHandler.h"
@@ -43 +42 @@
 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