Cool_Tools/FFBArcadePlugin
1
0
Fork 0
mirror of synced 2025-01-31 03:43:48 +01:00
Code Releases Activity

Clean up constant force related code

Browse Source
This commit is contained in:
pinkimo 2019-10-06 22:32:24 +02:00
parent 6b4825e2f9
commit 7ef678d783
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common Files/Game.h
View File

@ -21,9 +21,7 @@ struct EffectTriggers {
// classes
class EffectCollection {
public:
int effect_id;
int effect_left_id;
int effect_right_id;
int effect_constant_id;
int effect_leftramp_id;
int effect_rightramp_id;
int effect_friction_id;

18
DllMain.cpp
View File

@ -1008,13 +1008,7 @@ void Initialize(int device_index)
tempEffect.constant.length = configFeedbackLength; // presumably is ms, but is not documented
tempEffect.constant.delay = 0;
tempEffect.constant.level = 9999; // this is an sint16 => -32768 to 32767
// Upload the effect
effects.effect_left_id = SDL_HapticNewEffect(haptic, &tempEffect);
tempEffect.constant.direction.dir[0] = 1; // this is right-side
effects.effect_right_id = SDL_HapticNewEffect(haptic, &tempEffect);
effects.effect_constant_id = SDL_HapticNewEffect(haptic, &tempEffect); // Upload the effect
tempEffect = SDL_HapticEffect();
tempEffect.type = SDL_HAPTIC_FRICTION;
@ -1103,7 +1097,7 @@ void TriggerConstantEffect(int direction, double strength)
// stop previous effect if not completed
if (configResetFeedback) {
SDL_HapticStopEffect(haptic, effects.effect_id);
SDL_HapticStopEffect(haptic, effects.effect_constant_id);
}
SDL_HapticEffect tempEffect;
@ -1147,8 +1141,8 @@ void TriggerConstantEffect(int direction, double strength)
tempEffect.constant.level = level;
hlp.log((char *)(std::to_string(level)).c_str());
SDL_HapticUpdateEffect(haptic, effects.effect_id, &tempEffect);
SDL_HapticRunEffect(haptic, effects.effect_id, 1);
SDL_HapticUpdateEffect(haptic, effects.effect_constant_id, &tempEffect);
SDL_HapticRunEffect(haptic, effects.effect_constant_id, 1);
}
void TriggerFrictionEffectWithDefaultOption(double strength, bool isDefault) {
@ -2646,9 +2640,7 @@ if (currentLibrary == lib::winmm)
// this doesn't seem to really work...hmm...if i ALT+F4, then the program quits and haptic is still set.
// try setting GameId to HEAVY (-5 or -6..can't remember) and then force quit. Wheel will stay heavy :/.
if (haptic) {
SDL_HapticStopEffect(haptic, effects.effect_id);
SDL_HapticStopEffect(haptic, effects.effect_left_id);
SDL_HapticStopEffect(haptic, effects.effect_right_id);
SDL_HapticStopEffect(haptic, effects.effect_constant_id);
SDL_HapticStopEffect(haptic, effects.effect_friction_id);
SDL_HapticStopEffect(haptic, effects.effect_leftright_id);
SDL_HapticStopEffect(haptic, effects.effect_sine_id);