RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Input: remame some functions

Browse source
This commit is contained in:
Megamouse 2020-05-04 16:02:43 +02:00
parent 907adc817e
commit d4606cfdb9
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Input/evdev_joystick_handler.cpp
View file

@ -243,12 +243,12 @@ std::unordered_map<u64, std::pair<u16, bool>> evdev_joystick_handler::GetButtonV
// Triggers do not need handling of negative values
if (min >= 0 && std::find(m_positive_axis.begin(), m_positive_axis.end(), code) == m_positive_axis.end())
{
const float fvalue = ScaleStickInput(val, min, max);
const float fvalue = ScaledInput(val, min, max);
button_values.emplace(code, std::make_pair<u16, bool>(static_cast<u16>(fvalue), false));
continue;
}
const float fvalue = ScaleStickInput2(val, min, max);
const float fvalue = ScaledInput2(val, min, max);
if (fvalue < 0)
button_values.emplace(code, std::make_pair<u16, bool>(static_cast<u16>(std::abs(fvalue)), true));
else
@ -544,11 +544,11 @@ int evdev_joystick_handler::GetButtonInfo(const input_event& evt, const std::sha
{
m_is_negative = false;
m_is_button_or_trigger = true;
value = static_cast<u16>(ScaleStickInput(val, min, max));
value = static_cast<u16>(ScaledInput(val, min, max));
return code;
}
const float fvalue = ScaleStickInput2(val, min, max);
const float fvalue = ScaledInput2(val, min, max);
m_is_negative = fvalue < 0;
value = static_cast<u16>(std::abs(fvalue));
return code;

2
rpcs3/Input/mm_joystick_handler.cpp
View file

@ -383,7 +383,7 @@ std::unordered_map<u64, u16> mm_joystick_handler::GetButtonValues(const JOYINFOE
auto add_axis_value = [&](DWORD axis, UINT min, UINT max, u64 pos, u64 neg)
{
float val = ScaleStickInput2(axis, min, max);
float val = ScaledInput2(axis, min, max);
if (val < 0)
{
button_values.emplace(pos, 0);