mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-07-24 22:12:33 +02:00
parent d6d6dcdf5c
commit 08776496ed
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
input/common/input_hid_common.c
View File

@ -25,27 +25,17 @@ enum gamepad_pad_axes
AXIS_INVALID AXIS_INVALID
}; };
static int16_t gamepad_clamp_axis(int16_t value, bool is_negative)
{
if (is_negative && value > 0)
return 0;
if (!is_negative && value < 0)
return 0;
return value;
}
void gamepad_read_axis_data(uint32_t axis, axis_data *data) void gamepad_read_axis_data(uint32_t axis, axis_data *data)
{ {
if(!data) if (!data)
return; return;
data->axis = AXIS_POS_GET(axis); data->axis = AXIS_POS_GET(axis);
data->is_negative = false; data->is_negative = false;
if(data->axis >= AXIS_INVALID) if (data->axis >= AXIS_INVALID)
{ {
data->axis = AXIS_NEG_GET(axis); data->axis = AXIS_NEG_GET(axis);
data->is_negative = true; data->is_negative = true;
} }
} }
@ -54,24 +44,25 @@ int16_t gamepad_get_axis_value(int16_t state[3][2], axis_data *data)
{ {
int16_t value = 0; int16_t value = 0;
if(!data) if (!data)
return 0; return 0;
switch(data->axis) switch(data->axis)
{ {
case AXIS_LEFT_ANALOG_X: case AXIS_LEFT_ANALOG_X:
value = state[RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_X];
break;
case AXIS_LEFT_ANALOG_Y: case AXIS_LEFT_ANALOG_Y:
value = state[RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y]; value = state[RETRO_DEVICE_INDEX_ANALOG_LEFT][data->axis];
break; break;
case AXIS_RIGHT_ANALOG_X: case AXIS_RIGHT_ANALOG_X:
value = state[RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X];
break;
case AXIS_RIGHT_ANALOG_Y: case AXIS_RIGHT_ANALOG_Y:
value = state[RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y]; value = state[RETRO_DEVICE_INDEX_ANALOG_RIGHT][data->axis];
break; break;
} }
return gamepad_clamp_axis(value, data->is_negative); if (data->is_negative && value > 0)
return 0;
if (!data->is_negative && value < 0)
return 0;
return value;
} }