ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: Power curve option for wheel steering axis.

This commit is contained in:
Stuart Kenny 2022-12-19 21:25:13 +00:00 committed by lightningterror
parent a0b6290a4d
commit 78c05b263f
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pcsx2/USB/usb-pad/usb-pad.cpp
View File

@ -62,6 +62,25 @@ namespace usb_pad
"",
"KONAMI"};
static int MapSteeringCurveExponentOptionToExponent(const std::string& option)
{
int exponent = 0;
if (option == "Low")
{
exponent = 1;
}
else if (option == "Medium")
{
exponent = 2;
}
else if (option == "High")
{
exponent = 3;
}
return exponent;
}
static gsl::span<const InputBindingInfo> GetWheelBindings(PS2WheelTypes wt)
{
switch (wt)
@ -153,6 +172,7 @@ namespace usb_pad
{
if (wt <= WT_GT_FORCE)
{
static constexpr const char* SteeringCurveExponentOptions[] = {"Off", "Low", "Medium", "High", nullptr};
static constexpr const SettingInfo info[] = {
{SettingInfo::Type::Integer, "SteeringSmoothing", "Steering Smoothing",
"Smooths out changes in steering to the specified percentage per poll. Needed for using keyboards.",
@ -160,6 +180,9 @@ namespace usb_pad
{SettingInfo::Type::Integer, "SteeringDeadzone", "Steering Deadzone",
"Steering axis deadzone for pads or non self centering wheels.",
"0", "0", "100", "1", "%d%%", nullptr, nullptr, 1.0f},
{SettingInfo::Type::StringList, "SteeringCurveExponent", "Steering Damping",
"Applies power curve filter to steering axis values. Dampens small inputs.",
"Off", nullptr, nullptr, nullptr, nullptr, SteeringCurveExponentOptions}
};
return info;
@ -211,6 +234,7 @@ namespace usb_pad
}
steering_deadzone = (steering_range * USB::GetConfigInt(si, port, devname, "SteeringDeadzone", 0)) / 100;
steering_curve_exponent = MapSteeringCurveExponentOptionToExponent(USB::GetConfigString(si, port, devname, "SteeringCurveExponent", "Off"));
if (HasFF())
{
@ -444,12 +468,20 @@ namespace usb_pad
}
}
s16 PadState::ApplySteeringAxisDeadzone(float value)
s16 PadState::ApplySteeringAxisModifiers(float value)
{
const s16 raw_steering = static_cast<s16>(std::lroundf(value * static_cast<float>(steering_range)));
const s16 deadzone_offset = static_cast<s16>(std::lroundf(value * static_cast<float>(steering_deadzone)));
const s16 deadzone_modified_steering = std::max((raw_steering - steering_deadzone + deadzone_offset), 0);
return std::max((raw_steering - steering_deadzone + deadzone_offset ), 0);
if (steering_curve_exponent)
{
return std::pow(deadzone_modified_steering, steering_curve_exponent + 1) / std::pow(steering_range, steering_curve_exponent);
}
else
{
return deadzone_modified_steering;
}
}
void PadState::SetBindValue(u32 bind_index, float value)
@ -457,12 +489,12 @@ namespace usb_pad
switch (bind_index)
{
case CID_STEERING_L:
data.steering_left = ApplySteeringAxisDeadzone(value);
data.steering_left = ApplySteeringAxisModifiers(value);
UpdateSteering();
break;
case CID_STEERING_R:
data.steering_right = ApplySteeringAxisDeadzone(value);
data.steering_right = ApplySteeringAxisModifiers(value);
UpdateSteering();
break;

3
pcsx2/USB/usb-pad/usb-pad.h
View File

@ -327,7 +327,7 @@ namespace usb_pad
void OpenFFDevice();
void ParseFFData(const ff_data* ffdata, bool isDFP);
s16 ApplySteeringAxisDeadzone(float value);
s16 ApplySteeringAxisModifiers(float value);
USBDevice dev{};
USBDesc desc{};
@ -339,6 +339,7 @@ namespace usb_pad
s16 steering_range = 0;
u16 steering_step = 0;
s32 steering_deadzone = 0;
s16 steering_curve_exponent = 0;
struct
{