Cool_Tools/FFBArcadePlugin
1
0
Fork 0
mirror of synced 2025-01-19 07:47:25 +01:00
Code Releases Activity

Revert "Fixed Rumble never stopping effects"

Browse Source 
This reverts commit 5aa55e86663ce0926235c22fea1588110055b10e.
This commit is contained in:
Aaron M 2019-10-31 21:22:59 +13:00
parent 58e83bddf1
commit 6fd5224125
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DllMain.cpp
View File

@ -844,8 +844,6 @@ HINSTANCE gl_hlibavs = NULL;
int joystick_index1; int joystick_index1;
int joystick1Index = -1; int joystick1Index = -1;
int joystick_index2 = -1; int joystick_index2 = -1;
int lengthRumbleEffect;
int lengthRumbleEffectDevice2;
// settings // settings
wchar_t* settingsFilename = TEXT(".\\FFBPlugin.ini"); wchar_t* settingsFilename = TEXT(".\\FFBPlugin.ini");
@ -1568,18 +1566,10 @@ void TriggerLeftRightDevice2Effect(double smallstrength, double largestrength, d
} }
} }
static int StopRumbleEffectThread(void* ptr)
{
Sleep(lengthRumbleEffect);
SDL_JoystickRumble(GameController, 0, 0, 0);
return 0;
}
void TriggerRumbleEffect(double lowfrequency, double highfrequency, double length) void TriggerRumbleEffect(double lowfrequency, double highfrequency, double length)
{ {
if (EnableRumble == 1) if (EnableRumble == 1)
{ {
lengthRumbleEffect = length;
DWORD minForceLow = (DWORD)(lowfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); DWORD minForceLow = (DWORD)(lowfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0);
DWORD minForceHigh = (DWORD)(highfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); DWORD minForceHigh = (DWORD)(highfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0);
DWORD maxForce = (DWORD)(configMaxForce / 100.0 * 65535.0); DWORD maxForce = (DWORD)(configMaxForce / 100.0 * 65535.0);
@ -1593,26 +1583,16 @@ void TriggerRumbleEffect(double lowfrequency, double highfrequency, double lengt
SDL_JoystickRumble(GameController, HighMotor, LowMotor, length); SDL_JoystickRumble(GameController, HighMotor, LowMotor, length);
} }
else else
{ {
SDL_JoystickRumble(GameController, LowMotor, HighMotor, length); SDL_JoystickRumble(GameController, LowMotor, HighMotor, length);
}
}
SDL_Thread* StopRumblethread = SDL_CreateThread(StopRumbleEffectThread, "StopRumbleEffectThread", (void*)NULL);
} }
} }
static int StopRumbleEffectDevice2Thread(void* ptr)
{
Sleep(lengthRumbleEffectDevice2);
SDL_JoystickRumble(GameController2, 0, 0, 0);
return 0;
}
void TriggerRumbleEffectDevice2(double lowfrequency, double highfrequency, double length) void TriggerRumbleEffectDevice2(double lowfrequency, double highfrequency, double length)
{ {
if (EnableRumble == 1) if (EnableRumble == 1)
{ {
lengthRumbleEffectDevice2 = length;
DWORD minForceLow = (DWORD)(lowfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); DWORD minForceLow = (DWORD)(lowfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0);
DWORD minForceHigh = (DWORD)(highfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); DWORD minForceHigh = (DWORD)(highfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0);
DWORD maxForce = (DWORD)(configMaxForce / 100.0 * 65535.0); DWORD maxForce = (DWORD)(configMaxForce / 100.0 * 65535.0);
@ -1629,7 +1609,6 @@ void TriggerRumbleEffectDevice2(double lowfrequency, double highfrequency, doubl
{ {
SDL_JoystickRumble(GameController2, LowMotor, HighMotor, length); SDL_JoystickRumble(GameController2, LowMotor, HighMotor, length);
} }
SDL_Thread* StopRumbleDevice2thread = SDL_CreateThread(StopRumbleEffectDevice2Thread, "StopRumbleEffectDevice2Thread", (void*)NULL);
} }
} }