Move SDL mappigs to the separate file

apps/openmw/CMakeLists.txt

@@ -25,7 +25,7 @@ add_openmw_dir (mwrender
     )
 
 add_openmw_dir (mwinput
-    inputmanagerimp sensormanager actions
+    actions inputmanagerimp sdlmappings sensormanager
     )
 
 add_openmw_dir (mwgui

apps/openmw/mwbase/inputmanager.hpp

@@ -54,8 +54,6 @@ namespace MWBase
             virtual std::string getActionDescription (int action) = 0;
             virtual std::string getActionKeyBindingName (int action) = 0;
             virtual std::string getActionControllerBindingName (int action) = 0;
-            virtual std::string sdlControllerAxisToString(int axis) = 0;
-            virtual std::string sdlControllerButtonToString(int button) = 0;
             ///Actions available for binding to keyboard buttons
             virtual std::vector<int> getActionKeySorting() = 0;
             ///Actions available for binding to controller buttons

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -31,6 +31,7 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
+#include "sdlmappings.hpp"
 #include "sensormanager.hpp"
 
 namespace MWInput
@@ -1705,65 +1706,6 @@ namespace MWInput
             return "#{sNone}";
     }
 
-    std::string InputManager::sdlControllerButtonToString(int button)
-    {
-        switch(button)
-        {
-            case SDL_CONTROLLER_BUTTON_A:
-                return "A Button";
-            case SDL_CONTROLLER_BUTTON_B:
-                return "B Button";
-            case SDL_CONTROLLER_BUTTON_BACK:
-                return "Back Button";
-            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-                return "DPad Down";
-            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
-                return "DPad Left";
-            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
-                return "DPad Right";
-            case SDL_CONTROLLER_BUTTON_DPAD_UP:
-                return "DPad Up";
-            case SDL_CONTROLLER_BUTTON_GUIDE:
-                return "Guide Button";
-            case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
-                return "Left Shoulder";
-            case SDL_CONTROLLER_BUTTON_LEFTSTICK:
-                return "Left Stick Button";
-            case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
-                return "Right Shoulder";
-            case SDL_CONTROLLER_BUTTON_RIGHTSTICK:
-                return "Right Stick Button";
-            case SDL_CONTROLLER_BUTTON_START:
-                return "Start Button";
-            case SDL_CONTROLLER_BUTTON_X:
-                return "X Button";
-            case SDL_CONTROLLER_BUTTON_Y:
-                return "Y Button";
-            default:
-                return "Button " + std::to_string(button);
-        }
-    }
-    std::string InputManager::sdlControllerAxisToString(int axis)
-    {
-        switch(axis)
-        {
-            case SDL_CONTROLLER_AXIS_LEFTX:
-                return "Left Stick X";
-            case SDL_CONTROLLER_AXIS_LEFTY:
-                return "Left Stick Y";
-            case SDL_CONTROLLER_AXIS_RIGHTX:
-                return "Right Stick X";
-            case SDL_CONTROLLER_AXIS_RIGHTY:
-                return "Right Stick Y";
-            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
-                return "Left Trigger";
-            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
-                return "Right Trigger";
-            default:
-                return "Axis " + std::to_string(axis);
-        }
-     }
-
     std::vector<int> InputManager::getActionKeySorting()
     {
         std::vector<int> ret;
@@ -2010,18 +1952,6 @@ namespace MWInput
         loadControllerDefaults(true);
     }
 
-    MyGUI::MouseButton InputManager::sdlButtonToMyGUI(Uint8 button)
-    {
-        //The right button is the second button, according to MyGUI
-        if(button == SDL_BUTTON_RIGHT)
-            button = SDL_BUTTON_MIDDLE;
-        else if(button == SDL_BUTTON_MIDDLE)
-            button = SDL_BUTTON_RIGHT;
-
-        //MyGUI's buttons are 0 indexed
-        return MyGUI::MouseButton::Enum(button - 1);
-    }
-
     void InputManager::setPlayer (MWWorld::Player* player)
     {
         mPlayer = player;

apps/openmw/mwinput/inputmanagerimp.hpp

@@ -39,11 +39,6 @@ namespace ICS
     class InputControlSystem;
 }
 
