1
0
mirror of synced 2025-02-22 04:49:40 +01:00

Button Rumble Changes

This commit is contained in:
Aaron M 2021-05-23 12:01:53 +12:00
parent 12ddba5f65
commit 13e17b1f8f
2 changed files with 32 additions and 46 deletions

View File

@ -65,6 +65,7 @@ void AliensExtermination::FFBLoop(EffectConstants* constants, Helpers* helpers,
ExitProcess(0); ExitProcess(0);
} }
} }
if (!init) if (!init)
{ {
for (int i = 0; i < SDL_NumJoysticks(); i++) for (int i = 0; i < SDL_NumJoysticks(); i++)
@ -109,6 +110,7 @@ void AliensExtermination::FFBLoop(EffectConstants* constants, Helpers* helpers,
SDL_HapticRumbleInit(ControllerHaptic2); SDL_HapticRumbleInit(ControllerHaptic2);
} }
} }
init = true;
} }
static UINT8 oldAmmo = 0; static UINT8 oldAmmo = 0;

View File

@ -102,7 +102,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT
while (SDL_WaitEvent(&e) != 0) while (SDL_WaitEvent(&e) != 0)
{ {
if (ShowButtonNumbersForSetup == 1) if (ShowButtonNumbersForSetup)
{ {
if (e.type == SDL_JOYBUTTONDOWN) if (e.type == SDL_JOYBUTTONDOWN)
{ {
@ -122,73 +122,61 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT
{ {
if (e.jaxis.which == joystick_index1) if (e.jaxis.which == joystick_index1)
{ {
if ((BothRumbleMotor == 1) & (LeftRumbleMotor == 0) & (RightRumbleMotor == 0)) if (BothRumbleMotor && !LeftRumbleMotor && !RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble) if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->Rumble(percentForce, percentForce, percentLength);
triggers->Rumble(percentForce, percentForce, percentLength);
}
} }
} }
if ((BothRumbleMotor == 0) & (LeftRumbleMotor == 1) & (RightRumbleMotor == 0)) if (!BothRumbleMotor && LeftRumbleMotor && !RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble) if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength);
triggers->Rumble(0, percentForce, percentLength); triggers->Rumble(0, percentForce, percentLength);
}
} }
} }
if ((BothRumbleMotor == 0) & (LeftRumbleMotor == 0) & (RightRumbleMotor == 1)) if (!BothRumbleMotor && !LeftRumbleMotor && RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble) if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->Rumble(percentForce, 0, percentLength);
triggers->Rumble(percentForce, 0, percentLength);
}
} }
} }
} }
if (e.jaxis.which == joystick_index2) if (e.jaxis.which == joystick_index2)
{ {
if ((BothRumbleMotor == 1) & (LeftRumbleMotor == 0) & (RightRumbleMotor == 0)) if (BothRumbleMotor && !LeftRumbleMotor && !RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble) if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->RumbleDevice2(percentForce, percentForce, percentLength);
triggers->RumbleDevice2(percentForce, percentForce, percentLength);
}
} }
} }
if ((BothRumbleMotor == 0) & (LeftRumbleMotor == 1) & (RightRumbleMotor == 0)) if (!BothRumbleMotor && LeftRumbleMotor && !RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble) if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->RumbleDevice2(0, percentForce, percentLength);
triggers->RumbleDevice2(0, percentForce, percentLength);
}
} }
} }
if ((BothRumbleMotor == 0) & (LeftRumbleMotor == 0) & (RightRumbleMotor == 1)) if (!BothRumbleMotor && !LeftRumbleMotor && RightRumbleMotor)
{ {
if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble) if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble)
{ {
{ double percentForce = RumbleStrength / 100.0;
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->RumbleDevice2(percentForce, 0, percentLength);
triggers->RumbleDevice2(percentForce, 0, percentLength);
}
} }
} }
} }
@ -199,22 +187,18 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT
{ {
if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble) if (e.jbutton.button == Button1Rumble || e.jbutton.button == Button2Rumble || e.jbutton.button == Button3Rumble || e.jbutton.button == Button4Rumble || e.jbutton.button == Button5Rumble || e.jbutton.button == Button6Rumble || e.jbutton.button == Button7Rumble || e.jbutton.button == Button8Rumble || e.jbutton.button == Button9Rumble || e.jbutton.button == Button10Rumble)
{ {
{ double percentForce = ((RumbleStrength) / 100.0);
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->Rumble(0, 0, percentLength);
triggers->Rumble(0, 0, percentLength);
}
} }
} }
if (e.jaxis.which == joystick_index2) if (e.jaxis.which == joystick_index2)
{ {
if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble) if (e.jbutton.button == Button1Device2Rumble || e.jbutton.button == Button2Device2Rumble || e.jbutton.button == Button3Device2Rumble || e.jbutton.button == Button4Device2Rumble || e.jbutton.button == Button5Device2Rumble || e.jbutton.button == Button6Device2Rumble || e.jbutton.button == Button7Device2Rumble || e.jbutton.button == Button8Device2Rumble || e.jbutton.button == Button9Device2Rumble || e.jbutton.button == Button10Device2Rumble)
{ {
{ double percentForce = ((RumbleStrength) / 100.0);
double percentForce = ((RumbleStrength) / 100.0); double percentLength = RumbleLength * 1.0;
double percentLength = (RumbleLength); triggers->RumbleDevice2(0, 0, percentLength);
triggers->RumbleDevice2(0, 0, percentLength);
}
} }
} }
} }