update

src/world/player/PlayerController.tsx

@@ -11,7 +11,7 @@ import {
   MOVE_LEFT_KEY,
   MOVE_RIGHT_KEY,
   PRIMARY_INTERACT_MOUSE_BUTTON,
-} from "@/data/input/keybindings";
+} from "@/data/keybindings";
 import {
   PLAYER_ACCELERATION_MULTIPLIER,
   PLAYER_AIR_CONTROL_FACTOR,
@@ -22,9 +22,9 @@ import {
   PLAYER_MAX_DELTA,
   PLAYER_WALK_SPEED,
   PLAYER_XZ_DAMPING_FACTOR,
-} from "@/data/player/playerConfig";
-import { InteractionManager } from "@/managers/InteractionManager";
-import type { Vector3Tuple } from "@/types/three";
+} from "@/data/playerConfig";
+import { InteractionManager } from "@/stateManager/InteractionManager";
+import type { Vector3Tuple } from "@/types/3d";
 
 type Keys = {
   forward: boolean;
@@ -54,25 +54,6 @@ const _up = new THREE.Vector3(0, 1, 0);
 const _translateVec = new THREE.Vector3();
 const _collisionCorrection = new THREE.Vector3();
 
-function setMovementKey(keys: Keys, key: string, pressed: boolean): boolean {
-  switch (key.toLowerCase()) {
-    case MOVE_FORWARD_KEY:
-      keys.forward = pressed;
-      return true;
-    case MOVE_BACKWARD_KEY:
-      keys.backward = pressed;
-      return true;
-    case MOVE_LEFT_KEY:
-      keys.left = pressed;
-      return true;
-    case MOVE_RIGHT_KEY:
-      keys.right = pressed;
-      return true;
-    default:
-      return false;
-  }
-}
-
 export function PlayerController({
   octree,
   spawnPosition,
@@ -108,29 +89,51 @@ export function PlayerController({
     const interaction = InteractionManager.getInstance();
 
     const handleKeyDown = (event: KeyboardEvent): void => {
-      if (setMovementKey(keys.current, event.key, true)) {
-        event.preventDefault();
-        return;
-      }
-
-      if (event.key === JUMP_KEY) {
-        wantsJump.current = true;
-        event.preventDefault();
-        return;
-      }
-
-      if (event.key.toLowerCase() === INTERACT_KEY) {
-        if (interaction.getState().focused?.kind === "trigger") {
-          interaction.pressInteract();
-        }
-        event.preventDefault();
+      switch (event.key.toLowerCase()) {
+        case MOVE_FORWARD_KEY:
+          keys.current.forward = true;
+          break;
+        case MOVE_BACKWARD_KEY:
+          keys.current.backward = true;
+          break;
+        case MOVE_LEFT_KEY:
+          keys.current.left = true;
+          break;
+        case MOVE_RIGHT_KEY:
+          keys.current.right = true;
+          break;
+        case JUMP_KEY:
+          wantsJump.current = true;
+          break;
+        case INTERACT_KEY:
+          if (interaction.getState().focused?.kind === "trigger") {
+            interaction.pressInteract();
+          }
+          break;
+        default:
+          return;
       }
+      event.preventDefault();
     };
 
     const handleKeyUp = (event: KeyboardEvent): void => {
-      if (setMovementKey(keys.current, event.key, false)) {
-        event.preventDefault();
+      switch (event.key.toLowerCase()) {
+        case MOVE_FORWARD_KEY:
+          keys.current.forward = false;
+          break;
+        case MOVE_BACKWARD_KEY:
+          keys.current.backward = false;
+          break;
+        case MOVE_LEFT_KEY:
+          keys.current.left = false;
+          break;
+        case MOVE_RIGHT_KEY:
+          keys.current.right = false;
+          break;
+        default:
+          return;
       }
+      event.preventDefault();
     };
 
     const handleMouseDown = (event: MouseEvent): void => {