Commit 65ad45340d23bfa86f0f163dec753b57026c1091
2020-05-04T13:17:43
Improvement for bug 3446 - The haptic API does not allow to select the direction axes meyraud705 I see how the documentation is confusing. I think that the choice of the axis is an implementation detail. The documentation should state the goal of this value, so I propose this wording: "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." Value could even be renamed 'SDL_HAPTIC_STEERING_AXIS'. For Linux, sending an effect on the X axis with a Logitech wheel works. Others brands don't have driver for Linux as far as I know.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h
index 18c74ef..c27da11 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 55d28b8..f37a10c 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 b8e7f13..3a2fbf6 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 ea7526a..019e508 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;