archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

overlays: add R3, L3 and PS buttons

Browse source 
Unused at the moment
This commit is contained in:
Megamouse 2021-11-15 22:20:15 +01:00
parent 56241838c0
commit 44b42f68fd
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rpcs3/Emu/RSX/Overlays/overlays.cpp
View file

@ -86,7 +86,7 @@ namespace rsx
} }
int pad_index = -1; int pad_index = -1;
for (const auto &pad : handler->GetPads()) for (const auto& pad : handler->GetPads())
{ {
if (exit) if (exit)
break; break;
@ -97,7 +97,18 @@ namespace rsx
continue; continue;
} }
for (auto &button : pad->m_buttons) if (!pad)
{
rsx_log.fatal("Pad %d is nullptr", pad_index);
continue;
}
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
{
continue;
}
for (const Button& button : pad->m_buttons)
{ {
u8 button_id = pad_button::pad_button_max_enum; u8 button_id = pad_button::pad_button_max_enum;
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1) if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
@ -116,13 +127,20 @@ namespace rsx
case CELL_PAD_CTRL_UP: case CELL_PAD_CTRL_UP:
button_id = pad_button::dpad_up; button_id = pad_button::dpad_up;
break; break;
case CELL_PAD_CTRL_L3:
button_id = pad_button::L3;
break;
case CELL_PAD_CTRL_R3:
button_id = pad_button::R3;
break;
case CELL_PAD_CTRL_SELECT: case CELL_PAD_CTRL_SELECT:
button_id = pad_button::select; button_id = pad_button::select;
break; break;
case CELL_PAD_CTRL_START: case CELL_PAD_CTRL_START:
button_id = pad_button::start; button_id = pad_button::start;
break; break;
default: break; default:
break;
} }
} }
else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2) else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
@ -153,7 +171,11 @@ namespace rsx
case CELL_PAD_CTRL_R2: case CELL_PAD_CTRL_R2:
button_id = pad_button::R2; button_id = pad_button::R2;
break; break;
default: break; case CELL_PAD_CTRL_PS:
button_id = pad_button::ps;
break;
default:
break;
} }
} }

3
rpcs3/Emu/RSX/Overlays/overlays.h
View file

@ -56,6 +56,7 @@ namespace rsx
dpad_right, dpad_right,
select, select,
start, start,
ps,
triangle, triangle,
circle, circle,
square, square,
@ -64,6 +65,8 @@ namespace rsx
R1, R1,
L2, L2,
R2, R2,
L3,
R3,
pad_button_max_enum pad_button_max_enum
}; };