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

vertical/horizontal look sensitivity

Browse Source
This commit is contained in:
isXander
2023-02-01 15:49:12 +00:00
parent 4b085c5cce
commit e3178680f2
4 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java
View File

@ -5,13 +5,15 @@ import dev.isxander.controlify.InputMode;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.event.ControlifyEvents;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.PauseScreen;
import net.minecraft.client.player.Input;
import net.minecraft.client.player.KeyboardInput;
public class InGameInputHandler {
private final Controller controller;
private final Minecraft minecraft;
private final Input controllerInput, keyboardInput;
private double accumulatedDX, accumulatedDY;
private double deltaTime;
@ -19,11 +21,14 @@ public class InGameInputHandler {
this.controller = controller;
this.minecraft = Minecraft.getInstance();
this.controllerInput = new ControllerPlayerMovement(controller);
this.keyboardInput = new KeyboardInput(minecraft.options);
ControlifyEvents.INPUT_MODE_CHANGED.register(mode -> {
if (minecraft.player != null) {
minecraft.player.input = mode == InputMode.CONTROLLER
? new ControllerPlayerMovement(controller)
: new KeyboardInput(minecraft.options);
? this.controllerInput
: this.keyboardInput;
}
});
}
@ -55,15 +60,28 @@ public class InGameInputHandler {
var delta = time - deltaTime;
deltaTime = time;
var sensitivity = controller.config().lookSensitivity * 8f + 2f;
var sensCubed = sensitivity * sensitivity * sensitivity;
var hsensitivity = controller.config().horizontalLookSensitivity * 8.0 + 2.0;
var hsensCubed = hsensitivity * hsensitivity * hsensitivity;
var vsensitivity = controller.config().verticalLookSensitivity * 8.0 + 2.0;
var vsensCubed = vsensitivity * vsensitivity * vsensitivity;
var dx = accumulatedDX * delta;
var dy = accumulatedDY * delta;
accumulatedDX -= dx * 20; // 20 is how quickly the camera will slow down
accumulatedDY -= dy * 20;
// drag
if (accumulatedDX > 0) {
accumulatedDX -= Math.min(dx * 20, accumulatedDX);
} else if (accumulatedDX < 0) {
accumulatedDX -= Math.max(dx * 20, accumulatedDX);
}
if (accumulatedDY > 0) {
accumulatedDY -= Math.min(dy * 20, accumulatedDY);
} else if (accumulatedDY < 0) {
accumulatedDY -= Math.max(dy * 20, accumulatedDY);
}
if (minecraft.player != null)
minecraft.player.turn(dx * sensCubed, dy * sensCubed);
minecraft.player.turn(dx * hsensCubed, dy * vsensCubed);
}
}