Changeset 1355Tweet

Timestamp:

May 9, 2012, 6:40:38 PM (11 years ago)

Author:

sam

Message:

input: allow to remap gamepad axes in the generic input layer.

Location:

trunk/src

Files:

• input/stick.cpp (modified) (4 diffs)
• input/stick.h (modified) (1 diff)
• platform/sdl/sdlinput.cpp (modified) (1 diff)

trunk/src/input/stick.cpp

@@ -33 +33 @@
 
 private:
-    Array<float> m_axes;
-    Array<int> m_buttons;
+    /* First element is the remap target */
+    Array<int, float> m_axes;
+    Array<int, int> m_buttons;
 }
 stickdata;
@@ -56 +57 @@
     m_data->m_axes.Empty();
     for (int i = 0; i < n; i++)
-        m_data->m_axes.Push(0.f);
+        m_data->m_axes.Push(i, 0.f);
 }
 
@@ -63 +64 @@
     m_data->m_buttons.Empty();
     for (int i = 0; i < n; i++)
-        m_data->m_buttons.Push(0);
+        m_data->m_buttons.Push(i, 0);
 }
 
 void Stick::SetAxis(int n, float val)
 {
-    m_data->m_axes[n] = val;
+    m_data->m_axes[m_data->m_axes[n].m1].m2 = val;
 }
 
 void Stick::SetButton(int n, int val)
 {
-    m_data->m_buttons[n] = val;
+    m_data->m_buttons[m_data->m_buttons[n].m1].m2 = val;
+}
+
+void Stick::RemapAxis(int src, int dst)
+{
+    m_data->m_axes[src].m1 = dst;
+}
+
+void Stick::RemapButton(int src, int dst)
+{
+    m_data->m_buttons[src].m1 = dst;
 }
 
@@ -88 +99 @@
 float Stick::GetAxis(int n)
 {
-    return m_data->m_axes[n];
+    return m_data->m_axes[n].m2;
 }
 
 int Stick::GetButton(int n)
 {
-    return m_data->m_buttons[n];
+    return m_data->m_buttons[n].m2;
 }
 

trunk/src/input/stick.h

@@ -33 +33 @@
     void SetAxis(int n, float val);
     void SetButton(int n, int val);
+    void RemapAxis(int src, int dst);
+    void RemapButton(int src, int dst);
 
     int GetAxisCount();

trunk/src/platform/sdl/sdlinput.cpp

@@ -68 +68 @@
         stick->SetAxisCount(SDL_JoystickNumAxes(sdlstick));
         stick->SetButtonCount(SDL_JoystickNumButtons(sdlstick));
+
+        /* It's possible to remap axes */
+        if (strstr(name, "XBOX 360 For Windows"))
+        {
+            //stick->RemapAxis(4, 2);
+            //stick->RemapAxis(2, 4);
+        }
+
         m_data->m_joysticks.Push(sdlstick, stick);
     }