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] SDL_HapticRumble Patch (r2)

SDL_HAPTIC_RUMBLE_proper.patch (text/plain), 7.48 KB, created by Ethan Lee on 2013-05-20 21:05:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ethan Lee

Created: 2013-05-20 21:05:41 UTC

Size: 7.48 KB

patch

obsolete

>diff -r c37d853c2f5e include/SDL_haptic.h
>--- a/include/SDL_haptic.h	Sat May 18 23:32:53 2013 -0700
>+++ b/include/SDL_haptic.h	Sun May 19 04:25:02 2013 -0400
>@@ -296,6 +296,13 @@
>  */
> #define SDL_HAPTIC_PAUSE      (1<<15)
> 
>+/**
>+ *  \brief Left/Right Rumble effect supported.
>+ *
>+ *  \sa SDL_HapticRumble
>+ */
>+#define SDL_HAPTIC_RUMBLE     (1<<16)
>+
> 
> /**
>  * \name Direction encodings
>@@ -452,7 +459,7 @@
> typedef struct SDL_HapticConstant
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_CONSTANT */
>+    Uint32 type;            /**< ::SDL_HAPTIC_CONSTANT */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -533,7 +540,7 @@
> typedef struct SDL_HapticPeriodic
> {
>     /* Header */
>-    Uint16 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_SQUARE,
>+    Uint32 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_SQUARE,
>                              ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
>                              ::SDL_HAPTIC_SAWTOOTHDOWN */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
>@@ -586,7 +593,7 @@
> typedef struct SDL_HapticCondition
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
>+    Uint32 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
>                                  ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
>     SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
> 
>@@ -623,7 +630,7 @@
> typedef struct SDL_HapticRamp
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_RAMP */
>+    Uint32 type;            /**< ::SDL_HAPTIC_RAMP */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -646,6 +653,36 @@
> } SDL_HapticRamp;
> 
> /**
>+ * \brief A structure containing a template for a Rumble effect.
>+ *
>+ * This struct is exclusively for te ::SDL_HAPTIC_RUMBLE effect.
>+ *
>+ * The rumble effect is used to explicitly control the large and small motors,
>+ * commonly found in modern game controllers.
>+ *
>+ * \sa SDL_HAPTIC_RUMBLE
>+ * \sa SDL_HapticEffect
>+ */
>+typedef struct SDL_HapticRumble
>+{
>+    /* Header */
>+    Uint32 type;            /**< ::SDL_HAPTIC_RUMBLE */
>+    SDL_HapticDirection direction; /**< Direction of the effect. */
>+
>+    /* Replay */
>+    Uint32 length;          /**< Duration of the effect. */
>+    Uint16 delay;           /**< Delay before starting the effect. */
>+
>+    /* Trigger */
>+    Uint16 button;          /**< Button that triggers the effect. */
>+    Uint16 interval;        /**< How soon it can be triggered again after button. */
>+
>+    /* Rumble */
>+    Uint16 large_magnitude; /**< Control of the large controller motor. */
>+    Uint16 small_magnitude; /**< Control of the small controller motor. */
>+} SDL_HapticRumble;
>+
>+/**
>  *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
>  *
>  *  A custom force feedback effect is much like a periodic effect, where the
>@@ -661,7 +698,7 @@
> typedef struct SDL_HapticCustom
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_CUSTOM */
>+    Uint32 type;            /**< ::SDL_HAPTIC_CUSTOM */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -751,16 +788,18 @@
>  *  \sa SDL_HapticPeriodic
>  *  \sa SDL_HapticCondition
>  *  \sa SDL_HapticRamp
>+ *  \sa SDL_HapticRumble
>  *  \sa SDL_HapticCustom
>  */
> typedef union SDL_HapticEffect
> {
>     /* Common for all force feedback effects */
>-    Uint16 type;                    /**< Effect type. */
>+    Uint32 type;                    /**< Effect type. */
>     SDL_HapticConstant constant;    /**< Constant effect. */
>     SDL_HapticPeriodic periodic;    /**< Periodic effect. */
>     SDL_HapticCondition condition;  /**< Condition effect. */
>     SDL_HapticRamp ramp;            /**< Ramp effect. */
>+    SDL_HapticRumble rumble;        /**< Rumble effect. */
>     SDL_HapticCustom custom;        /**< Custom effect. */
> } SDL_HapticEffect;
> 
>diff -r c37d853c2f5e src/haptic/linux/SDL_syshaptic.c
>--- a/src/haptic/linux/SDL_syshaptic.c	Sat May 18 23:32:53 2013 -0700
>+++ b/src/haptic/linux/SDL_syshaptic.c	Sun May 19 04:25:02 2013 -0400
>@@ -111,6 +111,7 @@
>     EV_TEST(FF_CUSTOM, SDL_HAPTIC_CUSTOM);
>     EV_TEST(FF_GAIN, SDL_HAPTIC_GAIN);
>     EV_TEST(FF_AUTOCENTER, SDL_HAPTIC_AUTOCENTER);
>+    EV_TEST(FF_RUMBLE, SDL_HAPTIC_RUMBLE);
> 
>     /* Return what it supports. */
>     return ret;
>@@ -559,6 +560,7 @@
>     SDL_HapticPeriodic *periodic;
>     SDL_HapticCondition *condition;
>     SDL_HapticRamp *ramp;
>+    SDL_HapticRumble *rumble;
> 
>     /* Clear up */
>     SDL_memset(dest, 0, sizeof(struct ff_effect));
>@@ -725,6 +727,30 @@
> 
>         break;
> 
>+    case SDL_HAPTIC_RUMBLE:
>+        rumble = &src->rumble;
>+
>+        /* Header */
>+        dest->type = FF_RUMBLE;
>+        dest->direction = SDL_SYS_ToDirection(&rumble->direction);
>+        if (dest->direction == (Uint16) - 1)
>+            return -1;
>+
>+        /* Replay */
>+        dest->replay.length = (rumble->length == SDL_HAPTIC_INFINITY) ?
>+            0 : CLAMP(rumble->length);
>+        dest->replay.delay = CLAMP(rumble->delay);
>+
>+        /* Trigger */
>+        dest->trigger.button = SDL_SYS_ToButton(rumble->button);
>+        dest->trigger.interval = CLAMP(rumble->interval);
>+
>+        /* Rumble */
>+        dest->u.rumble.strong_magnitude = rumble->large_magnitude;
>+        dest->u.rumble.weak_magnitude = rumble->small_magnitude;
>+
>+	break;
>+
> 
>     default:
>         return SDL_SetError("Haptic: Unknown effect type.");
>diff -r c37d853c2f5e src/haptic/windows/SDL_syshaptic.c
>--- a/src/haptic/windows/SDL_syshaptic.c	Sat May 18 23:32:53 2013 -0700
>+++ b/src/haptic/windows/SDL_syshaptic.c	Sun May 19 04:25:02 2013 -0400
>@@ -395,8 +395,7 @@
>     XINPUT_VIBRATION vibration = { 0, 0 };  /* stop any current vibration */
>     XINPUTSETSTATE(userid, &vibration);
> 
>-    /* !!! FIXME: we can probably do more than SINE if we figure out how to set up the left and right motors properly. */
>-    haptic->supported = SDL_HAPTIC_SINE;
>+    haptic->supported = SDL_HAPTIC_SINE | SDL_HAPTIC_RUMBLE;
> 
>     haptic->neffects = 1;
>     haptic->nplaying = 1;
>@@ -1186,6 +1185,7 @@
>         return &GUID_Friction;
> 
>     case SDL_HAPTIC_CUSTOM:
>+    case SDL_HAPTIC_RUMBLE: // FIXME: This is wrong, but XInput won't care.
>         return &GUID_CustomForce;
> 
>     default:
>@@ -1220,7 +1220,7 @@
>     SDL_zerop(effect->hweffect);
> 
>     if (haptic->hwdata->bXInputHaptic) {
>-        SDL_assert(base->type == SDL_HAPTIC_SINE);  /* should catch this at higher level */
>+        SDL_assert(base->type == SDL_HAPTIC_SINE || base->type == SDL_HAPTIC_RUMBLE);  /* should catch this at higher level */
>         return SDL_SYS_HapticUpdateEffect(haptic, effect, base);
>     }
> 
>@@ -1276,8 +1276,13 @@
>              motor is the low-frequency motor. They do not always need to be
>              set to the same amount, as they provide different effects." */
>         XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
>-        SDL_assert(data->type == SDL_HAPTIC_SINE);
>-        vib->wLeftMotorSpeed = vib->wRightMotorSpeed = data->periodic.magnitude * 2;
>+        SDL_assert(data->type == SDL_HAPTIC_SINE || data->type == SDL_HAPTIC_RUMBLE);
>+        if (data->type == SDL_HAPTIC_SINE) {
>+            vib->wLeftMotorSpeed = vib->wRightMotorSpeed = data->periodic.magnitude * 2;
>+        } else if (data->type == SDL_HAPTIC_RUMBLE) {
>+            vib->wLeftMotorSpeed = data->rumble.large_magnitude;
>+            vib->wRightMotorSpeed = data->rumble.small_magnitude;
>+        }
>         return 0;
>     }
>

Actions: View | Diff

Attachments on bug 1855: 1141 | 1146

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.