Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Controller: Round floating point axis values instead of flooring

Browse source
This commit is contained in:
Connor McLaughlin 2021-07-17 20:38:21 +10:00
parent b01d49fa52
commit 3cf12e8f0d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/analog_controller.cpp
View file

@ -123,7 +123,7 @@ void AnalogController::SetAxisState(s32 axis_code, float value)
// -1..1 -> 0..255 // -1..1 -> 0..255
const float scaled_value = std::clamp(value * m_axis_scale, -1.0f, 1.0f); const float scaled_value = std::clamp(value * m_axis_scale, -1.0f, 1.0f);
const u8 u8_value = static_cast<u8>(std::clamp(((scaled_value + 1.0f) / 2.0f) * 255.0f, 0.0f, 255.0f)); const u8 u8_value = static_cast<u8>(std::clamp(std::round(((scaled_value + 1.0f) / 2.0f) * 255.0f), 0.0f, 255.0f));
SetAxisState(static_cast<Axis>(axis_code), u8_value); SetAxisState(static_cast<Axis>(axis_code), u8_value);
} }

2
src/core/analog_joystick.cpp
View file

@ -86,7 +86,7 @@ void AnalogJoystick::SetAxisState(s32 axis_code, float value)
// -1..1 -> 0..255 // -1..1 -> 0..255
const float scaled_value = std::clamp(value * m_axis_scale, -1.0f, 1.0f); const float scaled_value = std::clamp(value * m_axis_scale, -1.0f, 1.0f);
const u8 u8_value = static_cast<u8>(std::clamp(((scaled_value + 1.0f) / 2.0f) * 255.0f, 0.0f, 255.0f)); const u8 u8_value = static_cast<u8>(std::clamp(std::round(((scaled_value + 1.0f) / 2.0f) * 255.0f), 0.0f, 255.0f));
SetAxisState(static_cast<Axis>(axis_code), u8_value); SetAxisState(static_cast<Axis>(axis_code), u8_value);
} }

2
src/core/negcon.cpp
View file

@ -71,7 +71,7 @@ void NeGcon::SetAxisState(s32 axis_code, float value)
(std::abs(value) < m_steering_deadzone) ? (std::abs(value) < m_steering_deadzone) ?
0.0f : 0.0f :
std::copysign((std::abs(value) - m_steering_deadzone) / (1.0f - m_steering_deadzone), value); std::copysign((std::abs(value) - m_steering_deadzone) / (1.0f - m_steering_deadzone), value);
const u8 u8_value = static_cast<u8>(std::clamp(((float_value + 1.0f) / 2.0f) * 255.0f, 0.0f, 255.0f)); const u8 u8_value = static_cast<u8>(std::clamp(std::round(((float_value + 1.0f) / 2.0f) * 255.0f), 0.0f, 255.0f));
SetAxisState(static_cast<Axis>(axis_code), u8_value); SetAxisState(static_cast<Axis>(axis_code), u8_value);