Skip to content

Commit

Permalink
overlays/input: allow ldd pad input
Browse files Browse the repository at this point in the history
  • Loading branch information
@Megamouse
Megamouse committed Feb 13, 2024
1 parent 569f72c commit 87a3252
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 4 deletions.
78 changes: 76 additions & 2 deletions rpcs3/Emu/RSX/Overlays/overlays.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ namespace rsx
continue;
}

const pad_button cross_button = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::circle : pad_button::cross;
const pad_button circle_button = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::cross : pad_button::circle;

bool keyboard_pad_handler_active = false;

int pad_index = -1;
Expand Down Expand Up @@ -244,6 +247,77 @@ namespace rsx
m_keyboard_pad_handler_active = true;
}

if (pad->ldd)
{
// LDD pads get passed input data from the game itself.

if (pad->ldd_data.len > CELL_PAD_BTN_OFFSET_DIGITAL1)
{
const u16 digital1 = pad->ldd_data.button[CELL_PAD_BTN_OFFSET_DIGITAL1];

handle_button_press(pad_button::dpad_left, !!(digital1 & CELL_PAD_CTRL_LEFT), pad_index);
handle_button_press(pad_button::dpad_right, !!(digital1 & CELL_PAD_CTRL_RIGHT), pad_index);
handle_button_press(pad_button::dpad_down, !!(digital1 & CELL_PAD_CTRL_DOWN), pad_index);
handle_button_press(pad_button::dpad_up, !!(digital1 & CELL_PAD_CTRL_UP), pad_index);
handle_button_press(pad_button::L3, !!(digital1 & CELL_PAD_CTRL_L3), pad_index);
handle_button_press(pad_button::R3, !!(digital1 & CELL_PAD_CTRL_R3), pad_index);
handle_button_press(pad_button::select, !!(digital1 & CELL_PAD_CTRL_SELECT), pad_index);
handle_button_press(pad_button::start, !!(digital1 & CELL_PAD_CTRL_START), pad_index);
}

if (pad->ldd_data.len > CELL_PAD_BTN_OFFSET_DIGITAL2)
{
const u16 digital2 = pad->ldd_data.button[CELL_PAD_BTN_OFFSET_DIGITAL2];

handle_button_press(pad_button::triangle, !!(digital2 & CELL_PAD_CTRL_TRIANGLE), pad_index);
handle_button_press(circle_button, !!(digital2 & CELL_PAD_CTRL_CIRCLE), pad_index);
handle_button_press(pad_button::square, !!(digital2 & CELL_PAD_CTRL_SQUARE), pad_index);
handle_button_press(cross_button, !!(digital2 & CELL_PAD_CTRL_CROSS), pad_index);
handle_button_press(pad_button::L1, !!(digital2 & CELL_PAD_CTRL_L1), pad_index);
handle_button_press(pad_button::R1, !!(digital2 & CELL_PAD_CTRL_R1), pad_index);
handle_button_press(pad_button::L2, !!(digital2 & CELL_PAD_CTRL_L2), pad_index);
handle_button_press(pad_button::R2, !!(digital2 & CELL_PAD_CTRL_R2), pad_index);
handle_button_press(pad_button::ps, !!(digital2 & CELL_PAD_CTRL_PS), pad_index);
}

const auto handle_ldd_stick_input = [&](s32 offset, pad_button id_small, pad_button id_large)
{
if (pad->ldd_data.len <= offset)
{
return;
}

constexpr u16 threshold = 20; // Let's be careful and use some threshold here
const u16 value = pad->ldd_data.button[offset];

if (value <= (128 - threshold))
{
// Release other direction on the same axis first
handle_button_press(id_large, false, pad_index);
handle_button_press(id_small, true, pad_index);
}
else if (value > (128 + threshold))
{
// Release other direction on the same axis first
handle_button_press(id_small, false, pad_index);
handle_button_press(id_large, true, pad_index);
}
else
{
// Release both directions on the same axis
handle_button_press(id_small, false, pad_index);
handle_button_press(id_large, false, pad_index);
}
};

handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, pad_button::rs_left, pad_button::rs_right);
handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, pad_button::rs_down, pad_button::rs_up);
handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X, pad_button::ls_left, pad_button::ls_right);
handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y, pad_button::ls_down, pad_button::ls_up);

continue;
}

for (const Button& button : pad->m_buttons)
{
pad_button button_id = pad_button::pad_button_max_enum;
Expand Down Expand Up @@ -287,13 +361,13 @@ namespace rsx
button_id = pad_button::triangle;
break;
case CELL_PAD_CTRL_CIRCLE:
button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::cross : pad_button::circle;
button_id = circle_button;
break;
case CELL_PAD_CTRL_SQUARE:
button_id = pad_button::square;
break;
case CELL_PAD_CTRL_CROSS:
button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::circle : pad_button::cross;
button_id = cross_button;
break;
case CELL_PAD_CTRL_L1:
button_id = pad_button::L1;
Expand Down
3 changes: 1 addition & 2 deletions rpcs3/Input/pad_thread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,8 @@ void pad_thread::operator()()
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
continue;

// TODO: this keeps opening the home menu. Find out how to do it properly.
// Check if an LDD pad pressed the PS button (bit 0 of the first button)
if (false && pad->ldd && !!(pad->ldd_data.button[0] & CELL_PAD_CTRL_LDD_PS))
if (pad->ldd && pad->ldd_data.len >= 1 && !!(pad->ldd_data.button[0] & CELL_PAD_CTRL_LDD_PS))
{
ps_button_pressed = true;
break;
Expand Down

0 comments on commit 87a3252

Please sign in to comment.