diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h index 18c74eff6..c27da1186 100644 --- a/include/SDL_haptic.h +++ b/include/SDL_haptic.h @@ -337,21 +337,12 @@ typedef struct _SDL_Haptic SDL_Haptic; #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 @@ typedef struct _SDL_Haptic SDL_Haptic; * \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 --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c index 55d28b80e..f37a10c5c 100644 --- a/src/haptic/darwin/SDL_syshaptic.c +++ b/src/haptic/darwin/SDL_syshaptic.c @@ -765,7 +765,7 @@ SDL_SYS_SetDirection(FFEFFECT * effect, SDL_HapticDirection * dir, int naxes) 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 @@ SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src) 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 --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c index b8e7f1338..3a2fbf695 100644 --- a/src/haptic/linux/SDL_syshaptic.c +++ b/src/haptic/linux/SDL_syshaptic.c @@ -718,7 +718,7 @@ SDL_SYS_ToDirection(Uint16 *dest, SDL_HapticDirection * src) *dest = (Uint16) tmp; } break; - case SDL_HAPTIC_FIRST_AXIS: + case SDL_HAPTIC_STEERING_AXIS: *dest = 0x4000; break; default: diff --git a/src/haptic/windows/SDL_dinputhaptic.c b/src/haptic/windows/SDL_dinputhaptic.c index ea7526aca..019e50865 100644 --- a/src/haptic/windows/SDL_dinputhaptic.c +++ b/src/haptic/windows/SDL_dinputhaptic.c @@ -589,7 +589,7 @@ SDL_SYS_SetDirection(DIEFFECT * effect, SDL_HapticDirection * dir, int naxes) 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 @@ SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest, 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;