djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Make rumble effects merge together rather than pausing one another when playing in unison (plays the stronger magnitude for both motors)

Browse Source
This commit is contained in:
isXander
2023-08-10 23:59:43 +01:00
parent 421b8abfc2
commit 58fe5c7043
9 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/dev/isxander/controlify/controller/joystick/CompoundJoystickController.java
View File

@ -11,6 +11,7 @@ import dev.isxander.controlify.controller.joystick.mapping.RPJoystickMapping;
import dev.isxander.controlify.rumble.RumbleCapable;
import dev.isxander.controlify.rumble.RumbleManager;
import dev.isxander.controlify.rumble.RumbleSource;
import dev.isxander.controlify.rumble.RumbleState;
import dev.isxander.controlify.utils.Log;
import org.lwjgl.glfw.GLFW;
@ -143,7 +144,7 @@ public class CompoundJoystickController implements JoystickController<JoystickCo
}
@Override
public boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source) {
public boolean setRumble(float strongMagnitude, float weakMagnitude) {
return false;
}
@ -152,6 +153,11 @@ public class CompoundJoystickController implements JoystickController<JoystickCo
return false;
}
@Override
public RumbleState applyRumbleSourceStrength(RumbleState state, RumbleSource source) {
return state;
}
@Override
public RumbleManager rumbleManager() {
return this.rumbleManager;

9
src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java
View File

@ -91,16 +91,9 @@ public class SingleJoystickController extends AbstractController<JoystickState,
}
@Override
public boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source) {
public boolean setRumble(float strongMagnitude, float weakMagnitude) {
if (!supportsRumble()) return false;
var strengthMod = config().getRumbleStrength(source);
if (source != RumbleSource.MASTER)
strengthMod *= config().getRumbleStrength(RumbleSource.MASTER);
strongMagnitude *= strengthMod;
weakMagnitude *= strengthMod;
// the duration doesn't matter because we are not updating the joystick state,
// so there is never any SDL check to stop the rumble after the desired time.
if (!SDL.SDL_JoystickRumbleTriggers(ptrJoystick, (int)(strongMagnitude * 65535.0F), (int)(weakMagnitude * 65535.0F), 1)) {