ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PAD: Add bind index to InputBindingInfo

This commit is contained in:
Connor McLaughlin 2022-11-27 18:36:23 +10:00 committed by refractionpcsx2
parent 59e10bcac6
commit 6f407b2080
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2-qt/Settings/ControllerBindingWidgets.cpp
View File

@ -330,7 +330,7 @@ ControllerMacroEditWidget::ControllerMacroEditWidget(ControllerMacroWidget* pare
for (u32 i = 0; i < cinfo->num_bindings; i++) for (u32 i = 0; i < cinfo->num_bindings; i++)
{ {
const InputBindingInfo& bi = cinfo->bindings[i]; const InputBindingInfo& bi = cinfo->bindings[i];
if (bi.type == InputBindingInfo::Type::Motor) if (bi.bind_type == InputBindingInfo::Type::Motor)
continue; continue;
QListWidgetItem* item = new QListWidgetItem(); QListWidgetItem* item = new QListWidgetItem();
@ -413,7 +413,7 @@ void ControllerMacroEditWidget::updateBinds()
for (u32 i = 0, bind_index = 0; i < cinfo->num_bindings; i++) for (u32 i = 0, bind_index = 0; i < cinfo->num_bindings; i++)
{ {
const InputBindingInfo& bi = cinfo->bindings[i]; const InputBindingInfo& bi = cinfo->bindings[i];
if (bi.type == InputBindingInfo::Type::Motor) if (bi.bind_type == InputBindingInfo::Type::Motor)
continue; continue;
const QListWidgetItem* item = m_ui.bindList->item(static_cast<int>(bind_index)); const QListWidgetItem* item = m_ui.bindList->item(static_cast<int>(bind_index));

3
pcsx2/Config.h
View File

@ -79,7 +79,8 @@ struct InputBindingInfo
const char* name; const char* name;
const char* display_name; const char* display_name;
Type type; Type bind_type;
u16 bind_index;
GenericInputBinding generic_mapping; GenericInputBinding generic_mapping;
}; };

6
pcsx2/Frontend/FullscreenUI.cpp
View File

@ -3587,7 +3587,7 @@ void FullscreenUI::DrawControllerSettingsPage()
for (u32 i = 0; i < ci->num_bindings; i++) for (u32 i = 0; i < ci->num_bindings; i++)
{ {
const InputBindingInfo& bi = ci->bindings[i]; const InputBindingInfo& bi = ci->bindings[i];
DrawInputBindingButton(bsi, bi.type, section, bi.name, bi.display_name, true); DrawInputBindingButton(bsi, bi.bind_type, section, bi.name, bi.display_name, true);
} }
MenuHeading((mtap_enabled[mtap_port] ? MenuHeading((mtap_enabled[mtap_port] ?
@ -3609,8 +3609,8 @@ void FullscreenUI::DrawControllerSettingsPage()
for (u32 i = 0; i < ci->num_bindings; i++) for (u32 i = 0; i < ci->num_bindings; i++)
{ {
const InputBindingInfo& bi = ci->bindings[i]; const InputBindingInfo& bi = ci->bindings[i];
if (bi.type != InputBindingInfo::Type::Button && bi.type != InputBindingInfo::Type::Axis && if (bi.bind_type != InputBindingInfo::Type::Button && bi.bind_type != InputBindingInfo::Type::Axis &&
bi.type != InputBindingInfo::Type::HalfAxis) bi.bind_type != InputBindingInfo::Type::HalfAxis)
{ {
continue; continue;
} }

2
pcsx2/Frontend/ImGuiOverlays.cpp
View File

@ -506,7 +506,7 @@ void ImGuiManager::DrawInputsOverlay()
for (u32 bind = 0; bind < cinfo->num_bindings; bind++) for (u32 bind = 0; bind < cinfo->num_bindings; bind++)
{ {
const InputBindingInfo& bi = cinfo->bindings[bind]; const InputBindingInfo& bi = cinfo->bindings[bind];
switch (bi.type) switch (bi.bind_type)
{ {
case InputBindingInfo::Type::Axis: case InputBindingInfo::Type::Axis:
case InputBindingInfo::Type::HalfAxis: case InputBindingInfo::Type::HalfAxis:

58
pcsx2/PAD/Host/PAD.cpp
View File

@ -364,34 +364,34 @@ void PAD::Update()
} }
static const InputBindingInfo s_dualshock2_binds[] = { static const InputBindingInfo s_dualshock2_binds[] = {
{"Up", "D-Pad Up", InputBindingInfo::Type::Button, GenericInputBinding::DPadUp}, {"Up", "D-Pad Up", InputBindingInfo::Type::Button, PAD_UP, GenericInputBinding::DPadUp},
{"Right", "D-Pad Right", InputBindingInfo::Type::Button, GenericInputBinding::DPadRight}, {"Right", "D-Pad Right", InputBindingInfo::Type::Button, PAD_RIGHT, GenericInputBinding::DPadRight},
{"Down", "D-Pad Down", InputBindingInfo::Type::Button, GenericInputBinding::DPadDown}, {"Down", "D-Pad Down", InputBindingInfo::Type::Button, PAD_DOWN, GenericInputBinding::DPadDown},
{"Left", "D-Pad Left", InputBindingInfo::Type::Button, GenericInputBinding::DPadLeft}, {"Left", "D-Pad Left", InputBindingInfo::Type::Button, PAD_LEFT, GenericInputBinding::DPadLeft},
{"Triangle", "Triangle", InputBindingInfo::Type::Button, GenericInputBinding::Triangle}, {"Triangle", "Triangle", InputBindingInfo::Type::Button, PAD_TRIANGLE, GenericInputBinding::Triangle},
{"Circle", "Circle", InputBindingInfo::Type::Button, GenericInputBinding::Circle}, {"Circle", "Circle", InputBindingInfo::Type::Button, PAD_CIRCLE, GenericInputBinding::Circle},
{"Cross", "Cross", InputBindingInfo::Type::Button, GenericInputBinding::Cross}, {"Cross", "Cross", InputBindingInfo::Type::Button, PAD_CROSS, GenericInputBinding::Cross},
{"Square", "Square", InputBindingInfo::Type::Button, GenericInputBinding::Square}, {"Square", "Square", InputBindingInfo::Type::Button, PAD_SQUARE, GenericInputBinding::Square},
{"Select", "Select", InputBindingInfo::Type::Button, GenericInputBinding::Select}, {"Select", "Select", InputBindingInfo::Type::Button, PAD_SELECT, GenericInputBinding::Select},
{"Start", "Start", InputBindingInfo::Type::Button, GenericInputBinding::Start}, {"Start", "Start", InputBindingInfo::Type::Button, PAD_START, GenericInputBinding::Start},
{"L1", "L1 (Left Bumper)", InputBindingInfo::Type::Button, GenericInputBinding::L1}, {"L1", "L1 (Left Bumper)", InputBindingInfo::Type::Button, PAD_L1, GenericInputBinding::L1},
{"L2", "L2 (Left Trigger)", InputBindingInfo::Type::HalfAxis, GenericInputBinding::L2}, {"L2", "L2 (Left Trigger)", InputBindingInfo::Type::HalfAxis, PAD_L2, GenericInputBinding::L2},
{"R1", "R1 (Right Bumper)", InputBindingInfo::Type::Button, GenericInputBinding::R1}, {"R1", "R1 (Right Bumper)", InputBindingInfo::Type::Button, PAD_R1, GenericInputBinding::R1},
{"R2", "R2 (Right Trigger)", InputBindingInfo::Type::HalfAxis, GenericInputBinding::R2}, {"R2", "R2 (Right Trigger)", InputBindingInfo::Type::HalfAxis, PAD_R2, GenericInputBinding::R2},
{"L3", "L3 (Left Stick Button)", InputBindingInfo::Type::Button, GenericInputBinding::L3}, {"L3", "L3 (Left Stick Button)", InputBindingInfo::Type::Button, PAD_L3, GenericInputBinding::L3},
{"R3", "R3 (Right Stick Button)", InputBindingInfo::Type::Button, GenericInputBinding::R3}, {"R3", "R3 (Right Stick Button)", InputBindingInfo::Type::Button, PAD_R3, GenericInputBinding::R3},
{"Analog", "Analog Toggle", InputBindingInfo::Type::Button, GenericInputBinding::System}, {"Analog", "Analog Toggle", InputBindingInfo::Type::Button, PAD_ANALOG, GenericInputBinding::System},
{"Pressure", "Apply Pressure", InputBindingInfo::Type::Button, GenericInputBinding::Unknown}, {"Pressure", "Apply Pressure", InputBindingInfo::Type::Button, PAD_PRESSURE, GenericInputBinding::Unknown},
{"LUp", "Left Stick Up", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickUp}, {"LUp", "Left Stick Up", InputBindingInfo::Type::HalfAxis, PAD_L_UP, GenericInputBinding::LeftStickUp},
{"LRight", "Left Stick Right", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickRight}, {"LRight", "Left Stick Right", InputBindingInfo::Type::HalfAxis, PAD_L_RIGHT, GenericInputBinding::LeftStickRight},
{"LDown", "Left Stick Down", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickDown}, {"LDown", "Left Stick Down", InputBindingInfo::Type::HalfAxis, PAD_L_DOWN, GenericInputBinding::LeftStickDown},
{"LLeft", "Left Stick Left", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickLeft}, {"LLeft", "Left Stick Left", InputBindingInfo::Type::HalfAxis, PAD_L_LEFT, GenericInputBinding::LeftStickLeft},
{"RUp", "Right Stick Up", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickUp}, {"RUp", "Right Stick Up", InputBindingInfo::Type::HalfAxis, PAD_R_UP, GenericInputBinding::RightStickUp},
{"RRight", "Right Stick Right", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickRight}, {"RRight", "Right Stick Right", InputBindingInfo::Type::HalfAxis, PAD_R_RIGHT, GenericInputBinding::RightStickRight},
{"RDown", "Right Stick Down", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickDown}, {"RDown", "Right Stick Down", InputBindingInfo::Type::HalfAxis, PAD_R_DOWN, GenericInputBinding::RightStickDown},
{"RLeft", "Right Stick Left", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickLeft}, {"RLeft", "Right Stick Left", InputBindingInfo::Type::HalfAxis, PAD_R_LEFT, GenericInputBinding::RightStickLeft},
{"LargeMotor", "Large (Low Frequency) Motor", InputBindingInfo::Type::Motor, GenericInputBinding::LargeMotor}, {"LargeMotor", "Large (Low Frequency) Motor", InputBindingInfo::Type::Motor, 0, GenericInputBinding::LargeMotor},
{"SmallMotor", "Small (High Frequency) Motor", InputBindingInfo::Type::Motor, GenericInputBinding::SmallMotor}, {"SmallMotor", "Small (High Frequency) Motor", InputBindingInfo::Type::Motor, 0, GenericInputBinding::SmallMotor},
}; };
static const char* s_dualshock2_invert_entries[] = { static const char* s_dualshock2_invert_entries[] = {
@ -484,7 +484,7 @@ std::vector<std::string> PAD::GetControllerBinds(const std::string_view& type)
for (u32 i = 0; i < info->num_bindings; i++) for (u32 i = 0; i < info->num_bindings; i++)
{ {
const InputBindingInfo& bi = info->bindings[i]; const InputBindingInfo& bi = info->bindings[i];
if (bi.type == InputBindingInfo::Type::Unknown || bi.type == InputBindingInfo::Type::Motor) if (bi.bind_type == InputBindingInfo::Type::Unknown || bi.bind_type == InputBindingInfo::Type::Motor)
continue; continue;
ret.emplace_back(info->bindings[i].name); ret.emplace_back(info->bindings[i].name);