encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3446 - The haptic API does not allow to select the direction axes 

meyraud705

Added Linux implementation, otherwise you get "Unsupported direction type" error.
Added documentation to explain why one would use SDL_HAPTIC_FIRST_AXIS.
This commit is contained in:
Sam Lantinga 2020-03-17 14:18:05 -07:00
parent e6189f4046
commit 4c22a21e06
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/SDL_haptic.h
View File

@ -338,7 +338,17 @@ typedef struct _SDL_Haptic SDL_Haptic;
/** /**
* \brief Uses first axis only. * \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
* \sa SDL_HapticDirection * \sa SDL_HapticDirection
*/ */
#define SDL_HAPTIC_FIRST_AXIS 3 #define SDL_HAPTIC_FIRST_AXIS 3
@ -451,6 +461,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
* \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_POLAR
* \sa SDL_HAPTIC_CARTESIAN * \sa SDL_HAPTIC_CARTESIAN
* \sa SDL_HAPTIC_SPHERICAL * \sa SDL_HAPTIC_SPHERICAL
* \sa SDL_HAPTIC_FIRST_AXIS
* \sa SDL_HapticEffect * \sa SDL_HapticEffect
* \sa SDL_HapticNumAxes * \sa SDL_HapticNumAxes
*/ */

4
src/haptic/linux/SDL_syshaptic.c
View File

@ -718,7 +718,9 @@ SDL_SYS_ToDirection(Uint16 *dest, SDL_HapticDirection * src)
*dest = (Uint16) tmp; *dest = (Uint16) tmp;
} }
break; break;
case SDL_HAPTIC_FIRST_AXIS:
*dest = 0x4000;
break;
default: default:
return SDL_SetError("Haptic: Unsupported direction type."); return SDL_SetError("Haptic: Unsupported direction type.");
} }