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

Input: fix trigger scaling

Browse source 
this is not a problem at the moment, but if you increase the trigger_max then the old code reports values bigger than 255
This commit is contained in:
Megamouse 2020-05-04 16:15:43 +02:00
parent d4606cfdb9
commit f95bf01c78
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/Io/PadHandler.cpp
View file

@ -103,7 +103,7 @@ long PadHandlerBase::FindKeyCodeByString(const std::unordered_map<u64, std::stri
float PadHandlerBase::ScaledInput(s32 raw_value, int minimum, int maximum) float PadHandlerBase::ScaledInput(s32 raw_value, int minimum, int maximum)
{ {
// value based on max range converted to [0, 1] // value based on max range converted to [0, 1]
float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum)); const float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum));
return 255.0f * val; return 255.0f * val;
} }
@ -111,7 +111,7 @@ float PadHandlerBase::ScaledInput(s32 raw_value, int minimum, int maximum)
float PadHandlerBase::ScaledInput2(s32 raw_value, int minimum, int maximum) float PadHandlerBase::ScaledInput2(s32 raw_value, int minimum, int maximum)
{ {
// value based on max range converted to [0, 1] // value based on max range converted to [0, 1]
float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum)); const float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum));
return (510.0f * val) - 255.0f; return (510.0f * val) - 255.0f;
} }
@ -124,11 +124,12 @@ u16 PadHandlerBase::NormalizeTriggerInput(u16 value, int threshold)
} }
else if (threshold <= trigger_min) else if (threshold <= trigger_min)
{ {
return value; return static_cast<u16>(ScaledInput(value, trigger_min, trigger_max));
} }
else else
{ {
return static_cast<u16>(static_cast<float>(trigger_max) * (value - threshold) / (trigger_max - threshold)); const s32 val = static_cast<s32>(static_cast<float>(trigger_max) * (value - threshold) / (trigger_max - threshold));
return static_cast<u16>(ScaledInput(val, trigger_min, trigger_max));
} }
} }
@ -141,7 +142,7 @@ u16 PadHandlerBase::NormalizeDirectedInput(s32 raw_value, s32 threshold, s32 max
return static_cast<u16>(0); return static_cast<u16>(0);
} }
float val = static_cast<float>(std::clamp(raw_value, 0, maximum)) / maximum; // value based on max range converted to [0, 1] const float val = static_cast<float>(std::clamp(raw_value, 0, maximum)) / maximum; // value based on max range converted to [0, 1]
if (threshold <= 0) if (threshold <= 0)
{ {
@ -149,7 +150,7 @@ u16 PadHandlerBase::NormalizeDirectedInput(s32 raw_value, s32 threshold, s32 max
} }
else else
{ {
float thresh = static_cast<float>(threshold) / maximum; // threshold converted to [0, 1] const float thresh = static_cast<float>(threshold) / maximum; // threshold converted to [0, 1]
return static_cast<u16>(255.0f * std::min(1.0f, (val - thresh) / (1.0f - thresh))); return static_cast<u16>(255.0f * std::min(1.0f, (val - thresh) / (1.0f - thresh)));
} }
} }