mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-29 00:33:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: update buttons on pressure button toggle

Browse Source
This commit is contained in:
Megamouse 2023-06-28 23:35:56 +02:00
parent 6a1fb8cb73
commit 44801c50f3
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/Emu/Io/pad_types.h
View File

@ -343,6 +343,7 @@ struct Pad
bool m_pressure_intensity_button_pressed{}; // Last sensitivity button press state, used for toggle. bool m_pressure_intensity_button_pressed{}; // Last sensitivity button press state, used for toggle.
bool m_pressure_intensity_toggled{}; // Whether the sensitivity is toggled on or off. bool m_pressure_intensity_toggled{}; // Whether the sensitivity is toggled on or off.
u8 m_pressure_intensity{127}; // 0-255 u8 m_pressure_intensity{127}; // 0-255
bool m_adjust_pressure_last{}; // only used in keyboard_pad_handler
bool get_pressure_intensity_enabled(bool is_toggle_mode); bool get_pressure_intensity_enabled(bool is_toggle_mode);
// Cable State: 0 - 1 plugged in ? // Cable State: 0 - 1 plugged in ?

31
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -113,6 +113,12 @@ void keyboard_pad_handler::Key(const u32 code, bool pressed, u16 value)
} }
const bool adjust_pressure = pad.get_pressure_intensity_enabled(m_pressure_intensity_toggle_mode); const bool adjust_pressure = pad.get_pressure_intensity_enabled(m_pressure_intensity_toggle_mode);
const bool adjust_pressure_changed = pad.m_adjust_pressure_last != adjust_pressure;
if (adjust_pressure_changed)
{
pad.m_adjust_pressure_last = adjust_pressure;
}
// Handle buttons // Handle buttons
for (usz i = 0; i < pad.m_buttons.size(); i++) for (usz i = 0; i < pad.m_buttons.size(); i++)
@ -123,21 +129,26 @@ void keyboard_pad_handler::Key(const u32 code, bool pressed, u16 value)
Button& button = pad.m_buttons[i]; Button& button = pad.m_buttons[i];
if (!button.m_key_codes.contains(code))
continue;
button.m_actual_value = register_new_button_value(button.m_pressed_keys);
bool update_button = true; bool update_button = true;
// to get the fastest response time possible we don't wanna use any lerp with factor 1 if (!button.m_key_codes.contains(code))
if (button.m_analog)
{ {
update_button = m_analog_lerp_factor >= 1.0f; // Handle pressure changes anyway
update_button = adjust_pressure_changed;
} }
else if (button.m_trigger) else
{ {
update_button = m_trigger_lerp_factor >= 1.0f; button.m_actual_value = register_new_button_value(button.m_pressed_keys);
// to get the fastest response time possible we don't wanna use any lerp with factor 1
if (button.m_analog)
{
update_button = m_analog_lerp_factor >= 1.0f;
}
else if (button.m_trigger)
{
update_button = m_trigger_lerp_factor >= 1.0f;
}
} }
if (update_button) if (update_button)