diff -r 4d04f91e1776 include/SDL_haptic.h --- a/include/SDL_haptic.h Sun May 03 22:13:48 2020 -0400 +++ b/include/SDL_haptic.h Mon May 04 18:58:35 2020 +0200 @@ -337,21 +337,12 @@ #define SDL_HAPTIC_SPHERICAL 2 /** - * \brief Uses first axis only. - * For some device with only one axis (steering wheel,...), - * SDL_HAPTIC_CARTESIAN does not work. SDL_HAPTIC_FIRST_AXIS can be used in - * this case. - * Using SDL_HAPTIC_FIRST_AXIS is equivalent to : - * \code - * SDL_HapticDirection direction; - * direction.type = SDL_HAPTIC_CARTESIAN; - * direction.dir[0] = 1; - * direction.dir[1] = 0; - * direction.dir[2] = 0; - * \endcode + * \brief Use this value to play an effect on the steering wheel axis. This + * provides better compatibility across platforms and devices as SDL will guess + * the correct axis. * \sa SDL_HapticDirection */ -#define SDL_HAPTIC_FIRST_AXIS 3 +#define SDL_HAPTIC_STEERING_AXIS 3 /* @} *//* Direction encodings */ @@ -461,7 +452,7 @@ * \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_CARTESIAN * \sa SDL_HAPTIC_SPHERICAL - * \sa SDL_HAPTIC_FIRST_AXIS + * \sa SDL_HAPTIC_STEERING_AXIS * \sa SDL_HapticEffect * \sa SDL_HapticNumAxes */ diff -r 4d04f91e1776 src/haptic/darwin/SDL_syshaptic.c --- a/src/haptic/darwin/SDL_syshaptic.c Sun May 03 22:13:48 2020 -0400 +++ b/src/haptic/darwin/SDL_syshaptic.c Mon May 04 18:58:35 2020 +0200 @@ -765,7 +765,7 @@ rglDir[2] = dir->dir[2]; } return 0; - case SDL_HAPTIC_FIRST_AXIS: + case SDL_HAPTIC_STEERING_AXIS: effect->dwFlags |= FFEFF_CARTESIAN; rglDir[0] = 0; return 0; @@ -817,7 +817,7 @@ envelope->dwSize = sizeof(FFENVELOPE); /* Always should be this. */ /* Axes. */ - if (src->constant.direction.type == SDL_HAPTIC_FIRST_AXIS) { + if (src->constant.direction.type == SDL_HAPTIC_STEERING_AXIS) { dest->cAxes = 1; } else { dest->cAxes = haptic->naxes; diff -r 4d04f91e1776 src/haptic/linux/SDL_syshaptic.c --- a/src/haptic/linux/SDL_syshaptic.c Sun May 03 22:13:48 2020 -0400 +++ b/src/haptic/linux/SDL_syshaptic.c Mon May 04 18:58:35 2020 +0200 @@ -718,7 +718,7 @@ *dest = (Uint16) tmp; } break; - case SDL_HAPTIC_FIRST_AXIS: + case SDL_HAPTIC_STEERING_AXIS: *dest = 0x4000; break; default: diff -r 4d04f91e1776 src/haptic/windows/SDL_dinputhaptic.c --- a/src/haptic/windows/SDL_dinputhaptic.c Sun May 03 22:13:48 2020 -0400 +++ b/src/haptic/windows/SDL_dinputhaptic.c Mon May 04 18:58:35 2020 +0200 @@ -589,7 +589,7 @@ if (naxes > 2) rglDir[2] = dir->dir[2]; return 0; - case SDL_HAPTIC_FIRST_AXIS: + case SDL_HAPTIC_STEERING_AXIS: effect->dwFlags |= DIEFF_CARTESIAN; rglDir[0] = 0; return 0; @@ -641,7 +641,7 @@ envelope->dwSize = sizeof(DIENVELOPE); /* Always should be this. */ /* Axes. */ - if (src->constant.direction.type == SDL_HAPTIC_FIRST_AXIS) { + if (src->constant.direction.type == SDL_HAPTIC_STEERING_AXIS) { dest->cAxes = 1; } else { dest->cAxes = haptic->naxes;