Changeset 3327 for code/trunk/src/core/input/InputPrereqs.h

Timestamp:

Jul 19, 2009, 5:31:02 PM (15 years ago)

Author:

rgrieder

Message:

Merged all remaining revisions from core4 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/input/InputPrereqs.h (copied) (copied from code/branches/core4/src/core/input/InputPrereqs.h) (13 diffs)

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

@@ -30 +30 @@
 @file
 @brief
-    Declarations of various interface classes for the input management.
+    Declarations of all key/button/axis code enumeration and string literals
+    and an input device enumeration.
 */
 
@@ -52 +53 @@
         const unsigned int numberOfKeys = 0xEE; // 238
 
-        // note: KeyCode comments were directly copied from OISKeyboard.h
+        //! Key codes as enumeration
         enum ByEnum
         {
@@ -202 +203 @@
         };
         
-        // Names as string. Has no real linkage!
+        //! Key codes as strings
         const char* const ByString[] =
         {
@@ -307 +308 @@
         const unsigned int numberOfButtons = 8;
 
+        //! Mouse button codes as enumeration
         enum ByEnum
         {
@@ -319 +321 @@
         };
 
-        // Names as string. Has no real linkage!
+        // Mouse button codes as strings
         const char* const ByString[] =
         {
@@ -337 +339 @@
         const unsigned int numberOfAxes = 2;
 
+        // Mouse axis codes as enumeration
         enum ByEnum
         {
@@ -343 +346 @@
         };
 
-        // Names as string. Has no real linkage!
+        // Mouse axis codes as strings
         const char* const ByString[] =
         {
@@ -356 +359 @@
         const unsigned int numberOfButtons = 64;
 
+        // Joy stick button codes as enumeration
         enum ByEnum
         {
@@ -380 +384 @@
         };
 
-        // Names as string. Has no real linkage!
+        // Joy stick button codes as strings
         const char* const ByString[] =
         {
@@ -406 +410 @@
         const unsigned int numberOfAxes = 24;
 
+        // Joy stick axis codes as enumeration
         enum ByEnum
         {
@@ -416 +421 @@
         };
 
-        // Names as string. Has no real linkage!
+        // Joy stick axis codes as strings
         const char* const ByString[] =
         {
@@ -435 +440 @@
     namespace InputDeviceEnumerator
     {
+        //! Used to access the devices in an array
         enum Value
         {
@@ -442 +448 @@
         };
     }
-
-    namespace ButtonEvent
-    {
-        enum Value
-        {
-            Press,
-            Release,
-            Hold
-        };
-
-        template <ButtonEvent::Value Event>
-        struct EnumToType { };
-        typedef EnumToType<Press>   TPress;
-        typedef EnumToType<Release> TRelease;
-        typedef EnumToType<Hold>    THold;
-    }
-
-
-    namespace KeyboardModifier
-    {
-        enum Enum
-        {
-            Shift = 0x0000001,
-            Ctrl  = 0x0000010,
-            Alt   = 0x0000100
-        };
-    }
-
-    class _CoreExport KeyEvent
-    {
-    public:
-        KeyEvent(const OIS::KeyEvent& evt)
-            : key_(static_cast<KeyCode::ByEnum>(evt.key))
-            , text_(evt.text)
-            , modifiers_(0)
-        { }
-        bool operator==(const KeyEvent& rhs) const
-            { return rhs.key_ == key_; }
-        bool operator!=(const KeyEvent& rhs) const
-            { return rhs.key_ != key_; }
-        void setModifiers(int modifiers)
-            { modifiers_ = modifiers; }
-
-        bool isModifierDown(KeyboardModifier::Enum modifier) const
-            { return static_cast<KeyboardModifier::Enum>(modifier & modifiers_); }
-        KeyCode::ByEnum getKeyCode() const
-            { return key_; }
-        unsigned int getText() const { return text_; }
-
-    private:
-        KeyCode::ByEnum key_;
-        unsigned int text_;
-        int modifiers_;
-    };
-
-
-    //-----------------------------------------------------------------------
-    // Device type traits
-    //-----------------------------------------------------------------------
-
-    struct KeyboardTraits
-    {
-        typedef Keyboard DeviceClass;
-        typedef OIS::Keyboard OISDeviceClass;
-        typedef KeyEvent ButtonType;
-        typedef KeyEvent& ButtonTypeParam;
-        static const OIS::Type OISDeviceValue = OIS::OISKeyboard;
-    };
-
-    struct MouseTraits
-    {
-        typedef Mouse DeviceClass;
-        typedef OIS::Mouse OISDeviceClass;
-        typedef MouseButtonCode::ByEnum ButtonType;
-        typedef MouseButtonCode::ByEnum ButtonTypeParam;
-        static const OIS::Type OISDeviceValue = OIS::OISMouse;
-    };
-
-    struct JoyStickTraits
-    {
-        typedef JoyStick DeviceClass;
-        typedef OIS::JoyStick OISDeviceClass;
-        typedef JoyStickButtonCode::ByEnum ButtonType;
-        typedef JoyStickButtonCode::ByEnum ButtonTypeParam;
-        static const OIS::Type OISDeviceValue = OIS::OISJoyStick;
-    };
-
-    // Note: Entries correspond to OIS::Type enum
-    namespace InputDeviceNames
-    {
-        const char* const values[] = { "", "Keyboard", "Mouse", "JoyStick" };
-    }
 }