ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 01:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Mathieu Laurendeau

Consider a device supporting effects on multiple axes.
There's currently no way to play effects against a single-axis direction.


A device supporting effects against X and Y may not allow to play effects with a two-axis direction coordinate, even if one of the coordinates is null.

My current (ugly) work around for this is to add a direction type SDL_HAPTIC_X_FORCE to play effects against a X-axis only direction (patch attached).

This issue impacted two GIMX users using the following wheels:
- Leo Bodnar SimSteering force feedback wheel
- Accuforce direct drive wheel

Playing constant/spring/damper effects against a X-axis direction worked well for the first wheel, but not for the second one.

A better strategy seems to play the effects against the first axis reported by the DirectInput enumeration.

This strategy also works with Logitech wheels (at least the DFGT).

It's been more than a year that I have the latest patch (playing effects against the first axis only) in the GIMX software. It's being used by thousands of people, mostly for adapting their FFB wheel to the PS4. I had no report that proves this strategy to be wrong.
This commit is contained in:
Sam Lantinga 2020-03-16 13:28:38 -07:00
parent 543994b193
commit 7379991778
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/SDL_haptic.h
View file

@ -336,6 +336,13 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_SPHERICAL 2
/**
* \brief Uses first axis only.
*
* \sa SDL_HapticDirection
*/
#define SDL_HAPTIC_FIRST_AXIS 3
/* @} *//* Direction encodings */
/* @} *//* Haptic features */

10
src/haptic/darwin/SDL_syshaptic.c
View file

@ -765,6 +765,10 @@ SDL_SYS_SetDirection(FFEFFECT * effect, SDL_HapticDirection * dir, int naxes)
rglDir[2] = dir->dir[2];
}
return 0;
case SDL_HAPTIC_FIRST_AXIS:
effect->dwFlags |= FFEFF_CARTESIAN;
rglDir[0] = 0;
return 0;
default:
return SDL_SetError("Haptic: Unknown direction type.");
@ -813,7 +817,11 @@ SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src)
envelope->dwSize = sizeof(FFENVELOPE); /* Always should be this. */
/* Axes. */
dest->cAxes = haptic->naxes;
if (src->constant.direction.type == SDL_HAPTIC_FIRST_AXIS) {
dest->cAxes = 1;
} else {
dest->cAxes = haptic->naxes;
}
if (dest->cAxes > 0) {
axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
if (axes == NULL) {

10
src/haptic/windows/SDL_dinputhaptic.c
View file

@ -589,6 +589,10 @@ 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:
effect->dwFlags |= DIEFF_CARTESIAN;
rglDir[0] = 0;
return 0;
default:
return SDL_SetError("Haptic: Unknown direction type.");
@ -637,7 +641,11 @@ SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
envelope->dwSize = sizeof(DIENVELOPE); /* Always should be this. */
/* Axes. */
dest->cAxes = haptic->naxes;
if (src->constant.direction.type == SDL_HAPTIC_FIRST_AXIS) {
dest->cAxes = 1;
} else {
dest->cAxes = haptic->naxes;
}
if (dest->cAxes > 0) {
axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
if (axes == NULL) {