From 34358a6b6613f7f2fb99d4628fe3e5d34d7b5766 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 29 May 2014 21:35:44 +0100
Subject: [PATCH] [Change] Improved force feedback system.
---
src/spfx.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/spfx.c b/src/spfx.c
index e610023..ff039ea 100644
--- a/src/spfx.c
+++ b/src/spfx.c
@@ -318,14 +318,15 @@ static void spfx_update_layer(SPFX* layer, int* nlayer, const double dt) {
void spfx_start(const double dt) {
GLdouble bx, by, x, y;
double inc;
+
+ if(shake_off == 1) return; /* Save the cycles. */
+
#if SDL_VERSION_ATLEAST(1,3,0)
/* Decrement the haptic timer. */
if(haptic_lastUpdate > 0.)
haptic_lastUpdate -= dt;
#endif
- if(shake_off == 1) return; /* Save the cycles. */
-
bx = SCREEN_W / 2;
by = SCREEN_H / 2;
@@ -412,18 +413,25 @@ static int spfx_hapticInit(void) {
static void spfx_hapticRumble(void) {
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_HapticEffect* efx;
+ double len, mag;
if(haptic_rumble >= 0) {
/* Not time to update yet. */
- if(haptic_lastUpdate > 0.)
+ if((haptic_lastUpdate > 0.) || shake_off)
return;
/* Stop the effect if it was playing. */
SDL_HapticStopEffect(haptic, haptic_rumble);
+ /* Get length and magnitude. */
+ len = 1000. * shake_rad / SHAKE_DECAY;
+ mag = 32767. * (shake_rad / SHAKE_MAX);
+
/* Update the effect. */
efx = &haptic_rumbleEffect;
- efx->periodic.length = (uint32_t)(1000.*shake_rad / SHAKE_DECAY);
+ efx->periodic.magnitude = (uint32_t)mag;
+ efx->periodic.length = (uint32_t)len;
+ efx->periodic.fade_length = MIN(efx->periodic.length, 1000);
if(SDL_HapticUpdateEffect(haptic, haptic_rumble, &haptic_rumbleEffect) < 0) {
WARN("Failed to update effect: %s.", SDL_GetError());
return;