mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 00:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add outer deadzone

Browse Source
This commit is contained in:
kalaposfos13 2025-02-04 13:27:22 +01:00
parent b879dd59c6
commit 73c5ad086b
1 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/input/input_handler.cpp
View File

@ -55,7 +55,8 @@ Don't be an idiot and test only the changed part expecting everything else to no
*/ */
bool leftjoystick_halfmode = false, rightjoystick_halfmode = false; bool leftjoystick_halfmode = false, rightjoystick_halfmode = false;
int leftjoystick_deadzone, rightjoystick_deadzone, lefttrigger_deadzone, righttrigger_deadzone; std::pair<int, int> leftjoystick_deadzone, rightjoystick_deadzone, lefttrigger_deadzone,
righttrigger_deadzone;
std::list<std::pair<InputEvent, bool>> pressed_keys; std::list<std::pair<InputEvent, bool>> pressed_keys;
std::list<InputID> toggled_keys; std::list<InputID> toggled_keys;
@ -208,10 +209,10 @@ void ParseInputConfig(const std::string game_id = "") {
float mouse_speed = 1; float mouse_speed = 1;
float mouse_speed_offset = 0.125; float mouse_speed_offset = 0.125;
leftjoystick_deadzone = 1; leftjoystick_deadzone = {1, 128};
rightjoystick_deadzone = 1; rightjoystick_deadzone = {1, 128};
lefttrigger_deadzone = 1; lefttrigger_deadzone = {1, 128};
righttrigger_deadzone = 1; righttrigger_deadzone = {1, 128};
int lineCount = 0; int lineCount = 0;
@ -298,26 +299,45 @@ void ParseInputConfig(const std::string game_id = "") {
continue; continue;
} else if (output_string == "analog_deadzone") { } else if (output_string == "analog_deadzone") {
std::stringstream ss(input_string); std::stringstream ss(input_string);
std::string device; std::string device, inner_deadzone_str, outer_deadzone_str;
int deadzone;
std::getline(ss, device, ','); if (!std::getline(ss, device, ',') || !std::getline(ss, inner_deadzone_str, ',') ||
ss >> deadzone; !std::getline(ss, outer_deadzone_str)) {
if (ss.fail()) { LOG_WARNING(Input, "Malformed deadzone config at line {}: \"{}\"", lineCount, line);
LOG_WARNING(Input, "Failed to parse deadzone config from line: {}", line);
continue; continue;
} else {
LOG_DEBUG(Input, "Parsed deadzone: {} {}", device, deadzone);
} }
if (device == "leftjoystick") {
leftjoystick_deadzone = deadzone; auto parseInt = [](const std::string& s) -> std::optional<int> {
} else if (device == "rightjoystick") { try {
rightjoystick_deadzone = deadzone; return std::stoi(s);
} else if (device == "l2") { } catch (...) {
lefttrigger_deadzone = deadzone; return std::nullopt;
} else if (device == "r2") { }
righttrigger_deadzone = deadzone; };
auto inner_deadzone = parseInt(inner_deadzone_str);
auto outer_deadzone = parseInt(outer_deadzone_str);
if (!inner_deadzone || !outer_deadzone) {
LOG_WARNING(Input, "Invalid deadzone values at line {}: \"{}\"", lineCount, line);
continue;
}
std::pair<int, int> deadzone = {*inner_deadzone, *outer_deadzone};
static std::unordered_map<std::string, std::pair<int, int>&> deadzone_map = {
{"leftjoystick", leftjoystick_deadzone},
{"rightjoystick", rightjoystick_deadzone},
{"l2", lefttrigger_deadzone},
{"r2", righttrigger_deadzone},
};
if (auto it = deadzone_map.find(device); it != deadzone_map.end()) {
it->second = deadzone;
LOG_DEBUG(Input, "Parsed deadzone: {} {} {}", device, inner_deadzone_str,
outer_deadzone_str);
} else { } else {
LOG_WARNING(Input, "Invalid axis name at line: {}, data: \"{}\", skipping line.", LOG_WARNING(Input, "Invalid axis name at line {}: \"{}\", skipping line.",
lineCount, line); lineCount, line);
} }
continue; continue;
@ -493,9 +513,14 @@ void ControllerOutput::FinalizeUpdate() {
// avoid double-updating axes, but don't skip directional button bindings // avoid double-updating axes, but don't skip directional button bindings
float multiplier = 1.0; float multiplier = 1.0;
int deadzone = 0; int deadzone = 0;
auto ApplyDeadzone = [](s16* value, int deadzone) { auto ApplyDeadzone = [](s16* value, std::pair<int, int> deadzone) {
if (std::abs(*value) <= deadzone) { if (std::abs(*value) <= deadzone.first || deadzone.first == deadzone.second) {
*value = 0; *value = 0;
} else {
*value = (*value >= 0 ? 1 : -1) *
std::clamp((int)((128.0 * (std::abs(*value) - deadzone.first)) /
(float)(deadzone.second - deadzone.first)),
0, 128);
} }
}; };
Axis c_axis = GetAxisFromSDLAxis(axis); Axis c_axis = GetAxisFromSDLAxis(axis);