Add back the right stick, but no UI.

Not sure where to fit it...
This commit is contained in:
Unknown W. Brackets 2013-07-07 16:16:51 -07:00
parent e45863cb87
commit fc50094725
3 changed files with 24 additions and 1 deletions

View file

@ -392,6 +392,11 @@ const KeyMap_IntStrPair psp_button_names[] = {
{VIRTKEY_AXIS_Y_MIN, "An.Down"},
{VIRTKEY_AXIS_Y_MAX, "An.Up"},
{VIRTKEY_AXIS_RIGHT_X_MIN, "RightAn.Left"},
{VIRTKEY_AXIS_RIGHT_X_MAX, "RightAn.Right"},
{VIRTKEY_AXIS_RIGHT_Y_MIN, "RightAn.Down"},
{VIRTKEY_AXIS_RIGHT_Y_MAX, "RightAn.Up"},
{VIRTKEY_RAPID_FIRE, "RapidFire"},
{VIRTKEY_UNTHROTTLE, "Unthrottle"},
{VIRTKEY_SPEED_TOGGLE, "SpeedToggle"},

View file

@ -36,6 +36,10 @@ enum {
VIRTKEY_UNTHROTTLE = 0x10005,
VIRTKEY_PAUSE = 0x10006,
VIRTKEY_SPEED_TOGGLE = 0x10007,
VIRTKEY_AXIS_RIGHT_X_MIN = 0x10008,
VIRTKEY_AXIS_RIGHT_Y_MIN = 0x10009,
VIRTKEY_AXIS_RIGHT_X_MAX = 0x1000a,
VIRTKEY_AXIS_RIGHT_Y_MAX = 0x1000b,
VIRTKEY_LAST,
VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
};

View file

@ -263,7 +263,21 @@ void EmuScreen::axis(const AxisInput &axis) {
analog_[0].y = fabs(axis.value);
break;
// TODO: right stick.
case VIRTKEY_AXIS_RIGHT_X_MIN:
analog_[1].x = -fabs(axis.value);
break;
case VIRTKEY_AXIS_RIGHT_X_MAX:
analog_[1].x = fabs(axis.value);
break;
case VIRTKEY_AXIS_RIGHT_Y_MIN:
analog_[1].y = -fabs(axis.value);
break;
case VIRTKEY_AXIS_RIGHT_Y_MAX:
analog_[1].y = fabs(axis.value);
break;
default:
if (axis.value >= AXIS_BIND_THRESHOLD || axis.value <= -AXIS_BIND_THRESHOLD) {