RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

RSX/Overlays: don't press buttons on every iteration

Browse Source
This commit is contained in:
Megamouse 2018-10-02 20:25:36 +02:00
parent 9693d1c3a3
commit 76da3fa907
3 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/Timer.h
View File

@ -49,4 +49,11 @@ public:
return std::chrono::duration_cast<std::chrono::nanoseconds>(now - m_start).count(); return std::chrono::duration_cast<std::chrono::nanoseconds>(now - m_start).count();
} }
u64 GetMsSince(std::chrono::steady_clock::time_point timestamp)
{
std::chrono::steady_clock::time_point now = m_stopped ? m_end : std::chrono::steady_clock::now();
return std::chrono::duration_cast<std::chrono::milliseconds>(now - timestamp).count();
}
}; };

9
rpcs3/Emu/RSX/Overlays/overlay_controls.h
View File

@ -1479,12 +1479,11 @@ namespace rsx
m_accept_btn->set_pos(30, height + 20); m_accept_btn->set_pos(30, height + 20);
m_cancel_btn->set_pos(180, height + 20); m_cancel_btn->set_pos(180, height + 20);
m_accept_btn->text = "Select"; m_accept_btn->set_text("Select");
m_cancel_btn->text = "Cancel"; m_cancel_btn->set_text("Cancel");
auto fnt = fontmgr::get("Arial", 16); m_accept_btn->set_font("Arial", 16);
m_accept_btn->font_ref = fnt; m_cancel_btn->set_font("Arial", 16);
m_cancel_btn->font_ref = fnt;
auto_resize = false; auto_resize = false;
back_color = { 0.15f, 0.15f, 0.15f, 0.8f }; back_color = { 0.15f, 0.15f, 0.15f, 0.8f };

44
rpcs3/Emu/RSX/Overlays/overlays.h
View File

@ -64,8 +64,8 @@ namespace rsx
cross cross
}; };
u64 input_timestamp = 0; Timer input_timer;
bool exit = false; bool exit = false;
s32 return_code = CELL_OK; s32 return_code = CELL_OK;
std::function<void(s32 status)> on_close; std::function<void(s32 status)> on_close;
@ -93,8 +93,16 @@ namespace rsx
if (rinfo.max_connect == 0) if (rinfo.max_connect == 0)
return selection_code::error; return selection_code::error;
std::array<bool, 8> button_state; std::array<std::chrono::steady_clock::time_point, CELL_PAD_MAX_PORT_NUM> timestamp;
button_state.fill(true); timestamp.fill(std::chrono::steady_clock::now());
std::array<std::array<bool, 8>, CELL_PAD_MAX_PORT_NUM> button_state;
for (auto& state : button_state)
{
state.fill(true);
}
input_timer.Start();
while (!exit) while (!exit)
{ {
@ -107,8 +115,15 @@ namespace rsx
continue; continue;
} }
int pad_index = -1;
for (const auto &pad : handler->GetPads()) for (const auto &pad : handler->GetPads())
{ {
if (++pad_index >= CELL_PAD_MAX_PORT_NUM)
{
LOG_FATAL(RSX, "The native overlay cannot handle more than 7 pads! Current number of pads: %d", pad_index + 1);
continue;
}
for (auto &button : pad->m_buttons) for (auto &button : pad->m_buttons)
{ {
u8 button_id = 255; u8 button_id = 255;
@ -151,10 +166,25 @@ namespace rsx
if (button_id < 255) if (button_id < 255)
{ {
if (button.m_pressed != button_state[button_id]) if (button.m_pressed)
if (button.m_pressed) on_button_pressed(static_cast<pad_button>(button_id)); {
if (button_id < 4) // d-pad button
{
if (!button_state[pad_index][button_id] || input_timer.GetMsSince(timestamp[pad_index]) > 400)
{
// d-pad button was not pressed, or was pressed more than 400ms ago
timestamp[pad_index] = std::chrono::steady_clock::now();
on_button_pressed(static_cast<pad_button>(button_id));
}
}
else if (!button_state[pad_index][button_id])
{
// button was not pressed
on_button_pressed(static_cast<pad_button>(button_id));
}
}
button_state[button_id] = button.m_pressed; button_state[pad_index][button_id] = button.m_pressed;
} }
if (button.m_flush) if (button.m_flush)