sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ControllerInterface: Move axes/constants to derived class

Browse Source
This commit is contained in:
Connor McLaughlin
2021-05-07 20:39:46 +10:00
parent 9ff1f153be
commit e5a6103f74
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend-common/xinput_controller_interface.h
View File

@ -42,7 +42,7 @@ public:
private:
enum : u32
{
NUM_AXISES = 6,
NUM_AXES = 6,
NUM_BUTTONS = 15,
NUM_RUMBLE_MOTORS = 2
};
@ -63,10 +63,10 @@ private:
float deadzone = 0.25f;
std::array<std::array<AxisCallback, 3>, MAX_NUM_AXISES> axis_mapping;
std::array<ButtonCallback, MAX_NUM_BUTTONS> button_mapping;
std::array<std::array<ButtonCallback, 2>, MAX_NUM_AXISES> axis_button_mapping;
std::array<AxisCallback, MAX_NUM_BUTTONS> button_axis_mapping;
std::array<std::array<AxisCallback, 3>, NUM_AXES> axis_mapping;
std::array<ButtonCallback, NUM_BUTTONS> button_mapping;
std::array<std::array<ButtonCallback, 2>, NUM_AXES> axis_button_mapping;
std::array<AxisCallback, NUM_BUTTONS> button_axis_mapping;
};
using ControllerDataArray = std::array<ControllerData, XUSER_MAX_COUNT>;