We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Add some missing haptic types to test, and fix wrong array-sizes

rev5-rev6.diff (text/plain), 3.79 KB, created by Elias Vanderstuyft on 2014-08-15 15:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elias Vanderstuyft

Created: 2014-08-15 15:00:49 UTC

Size: 3.79 KB

patch

obsolete

>diff -uNrp rev5/test/testhaptic.c rev6/test/testhaptic.c
>--- rev5/test/testhaptic.c	2014-08-14 21:22:44.000000000 +0200
>+++ rev6/test/testhaptic.c	2014-08-14 22:46:08.000000000 +0200
>@@ -45,8 +45,8 @@ main(int argc, char **argv)
>     int i;
>     char *name;
>     int index;
>-    SDL_HapticEffect efx[5];
>-    int id[5];
>+    SDL_HapticEffect efx[9];
>+    int id[9];
>     int nefx;
>     unsigned int supported;
> 
>@@ -149,6 +149,7 @@ main(int argc, char **argv)
>         }
>         nefx++;
>     }
>+    
>     /* Now the classical constant effect. */
>     if (supported & SDL_HAPTIC_CONSTANT) {
>         SDL_Log("   effect %d: Constant Force\n", nefx);
>@@ -166,6 +167,7 @@ main(int argc, char **argv)
>         }
>         nefx++;
>     }
>+    
>     /* The cute spring effect. */
>     if (supported & SDL_HAPTIC_SPRING) {
>         SDL_Log("   effect %d: Condition Spring\n", nefx);
>@@ -185,6 +187,24 @@ main(int argc, char **argv)
>         }
>         nefx++;
>     }
>+    /* The interesting damper effect. */
>+    if (supported & SDL_HAPTIC_DAMPER) {
>+        SDL_Log("   effect %d: Condition Damper\n", nefx);
>+        efx[nefx].type = SDL_HAPTIC_DAMPER;
>+        efx[nefx].condition.length = 5000;
>+        for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
>+            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;
>+        }
>+        id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
>+        if (id[nefx] < 0) {
>+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
>+            abort_execution();
>+        }
>+        nefx++;
>+    }
>     /* The pretty awesome inertia effect. */
>     if (supported & SDL_HAPTIC_INERTIA) {
>         SDL_Log("   effect %d: Condition Inertia\n", nefx);
>@@ -200,6 +220,44 @@ main(int argc, char **argv)
>         id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
>         if (id[nefx] < 0) {
>             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
>+            abort_execution();
>+        }
>+        nefx++;
>+    }
>+    /* The hot friction effect. */
>+    if (supported & SDL_HAPTIC_FRICTION) {
>+        SDL_Log("   effect %d: Condition Friction\n", nefx);
>+        efx[nefx].type = SDL_HAPTIC_FRICTION;
>+        efx[nefx].condition.length = 5000;
>+        for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
>+            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;
>+        }
>+        id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
>+        if (id[nefx] < 0) {
>+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
>+            abort_execution();
>+        }
>+        nefx++;
>+    }
>+    
>+    /* Now we'll try a ramp effect */
>+    if (supported & SDL_HAPTIC_RAMP) {
>+        SDL_Log("   effect %d: Ramp\n", nefx);
>+        efx[nefx].type = SDL_HAPTIC_RAMP;
>+        efx[nefx].ramp.direction.type = SDL_HAPTIC_CARTESIAN;
>+        efx[nefx].ramp.direction.dir[0] = 1;     /* Force comes from                 */
>+        efx[nefx].ramp.direction.dir[1] = -1;    /*                  the north-east. */
>+        efx[nefx].ramp.length = 5000;
>+        efx[nefx].ramp.start = 0x4000;
>+        efx[nefx].ramp.end = -0x4000;
>+        efx[nefx].ramp.attack_length = 1000;
>+        efx[nefx].ramp.fade_length = 1000;
>+        id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
>+        if (id[nefx] < 0) {
>+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
>             abort_execution();
>         }
>         nefx++;

Actions: View | Diff

Attachments on bug 2686: 1815 | 1816 | 1817 | 1818 | 1819 | 1821 | 1822

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.