mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 05:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding stick radius setting

Browse source 
because that makes it easier to adjust it

Adding visual aid for the hardware range because that makes it easier to adjust the radius relative to it
This commit is contained in:
John Peterson 2011-11-10 09:27:33 +01:00
commit b6e1127c8a
3 changed files with 60 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/InputCommon/Src/ControllerEmu.h
View file

@ -35,6 +35,13 @@ enum
GROUP_TYPE_SLIDER,
};
enum
{
SETTING_RADIUS,
SETTING_DEADZONE,
SETTING_SQUARE,
};
const char * const named_directions[] =
{
"Up",
@ -126,8 +133,9 @@ public:
ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
ControlState deadzone = settings[0]->value;
ControlState square = settings[1]->value;
ControlState radius = settings[SETTING_RADIUS]->value;
ControlState deadzone = settings[SETTING_DEADZONE]->value;
ControlState square = settings[SETTING_SQUARE]->value;
ControlState m = controls[4]->control_ref->State();
// modifier code
@ -138,11 +146,11 @@ public:
}
// deadzone / square stick code
if (deadzone || square)
if (radius != 1 || deadzone || square)
{
// this section might be all wrong, but its working good enough, I think
ControlState ang = atan2(yy, xx);
ControlState ang = atan2(yy, xx);
ControlState ang_sin = sin(ang);
ControlState ang_cos = cos(ang);
@ -163,6 +171,9 @@ public:
ControlState amt = dist / stick_full;
dist -= ((square_full - 1) * amt * square);
// radius
dist *= radius;
yy = std::max(-1.0f, std::min(1.0f, ang_sin * dist));
xx = std::max(-1.0f, std::min(1.0f, ang_cos * dist));
}