Merge pull request #69 from bobis33/Refactor/remove-input-plugins

Author: imbobz

modules/Interfaces/include/Interfaces/Input/AInput.hpp

@@ -10,32 +10,44 @@
 
 namespace cae
 {
-    enum class GamepadButton : uint8_t
+    enum class GamepadButton : std::uint8_t
     {
-        A = 0,
+        Unknown = 0,
+        A,
         B,
         X,
         Y,
+
         Back,
         Guide,
         Start,
+
         LThumb,
         RThumb,
+
         LShoulder,
         RShoulder,
+
         DPadUp,
         DPadDown,
         DPadLeft,
-        DPadRight
+        DPadRight,
+
+        Count
     };
 
-    enum class GamepadAxis : uint8_t
+    enum class GamepadAxis : std::uint8_t
     {
-        LeftX = 0,
+        Unknown = 0,
+        LeftX,
         LeftY,
         RightX,
         RightY,
+
         TriggerLeft,
-        TriggerRight
+        TriggerRight,
+
+        Count
     };
+
 } // namespace cae

modules/Interfaces/include/Interfaces/Input/IGamepad.hpp

@@ -19,94 +19,39 @@ namespace cae
         Toggled = 3,
     };
 
-    enum class KeyCode : uint8_t
+    enum class KeyCode : std::uint8_t
     {
-        A,
-        B,
-        C,
-        D,
-        E,
-        F,
-        G,
-        H,
-        I,
-        J,
-        K,
-        L,
-        M,
-        N,
-        O,
-        P,
-        Q,
-        R,
-        S,
-        T,
-        U,
-        V,
-        W,
-        X,
-        Y,
-        Z,
-
-        Num0,
-        Num1,
-        Num2,
-        Num3,
-        Num4,
-        Num5,
-        Num6,
-        Num7,
-        Num8,
-        Num9,
+        Unknown = 0,
+
+        A, B, C, D, E, F, G,
+        H, I, J, K, L, M, N,
+        O, P, Q, R, S, T, U,
+        V, W, X, Y, Z,
+
+        Num0, Num1, Num2, Num3, Num4,
+        Num5, Num6, Num7, Num8, Num9,
 
         Escape,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-
-        Left,
-        Right,
-        Up,
-        Down,
-        Home,
-        End,
-        PageUp,
-        PageDown,
-        Insert,
-        Delete,
+
+        F1, F2, F3, F4, F5, F6,
+        F7, F8, F9, F10, F11, F12,
+
+        Left, Right, Up, Down,
+        Home, End, PageUp, PageDown,
+        Insert, Delete,
+
         Backspace,
         Tab,
         Enter,
         Space,
 
-        LShift,
-        RShift,
-        LCtrl,
-        RCtrl,
-        LAlt,
-        RAlt,
-        LSuper,
-        RSuper,
-
-        Numpad0,
-        Numpad1,
-        Numpad2,
-        Numpad3,
-        Numpad4,
-        Numpad5,
-        Numpad6,
-        Numpad7,
-        Numpad8,
-        Numpad9,
+        LShift, RShift,
+        LCtrl,  RCtrl,
+        LAlt,   RAlt,
+        LSuper, RSuper,
+
+        Numpad0, Numpad1, Numpad2, Numpad3, Numpad4,
+        Numpad5, Numpad6, Numpad7, Numpad8, Numpad9,
         NumpadAdd,
         NumpadSubtract,
         NumpadMultiply,
@@ -122,4 +67,5 @@ namespace cae
 
         Count
     };
+
 } // namespace cae

modules/Interfaces/include/Interfaces/Input/IInput.hpp

@@ -10,15 +10,26 @@
 
 namespace cae
 {
-    enum class MouseButton : uint8_t
-    {
-        Left = 0,
-        Right,
-        Middle,
-        XButton1,
-        XButton2,
-        WheelUp,
-        WheelDown,
-        Count
-    };
+        enum class MouseButton : std::uint8_t
+        {
+            Unknown = 0,
+            Left,
+            Right,
+            Middle,
+            XButton1,
+            XButton2,
+
+            Count
+        };
+
+        enum class MouseAxis : std::uint8_t
+        {
+            Unknown = 0,
+            X,
+            Y,
+            Wheel,
+
+            Count
+        };
+
 } // namespace cae