From 780fa65349fd472a51b28cced3d1558e8f9ce886 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Mon, 18 Nov 2024 05:24:41 +0100
Subject: [PATCH] re-implement J/K/U/L/I/O key bindings for mouseless gaming

---
 README.md               |  1 +
 src/camera.rs           | 22 ++++++++++++++++++++++
 src/data/keybindings.in |  1 +
 3 files changed, 24 insertions(+)

diff --git a/README.md b/README.md
index cd42c58..0cf892d 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ Press **ESC** to view these any time from the in-game menu.
 - **T**: Cruise control
 - **R**: Rotate (hold + move mouse)
 - **AWSD/Shift/Ctrl**: Move
+- **J/K/U/L/I/O**: Rotate
 - **F11**: Fullscreen
 - **Tab**: Toggle Augmented Reality
 - **Left click**: Target objects (in AR only)
diff --git a/src/camera.rs b/src/camera.rs
index 8b90167..6c65a05 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -444,6 +444,7 @@ fn manage_player_actor(
 
 pub fn apply_input_to_player(
     mut commands: Commands,
+    time: Res<Time>,
     settings: Res<var::Settings>,
     mut q_player: Query<
         (
@@ -465,6 +466,7 @@ pub fn apply_input_to_player(
         return;
     }
     let (entity, mut accel, rot_change) = player.unwrap();
+    let dt = time.delta_seconds();
 
     let (win_res_x, win_res_y): (f32, f32);
     if let Ok(window) = &q_windows.get_single() {
@@ -478,6 +480,26 @@ pub fn apply_input_to_player(
     // Determine rotation delta
     let mut pitch_yaw_rot = Vec3::ZERO;
     let mut mouse_delta = Vec2::ZERO;
+    let mouseless_sensitivity = 1.0 * dt;
+    let mouseless_rotation_sensitivity = 4.0 * dt;
+    if key_input.pressed(settings.key_mouseup) {
+        pitch_yaw_rot[0] -= mouseless_sensitivity;
+    }
+    if key_input.pressed(settings.key_mousedown) {
+        pitch_yaw_rot[0] += mouseless_sensitivity;
+    }
+    if key_input.pressed(settings.key_mouseleft) {
+        pitch_yaw_rot[1] += mouseless_sensitivity;
+    }
+    if key_input.pressed(settings.key_mouseright) {
+        pitch_yaw_rot[1] -= mouseless_sensitivity;
+    }
+    if key_input.pressed(settings.key_rotateleft) {
+        pitch_yaw_rot[2] -= mouseless_rotation_sensitivity;
+    }
+    if key_input.pressed(settings.key_rotateright) {
+        pitch_yaw_rot[2] += mouseless_rotation_sensitivity;
+    }
     for mouse_event in mouse_events.read() {
         mouse_delta += mouse_event.delta;
     }
diff --git a/src/data/keybindings.in b/src/data/keybindings.in
index 9136991..dc5b9d0 100644
--- a/src/data/keybindings.in
+++ b/src/data/keybindings.in
@@ -7,6 +7,7 @@ C: Camera
 T: Cruise control
 R: Rotate (hold + move mouse)
 AWSD/Shift/Ctrl: Move
+J/K/U/L/I/O: Rotate
 F11: Fullscreen
 Tab: Toggle Augmented Reality
 Left click: Target objects (in AR only)