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

ControllerEmu: Allow analog stick input radius greater than one. Useful for rounded-square inputs of xbox controllers.

This commit is contained in:
Jordan Woyak 2018-12-27 19:16:37 -06:00
parent da9bcf83ef
commit c614f5f534
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
View File

@ -138,8 +138,8 @@ void MappingIndicator::DrawCursor(bool tilt)
template <typename F> template <typename F>
QPolygonF GetPolygonFromRadiusGetter(F&& radius_getter, double scale) QPolygonF GetPolygonFromRadiusGetter(F&& radius_getter, double scale)
{ {
// 24 is a multiple of 8 (octagon) and enough points to be visibly pleasing: // A multiple of 8 (octagon) and enough points to be visibly pleasing:
constexpr int shape_point_count = 24; constexpr int shape_point_count = 32;
QPolygonF shape{shape_point_count}; QPolygonF shape{shape_point_count};
int p = 0; int p = 0;

9
Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
View File

@ -32,8 +32,10 @@ AnalogStick::AnalogStick(const char* const name_, const char* const ui_name_,
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Modifier"))); controls.emplace_back(std::make_unique<Input>(Translate, _trans("Modifier")));
// Set default input radius to that of the gate radius (no resizing) // Set default input radius to that of the gate radius (no resizing)
// Allow radius greater than 1.0 for definitions of rounded squares
// This is ideal for Xbox controllers (and probably others)
numeric_settings.emplace_back( numeric_settings.emplace_back(
std::make_unique<NumericSetting>(_trans("Input Radius"), GetGateRadiusAtAngle(0.0), 0, 100)); std::make_unique<NumericSetting>(_trans("Input Radius"), GetGateRadiusAtAngle(0.0), 0, 140));
// Set default input shape to an octagon (no reshaping) // Set default input shape to an octagon (no reshaping)
numeric_settings.emplace_back( numeric_settings.emplace_back(
std::make_unique<NumericSetting>(_trans("Input Shape"), 0.0, 0, 50)); std::make_unique<NumericSetting>(_trans("Input Shape"), 0.0, 0, 50));
@ -97,7 +99,10 @@ ControlState AnalogStick::GetDeadzoneRadiusAtAngle(double ang) const
ControlState AnalogStick::GetInputRadiusAtAngle(double ang) const ControlState AnalogStick::GetInputRadiusAtAngle(double ang) const
{ {
return CalculateInputShapeRadiusAtAngle(ang) * numeric_settings[SETTING_INPUT_RADIUS]->GetValue(); const ControlState radius =
CalculateInputShapeRadiusAtAngle(ang) * numeric_settings[SETTING_INPUT_RADIUS]->GetValue();
// Clamp within the -1 to +1 square as input radius may be greater than 1.0:
return std::min(radius, SquareStickGate(1).GetRadiusAtAngle(ang));
} }
ControlState AnalogStick::CalculateInputShapeRadiusAtAngle(double ang) const ControlState AnalogStick::CalculateInputShapeRadiusAtAngle(double ang) const