From bf5c87f86d834b634b267296ae1eb5f325e87d1a Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Sat, 11 Apr 2026 12:29:55 +0200
Subject: [PATCH] Simplify keyboard binding type and add camera look bindings

---
 src/entities/entity-instances.ts | 53 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/entities/entity-instances.ts b/src/entities/entity-instances.ts
index 59555c05..1a7d0846 100644
--- a/src/entities/entity-instances.ts
+++ b/src/entities/entity-instances.ts
@@ -53,22 +53,7 @@ export const PLAYER_START_MOVEMENT_ACTIONS = [
 ] as const;
 export type PlayerStartMovementAction =
   (typeof PLAYER_START_MOVEMENT_ACTIONS)[number];
-export const PLAYER_START_KEYBOARD_BINDING_CODES = [
-  "KeyW",
-  "KeyA",
-  "KeyS",
-  "KeyD",
-  "ArrowUp",
-  "ArrowLeft",
-  "ArrowDown",
-  "ArrowRight",
-  "KeyI",
-  "KeyJ",
-  "KeyK",
-  "KeyL"
-] as const;
-export type PlayerStartKeyboardBindingCode =
-  (typeof PLAYER_START_KEYBOARD_BINDING_CODES)[number];
+export type PlayerStartKeyboardBindingCode = string;
 export const PLAYER_START_GAMEPAD_BINDINGS = [
   "leftStickUp",
   "leftStickDown",
@@ -81,6 +66,11 @@ export const PLAYER_START_GAMEPAD_BINDINGS = [
 ] as const;
 export type PlayerStartGamepadBinding =
   (typeof PLAYER_START_GAMEPAD_BINDINGS)[number];
+export const PLAYER_START_GAMEPAD_CAMERA_LOOK_BINDINGS = [
+  "rightStick"
+] as const;
+export type PlayerStartGamepadCameraLookBinding =
+  (typeof PLAYER_START_GAMEPAD_CAMERA_LOOK_BINDINGS)[number];
 
 export interface PlayerStartKeyboardBindings {
   moveForward: PlayerStartKeyboardBindingCode;
@@ -94,6 +84,7 @@ export interface PlayerStartGamepadBindings {
   moveBackward: PlayerStartGamepadBinding;
   moveLeft: PlayerStartGamepadBinding;
   moveRight: PlayerStartGamepadBinding;
+  cameraLook: PlayerStartGamepadCameraLookBinding;
 }
 
 export interface PlayerStartInputBindings {
@@ -228,7 +219,8 @@ export const DEFAULT_PLAYER_START_GAMEPAD_BINDINGS: PlayerStartGamepadBindings =
     moveForward: "leftStickUp",
     moveBackward: "leftStickDown",
     moveLeft: "leftStickLeft",
-    moveRight: "leftStickRight"
+    moveRight: "leftStickRight",
+    cameraLook: "rightStick"
   };
 export const DEFAULT_SCENE_ENTRY_YAW_DEGREES = 0;
 export const DEFAULT_PLAYER_START_COLLIDER_MODE: PlayerStartColliderMode = "capsule";
@@ -328,9 +320,7 @@ export function isPlayerStartNavigationMode(
 export function isPlayerStartKeyboardBindingCode(
   value: string
 ): value is PlayerStartKeyboardBindingCode {
-  return PLAYER_START_KEYBOARD_BINDING_CODES.includes(
-    value as PlayerStartKeyboardBindingCode
-  );
+  return value.trim().length > 0;
 }
 
 export function isPlayerStartGamepadBinding(
@@ -341,6 +331,14 @@ export function isPlayerStartGamepadBinding(
   );
 }
 
+export function isPlayerStartGamepadCameraLookBinding(
+  value: string
+): value is PlayerStartGamepadCameraLookBinding {
+  return PLAYER_START_GAMEPAD_CAMERA_LOOK_BINDINGS.includes(
+    value as PlayerStartGamepadCameraLookBinding
+  );
+}
+
 export function clonePlayerStartColliderSettings(settings: PlayerStartColliderSettings): PlayerStartColliderSettings {
   return {
     mode: settings.mode,
@@ -365,7 +363,8 @@ export function clonePlayerStartInputBindings(
       moveForward: bindings.gamepad.moveForward,
       moveBackward: bindings.gamepad.moveBackward,
       moveLeft: bindings.gamepad.moveLeft,
-      moveRight: bindings.gamepad.moveRight
+      moveRight: bindings.gamepad.moveRight,
+      cameraLook: bindings.gamepad.cameraLook
     }
   };
 }
@@ -399,7 +398,10 @@ export function createPlayerStartInputBindings(
       DEFAULT_PLAYER_START_GAMEPAD_BINDINGS.moveLeft,
     moveRight:
       overrides.gamepad?.moveRight ??
-      DEFAULT_PLAYER_START_GAMEPAD_BINDINGS.moveRight
+      DEFAULT_PLAYER_START_GAMEPAD_BINDINGS.moveRight,
+    cameraLook:
+      overrides.gamepad?.cameraLook ??
+      DEFAULT_PLAYER_START_GAMEPAD_BINDINGS.cameraLook
   };
 
   if (!isPlayerStartKeyboardBindingCode(keyboard.moveForward)) {
@@ -434,6 +436,10 @@ export function createPlayerStartInputBindings(
     throw new Error("Player Start move-right gamepad binding must be supported.");
   }
 
+  if (!isPlayerStartGamepadCameraLookBinding(gamepad.cameraLook)) {
+    throw new Error("Player Start camera-look gamepad binding must be supported.");
+  }
+
   return {
     keyboard,
     gamepad
@@ -452,7 +458,8 @@ export function arePlayerStartInputBindingsEqual(
     left.gamepad.moveForward === right.gamepad.moveForward &&
     left.gamepad.moveBackward === right.gamepad.moveBackward &&
     left.gamepad.moveLeft === right.gamepad.moveLeft &&
-    left.gamepad.moveRight === right.gamepad.moveRight
+    left.gamepad.moveRight === right.gamepad.moveRight &&
+    left.gamepad.cameraLook === right.gamepad.cameraLook
   );
 }