Commit 57db27909bb4399fc00a13d527d358abe63084bf
2014-08-16T16:47:42
Haptic: Fix the saturation and deadband parameters' available range. There was a misconception that Linux's saturation and deadband parameters - on which the corresponding SDL parameters were based - use only half of the possible range. Thanks, Elias! Partially fixes Bugzilla #2686.
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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h
index dceaeb8..827aa24 100644
--- a/include/SDL_haptic.h
+++ b/include/SDL_haptic.h
@@ -604,11 +604,11 @@ typedef struct SDL_HapticCondition
Uint16 interval; /**< How soon it can be triggered again after button. */
/* Condition */
- Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */
- Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */
+ Uint16 right_sat[3]; /**< Level when joystick is to the positive side; max 0xFFFF. */
+ Uint16 left_sat[3]; /**< Level when joystick is to the negative side; max 0xFFFF. */
Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */
Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */
- Uint16 deadband[3]; /**< Size of the dead zone. */
+ Uint16 deadband[3]; /**< Size of the dead zone; max 0xFFFF: whole axis-range when 0-centered. */
Sint16 center[3]; /**< Position of the dead zone. */
} SDL_HapticCondition;
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index 408b81a..dc9416b 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -924,10 +924,10 @@ SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src)
condition[i].lNegativeCoefficient =
CONVERT(hap_condition->left_coeff[i]);
condition[i].dwPositiveSaturation =
- CCONVERT(hap_condition->right_sat[i]);
+ CCONVERT(hap_condition->right_sat[i] / 2);
condition[i].dwNegativeSaturation =
- CCONVERT(hap_condition->left_sat[i]);
- condition[i].lDeadBand = CCONVERT(hap_condition->deadband[i]);
+ CCONVERT(hap_condition->left_sat[i] / 2);
+ condition[i].lDeadBand = CCONVERT(hap_condition->deadband[i] / 2);
}
dest->cbTypeSpecificParams = sizeof(FFCONDITION) * dest->cAxes;
dest->lpvTypeSpecificParams = condition;
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index 5320fb5..459d0ab 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -847,20 +847,18 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
/* Condition */
/* X axis */
- dest->u.condition[0].right_saturation =
- CLAMP(condition->right_sat[0]);
- dest->u.condition[0].left_saturation = CLAMP(condition->left_sat[0]);
+ dest->u.condition[0].right_saturation = condition->right_sat[0];
+ dest->u.condition[0].left_saturation = condition->left_sat[0];
dest->u.condition[0].right_coeff = condition->right_coeff[0];
dest->u.condition[0].left_coeff = condition->left_coeff[0];
- dest->u.condition[0].deadband = CLAMP(condition->deadband[0]);
+ dest->u.condition[0].deadband = condition->deadband[0];
dest->u.condition[0].center = condition->center[0];
/* Y axis */
- dest->u.condition[1].right_saturation =
- CLAMP(condition->right_sat[1]);
- dest->u.condition[1].left_saturation = CLAMP(condition->left_sat[1]);
+ dest->u.condition[1].right_saturation = condition->right_sat[1];
+ dest->u.condition[1].left_saturation = condition->left_sat[1];
dest->u.condition[1].right_coeff = condition->right_coeff[1];
dest->u.condition[1].left_coeff = condition->left_coeff[1];
- dest->u.condition[1].deadband = CLAMP(condition->deadband[1]);
+ dest->u.condition[1].deadband = condition->deadband[1];
dest->u.condition[1].center = condition->center[1];
/*
diff --git a/src/haptic/windows/SDL_dinputhaptic.c b/src/haptic/windows/SDL_dinputhaptic.c
index 489ca5e..0d6b208 100644
--- a/src/haptic/windows/SDL_dinputhaptic.c
+++ b/src/haptic/windows/SDL_dinputhaptic.c
@@ -763,10 +763,10 @@ SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
condition[i].lNegativeCoefficient =
CONVERT(hap_condition->left_coeff[i]);
condition[i].dwPositiveSaturation =
- CONVERT(hap_condition->right_sat[i]);
+ CONVERT(hap_condition->right_sat[i] / 2);
condition[i].dwNegativeSaturation =
- CONVERT(hap_condition->left_sat[i]);
- condition[i].lDeadBand = CONVERT(hap_condition->deadband[i]);
+ CONVERT(hap_condition->left_sat[i] / 2);
+ condition[i].lDeadBand = CONVERT(hap_condition->deadband[i] / 2);
}
dest->cbTypeSpecificParams = sizeof(DICONDITION) * dest->cAxes;
dest->lpvTypeSpecificParams = condition;
diff --git a/test/testhaptic.c b/test/testhaptic.c
index f624141..92fcec5 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -172,8 +172,8 @@ main(int argc, char **argv)
efx[nefx].type = SDL_HAPTIC_SPRING;
efx[nefx].condition.length = 5000;
for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
- efx[nefx].condition.right_sat[i] = 0x7FFF;
- efx[nefx].condition.left_sat[i] = 0x7FFF;
+ efx[nefx].condition.right_sat[i] = 0xFFFF;
+ efx[nefx].condition.left_sat[i] = 0xFFFF;
efx[nefx].condition.right_coeff[i] = 0x2000;
efx[nefx].condition.left_coeff[i] = 0x2000;
efx[nefx].condition.center[i] = 0x1000; /* Displace the center for it to move. */
@@ -191,10 +191,11 @@ main(int argc, char **argv)
efx[nefx].type = SDL_HAPTIC_INERTIA;
efx[nefx].condition.length = 5000;
for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
- efx[nefx].condition.right_sat[i] = 0x7FFF;
- efx[nefx].condition.left_sat[i] = 0x7FFF;
+ efx[nefx].condition.right_sat[i] = 0xFFFF;
+ efx[nefx].condition.left_sat[i] = 0xFFFF;
efx[nefx].condition.right_coeff[i] = 0x2000;
efx[nefx].condition.left_coeff[i] = 0x2000;
+ efx[nefx].condition.deadband[i] = 0x1000; /* 1/16th of axis-range around the center is 'dead'. */
}
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {