Mercurial > sdl-ios-xcode
changeset 2519:af9df9662807 gsoc2008_force_feedback
More explicit with iterations and length.
Added spherical coordinates (not available on linux).
| author | Edgar Simo <bobbens@gmail.com> |
|---|---|
| date | Tue, 15 Jul 2008 15:53:48 +0000 |
| parents | 07a5b225b9c9 |
| children | 6aee9eb4fc6d |
| files | include/SDL_haptic.h src/haptic/SDL_haptic.c src/haptic/SDL_syshaptic.h src/haptic/linux/SDL_syshaptic.c |
| diffstat | 4 files changed, 39 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_haptic.h Tue Jul 15 11:24:25 2008 +0000 +++ b/include/SDL_haptic.h Tue Jul 15 15:53:48 2008 +0000 @@ -212,7 +212,7 @@ /** * \def SDL_HAPTIC_CUSTOM * - * \brief User defined custom haptic effect. TODO. + * \brief User defined custom haptic effect. @todo. */ #define SDL_HAPTIC_CUSTOM (1<<11) /* Custom effect is supported */ /* These last two are features the device has, not effects */ @@ -261,6 +261,14 @@ * \sa SDL_HapticDirection */ #define SDL_HAPTIC_CARTESIAN 1 +/** + * \def SDL_HAPTIC_SHPERICAL + * + * \brief Uses spherical coordinates for the direction. + * + * \sa SDL_HapticDirection + */ +#define SDL_HAPTIC_SPHERICAL 2 /* @@ -273,7 +281,7 @@ * * \sa SDL_HapticRunEffect */ -#define SDL_HAPTIC_INFINITY -1 +#define SDL_HAPTIC_INFINITY 4294967295U /** @@ -317,19 +325,28 @@ * \endcode * * If type is SDL_HAPTIC_POLAR, direction is encoded by hundredths of a - * degree starting north and turning clockwise. The cardinal directions would be: + * degree starting north and turning clockwise. SDL_HAPTIC_POLAR only uses + * the first dir parameter. The cardinal directions would be: * - North: 0 (0 degrees) * - East: 9000 (90 degrees) * - South: 18000 (180 degrees) * - West: 27000 (270 degrees) * - * If type is SDL_HAPTIC_CARTESIAN, direction is encoded by position. - * The cardinal directions would be: + * If type is SDL_HAPTIC_CARTESIAN, direction is encoded by two positions + * (X axis and Y axis). SDL_HAPTIC_CARTESIAN uses the first two dir + * parameters. The cardinal directions would be: * - North: 0,-1 * - East: -1, 0 * - South: 0, 1 * - West: 1, 0 * + * If type is SDL_HAPTIC_SPHERICAL, direction is encoded by three rotations. + * All three dir parameters are used. The dir parameters are as follows + * (all values are in hundredths of degrees): + * 1) Degrees from (1, 0) rotated towards (0, 1). + * 2) Degrees towards (0, 0, 1) (device needs at least 3 axes). + * 3) Degrees tworads (0, 0, 0, 1) (device needs at least 4 axes). + * * * Example: * \code @@ -342,11 +359,12 @@ * * \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_CARTESIAN + * \sa SDL_HAPTIC_SHPERICAL * \sa SDL_HapticEffect */ typedef struct SDL_HapticDirection { Uint8 type; /**< The type of encoding. */ - Uint16 dir[2]; /**< The encoded direction. */ + Uint16 dir[3]; /**< The encoded direction. */ } SDL_HapticDirection; @@ -369,7 +387,7 @@ SDL_HapticDirection direction; /**< Direction of the effect. */ /* Replay */ - Uint16 length; /**< Duration of the effect. */ + Uint32 length; /**< Duration of the effect. */ Uint16 delay; /**< Delay before starting the effect. */ /* Trigger */ @@ -444,7 +462,7 @@ SDL_HapticDirection direction; /**< Direction of the effect. */ /* Replay */ - Uint16 length; /**< Duration of the effect. */ + Uint32 length; /**< Duration of the effect. */ Uint16 delay; /**< Delay before starting the effect. */ /* Trigger */ @@ -494,7 +512,7 @@ SDL_HAPTIC_INERTIA or SDL_HAPTIC_FRICTION */ /* Replay */ - Uint16 length; /**< Duration of the effect. */ + Uint32 length; /**< Duration of the effect. */ Uint16 delay; /**< Delay before starting the effect. */ /* Trigger */ @@ -530,7 +548,7 @@ SDL_HapticDirection direction; /**< Direction of the effect. */ /* Replay */ - Uint16 length; /**< Duration of the effect. */ + Uint32 length; /**< Duration of the effect. */ Uint16 delay; /**< Delay before starting the effect. */ /* Trigger */ @@ -555,10 +573,14 @@ * All values max at 32767 (0x7FFF). Signed values also can be negative. * Time values unless specified otherwise are in milliseconds. * + * You can also pass SDL_HAPTIC_INFINITY to length instead of a 0-32767 value. + * Neither delay, interval, attack_length nor fade_length support + * SDL_HAPTIC_INFINITY. + * * Common parts: * \code * // Replay - All effects have this - * Uint16 length; // Duration of effect (ms). + * Uint32 length; // Duration of effect (ms). * Uint16 delay; // Delay before starting effect. * * // Trigger - All effects have this @@ -857,7 +879,7 @@ * \sa SDL_HapticDestroyEffect * \sa SDL_HapticGetEffectStatus */ -extern DECLSPEC int SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, int iterations); +extern DECLSPEC int SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations); /** * \fn int SDL_HapticStopEffect(SDL_Haptic * haptic, int effect)
--- a/src/haptic/SDL_haptic.c Tue Jul 15 11:24:25 2008 +0000 +++ b/src/haptic/SDL_haptic.c Tue Jul 15 15:53:48 2008 +0000 @@ -470,7 +470,7 @@ * Runs the haptic effect on the device. */ int -SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, int iterations) +SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations) { if (!ValidHaptic(&haptic) || !ValidEffect(haptic,effect)) { return -1;
--- a/src/haptic/SDL_syshaptic.h Tue Jul 15 11:24:25 2008 +0000 +++ b/src/haptic/SDL_syshaptic.h Tue Jul 15 15:53:48 2008 +0000 @@ -140,7 +140,7 @@ */ extern int SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect * effect, - int iterations); + Uint32 iterations); /* * Stops the effect on the haptic device.
--- a/src/haptic/linux/SDL_syshaptic.c Tue Jul 15 11:24:25 2008 +0000 +++ b/src/haptic/linux/SDL_syshaptic.c Tue Jul 15 15:53:48 2008 +0000 @@ -672,17 +672,15 @@ * Runs an effect. */ int -SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect * effect, int iterations) +SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect * effect, + Uint32 iterations) { struct input_event run; /* Prepare to run the effect */ run.type = EV_FF; run.code = effect->hweffect->effect.id; - if (iterations == SDL_HAPTIC_INFINITY) - run.value = INT_MAX; - else - run.value = iterations; + run.value = (iterations > INT_MAX) ? INT_MAX : iterations; if (write(haptic->hwdata->fd, (const void*) &run, sizeof(run)) < 0) { SDL_SetError("Haptic: Unable to run the effect: %s", strerror(errno));