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

Merge pull request #7837 from jordan-woyak/deadzone-math-fix 

ControllerEmu: Deadzone math fix.
This commit is contained in:
Mat M 2019-03-03 02:32:04 -05:00 committed by GitHub
parent 7a8ddbaccb ecb67cf815
commit 8156df2758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/InputCommon/ControllerEmu/StickGate.cpp
View File

@ -250,11 +250,10 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
const ControlState gate_max_dist = GetGateRadiusAtAngle(angle); const ControlState gate_max_dist = GetGateRadiusAtAngle(angle);
const ControlState input_max_dist = GetInputRadiusAtAngle(angle); const ControlState input_max_dist = GetInputRadiusAtAngle(angle);
// If input radius is zero we apply no scaling. // If input radius (from calibration) is zero apply no scaling to prevent division by zero.
// This is useful when mapping native controllers without knowing intimate radius details.
const ControlState max_dist = input_max_dist ? input_max_dist : gate_max_dist; const ControlState max_dist = input_max_dist ? input_max_dist : gate_max_dist;
ControlState dist = std::sqrt(x * x + y * y) / max_dist; ControlState dist = Common::DVec2{x, y}.Length() / max_dist;
// If the modifier is pressed, scale the distance by the modifier's value. // If the modifier is pressed, scale the distance by the modifier's value.
// This is affected by the modifier's "range" setting which defaults to 50%. // This is affected by the modifier's "range" setting which defaults to 50%.
@ -267,16 +266,15 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
// dist *= modifier; // dist *= modifier;
} }
// Apply deadzone as a percentage of the user-defined radius/shape: // Apply deadzone as a percentage of the user-defined calibration shape/size:
const ControlState deadzone = GetDeadzoneRadiusAtAngle(angle); const ControlState deadzone = numeric_settings[SETTING_DEADZONE]->GetValue();
dist = std::max(0.0, dist - deadzone) / (1.0 - deadzone); dist = std::max(0.0, dist - deadzone) / (1.0 - deadzone);
// Scale to the gate shape/radius: // Scale to the gate shape/radius:
dist = dist *= gate_max_dist; dist *= gate_max_dist;
x = MathUtil::Clamp(std::cos(angle) * dist, -1.0, 1.0); return {MathUtil::Clamp(std::cos(angle) * dist, -1.0, 1.0),
y = MathUtil::Clamp(std::sin(angle) * dist, -1.0, 1.0); MathUtil::Clamp(std::sin(angle) * dist, -1.0, 1.0)};
return {x, y};
} }
} // namespace ControllerEmu } // namespace ControllerEmu