-namespace MyGUI
-{
-    struct MouseButton;
-}
-
 namespace Files
 {
     struct ConfigurationManager;
@@ -230,11 +225,6 @@ namespace MWInput
 
         void convertMousePosForMyGUI(int& x, int& y);
 
-        MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button);
-
-        virtual std::string sdlControllerAxisToString(int axis);
-        virtual std::string sdlControllerButtonToString(int button);
-
         void resetIdleTime();
         void updateIdleTime(float dt);
 

apps/openmw/mwinput/sdlmappings.cpp

@@ -0,0 +1,81 @@
+#include "sdlmappings.hpp"
+
+#include <MyGUI_MouseButton.h>
+
+#include <SDL_gamecontroller.h>
+#include <SDL_mouse.h>
+
+namespace MWInput
+{
+    std::string sdlControllerButtonToString(int button)
+    {
+        switch(button)
+        {
+            case SDL_CONTROLLER_BUTTON_A:
+                return "A Button";
+            case SDL_CONTROLLER_BUTTON_B:
+                return "B Button";
+            case SDL_CONTROLLER_BUTTON_BACK:
+                return "Back Button";
+            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
+                return "DPad Down";
+            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
+                return "DPad Left";
+            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
+                return "DPad Right";
+            case SDL_CONTROLLER_BUTTON_DPAD_UP:
+                return "DPad Up";
+            case SDL_CONTROLLER_BUTTON_GUIDE:
+                return "Guide Button";
+            case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
+                return "Left Shoulder";
+            case SDL_CONTROLLER_BUTTON_LEFTSTICK:
+                return "Left Stick Button";
+            case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
+                return "Right Shoulder";
+            case SDL_CONTROLLER_BUTTON_RIGHTSTICK:
+                return "Right Stick Button";
+            case SDL_CONTROLLER_BUTTON_START:
+                return "Start Button";
+            case SDL_CONTROLLER_BUTTON_X:
+                return "X Button";
+            case SDL_CONTROLLER_BUTTON_Y:
+                return "Y Button";
+            default:
+                return "Button " + std::to_string(button);
+        }
+    }
+
+    std::string sdlControllerAxisToString(int axis)
+    {
+        switch(axis)
+        {
+            case SDL_CONTROLLER_AXIS_LEFTX:
+                return "Left Stick X";
+            case SDL_CONTROLLER_AXIS_LEFTY:
+                return "Left Stick Y";
+            case SDL_CONTROLLER_AXIS_RIGHTX:
+                return "Right Stick X";
+            case SDL_CONTROLLER_AXIS_RIGHTY:
+                return "Right Stick Y";
+            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+                return "Left Trigger";
+            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+                return "Right Trigger";
+            default:
+                return "Axis " + std::to_string(axis);
+        }
+    }
+
+    MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button)
+    {
+        //The right button is the second button, according to MyGUI
+        if(button == SDL_BUTTON_RIGHT)
+            button = SDL_BUTTON_MIDDLE;
+        else if(button == SDL_BUTTON_MIDDLE)
+            button = SDL_BUTTON_RIGHT;
+
+        //MyGUI's buttons are 0 indexed
+        return MyGUI::MouseButton::Enum(button - 1);
+    }
+}

apps/openmw/mwinput/sdlmappings.hpp

@@ -0,0 +1,21 @@
+#ifndef MWINPUT_SDLMAPPINGS_H
+#define MWINPUT_SDLMAPPINGS_H
+
+#include <string>
+
+#include <SDL_types.h>
+
+namespace MyGUI
+{
+    struct MouseButton;
+}
+
+namespace MWInput
+{
+    std::string sdlControllerButtonToString(int button);
+
+    std::string sdlControllerAxisToString(int axis);
+
+    MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button);
+}
+#endif