history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-17 12:25:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ControllerInterface: Move axis scaling into AnalogController class

Browse Source
This commit is contained in:
Albert Liu
2020-11-11 23:55:23 -08:00
parent ca14e53c4a
commit d87ab23fec
8 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/analog_controller.cpp
View File

@ -82,7 +82,8 @@ void AnalogController::SetAxisState(s32 axis_code, float value)
return;
// -1..1 -> 0..255
const u8 u8_value = static_cast<u8>(std::clamp(((value + 1.0f) / 2.0f) * 255.0f, 0.0f, 255.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));
SetAxisState(static_cast<Axis>(axis_code), u8_value);
}
@ -567,6 +568,8 @@ void AnalogController::LoadSettings(const char* section)
Controller::LoadSettings(section);
m_auto_enable_analog = g_host_interface->GetBoolSettingValue(section, "AutoEnableAnalog", false);
m_analog_dpad_in_digital_mode = g_host_interface->GetBoolSettingValue(section, "AnalogDPadInDigitalMode", false);
m_axis_scale =
std::clamp(std::abs(g_host_interface->GetFloatSettingValue(section, "AxisScale", 1.00f)), 0.01f, 1.50f);
m_rumble_bias =
static_cast<u8>(std::min<u32>(g_host_interface->GetIntSettingValue(section, "VibrationBias", 8), 255));
}

1
src/core/analog_controller.h
View File

@ -137,6 +137,7 @@ private:
bool m_auto_enable_analog = false;
bool m_analog_dpad_in_digital_mode = false;
float m_axis_scale = 1.00f;
u8 m_rumble_bias = 8;
bool m_analog_mode = false;