From 356bb5ef8882f96bf8f2cb9a9d64d4b83fb34efa Mon Sep 17 00:00:00 2001 From: Tom Boullay Date: Tue, 28 Apr 2026 14:17:21 +0200 Subject: [PATCH] organize data configs by domain --- src/components/3d/GrabbableObject.tsx | 2 +- src/components/3d/InteractableObject.tsx | 4 ++-- src/components/3d/TriggerObject.tsx | 2 +- src/components/ui/InteractPrompt.tsx | 2 +- src/data/{ => debug}/debugConfig.ts | 0 src/data/{ => debug}/testSceneConfig.ts | 0 src/data/{ => input}/keybindings.ts | 0 src/data/{ => interaction}/grabConfig.ts | 0 src/data/{ => interaction}/interactionConfig.ts | 0 src/data/{ => interaction}/triggerConfig.ts | 0 src/data/{ => player}/playerConfig.ts | 0 src/data/{ => world}/environmentConfig.ts | 0 src/data/{ => world}/lightingConfig.ts | 0 src/utils/debug/scene/DebugCameraControls.tsx | 4 ++-- src/utils/debug/scene/DebugHelpers.tsx | 2 +- src/world/Environment.tsx | 2 +- src/world/Lighting.tsx | 2 +- src/world/Map.tsx | 2 +- src/world/World.tsx | 2 +- src/world/debug/TestScene.tsx | 2 +- src/world/player/PlayerController.tsx | 4 ++-- 21 files changed, 15 insertions(+), 15 deletions(-) rename src/data/{ => debug}/debugConfig.ts (100%) rename src/data/{ => debug}/testSceneConfig.ts (100%) rename src/data/{ => input}/keybindings.ts (100%) rename src/data/{ => interaction}/grabConfig.ts (100%) rename src/data/{ => interaction}/interactionConfig.ts (100%) rename src/data/{ => interaction}/triggerConfig.ts (100%) rename src/data/{ => player}/playerConfig.ts (100%) rename src/data/{ => world}/environmentConfig.ts (100%) rename src/data/{ => world}/lightingConfig.ts (100%) diff --git a/src/components/3d/GrabbableObject.tsx b/src/components/3d/GrabbableObject.tsx index 0499484..7de388a 100644 --- a/src/components/3d/GrabbableObject.tsx +++ b/src/components/3d/GrabbableObject.tsx @@ -19,7 +19,7 @@ import { GRAB_THROW_BOOST_MAX, GRAB_THROW_BOOST_MIN, GRAB_THROW_BOOST_STEP, -} from "@/data/grabConfig"; +} from "@/data/interaction/grabConfig"; import { useDebugFolder } from "@/hooks/debug/useDebugFolder"; import type { ColliderShape, Vector3Tuple } from "@/types/3d"; diff --git a/src/components/3d/InteractableObject.tsx b/src/components/3d/InteractableObject.tsx index 4403579..bcd31ed 100644 --- a/src/components/3d/InteractableObject.tsx +++ b/src/components/3d/InteractableObject.tsx @@ -8,11 +8,11 @@ import { INTERACTION_DEBUG_SPHERE_COLOR, INTERACTION_DEBUG_SPHERE_OPACITY, INTERACTION_DEBUG_SPHERE_SEGMENTS, -} from "@/data/debugConfig"; +} from "@/data/debug/debugConfig"; import { Debug } from "@/utils/debug/Debug"; import { useDebugFolder } from "@/hooks/debug/useDebugFolder"; import { InteractionManager } from "@/stateManager/InteractionManager"; -import { INTERACTION_RADIUS } from "@/data/interactionConfig"; +import { INTERACTION_RADIUS } from "@/data/interaction/interactionConfig"; import type { Vector3Tuple } from "@/types/3d"; import type { InteractableHandle, InteractableKind } from "@/types/interaction"; diff --git a/src/components/3d/TriggerObject.tsx b/src/components/3d/TriggerObject.tsx index 937dfae..ab595a1 100644 --- a/src/components/3d/TriggerObject.tsx +++ b/src/components/3d/TriggerObject.tsx @@ -7,7 +7,7 @@ import { TRIGGER_DEFAULT_LABEL, TRIGGER_DEFAULT_SOUND_VOLUME, TRIGGER_DEFAULT_SPAWN_OFFSET, -} from "@/data/triggerConfig"; +} from "@/data/interaction/triggerConfig"; import { AudioManager } from "@/stateManager/AudioManager"; import type { ColliderShape, Vector3Tuple } from "@/types/3d"; diff --git a/src/components/ui/InteractPrompt.tsx b/src/components/ui/InteractPrompt.tsx index 4c86b21..70b09db 100644 --- a/src/components/ui/InteractPrompt.tsx +++ b/src/components/ui/InteractPrompt.tsx @@ -1,4 +1,4 @@ -import { INTERACT_KEY } from "@/data/keybindings"; +import { INTERACT_KEY } from "@/data/input/keybindings"; import { useCameraMode } from "@/hooks/debug/useCameraMode"; import { useInteraction } from "@/hooks/useInteraction"; diff --git a/src/data/debugConfig.ts b/src/data/debug/debugConfig.ts similarity index 100% rename from src/data/debugConfig.ts rename to src/data/debug/debugConfig.ts diff --git a/src/data/testSceneConfig.ts b/src/data/debug/testSceneConfig.ts similarity index 100% rename from src/data/testSceneConfig.ts rename to src/data/debug/testSceneConfig.ts diff --git a/src/data/keybindings.ts b/src/data/input/keybindings.ts similarity index 100% rename from src/data/keybindings.ts rename to src/data/input/keybindings.ts diff --git a/src/data/grabConfig.ts b/src/data/interaction/grabConfig.ts similarity index 100% rename from src/data/grabConfig.ts rename to src/data/interaction/grabConfig.ts diff --git a/src/data/interactionConfig.ts b/src/data/interaction/interactionConfig.ts similarity index 100% rename from src/data/interactionConfig.ts rename to src/data/interaction/interactionConfig.ts diff --git a/src/data/triggerConfig.ts b/src/data/interaction/triggerConfig.ts similarity index 100% rename from src/data/triggerConfig.ts rename to src/data/interaction/triggerConfig.ts diff --git a/src/data/playerConfig.ts b/src/data/player/playerConfig.ts similarity index 100% rename from src/data/playerConfig.ts rename to src/data/player/playerConfig.ts diff --git a/src/data/environmentConfig.ts b/src/data/world/environmentConfig.ts similarity index 100% rename from src/data/environmentConfig.ts rename to src/data/world/environmentConfig.ts diff --git a/src/data/lightingConfig.ts b/src/data/world/lightingConfig.ts similarity index 100% rename from src/data/lightingConfig.ts rename to src/data/world/lightingConfig.ts diff --git a/src/utils/debug/scene/DebugCameraControls.tsx b/src/utils/debug/scene/DebugCameraControls.tsx index 9fc5f99..0a0c9d8 100644 --- a/src/utils/debug/scene/DebugCameraControls.tsx +++ b/src/utils/debug/scene/DebugCameraControls.tsx @@ -3,11 +3,11 @@ import { DEBUG_CAMERA_DAMPING_FACTOR, DEBUG_CAMERA_MAX_DISTANCE, DEBUG_CAMERA_MIN_DISTANCE, -} from "@/data/debugConfig"; +} from "@/data/debug/debugConfig"; import { PLAYER_EYE_HEIGHT, PLAYER_SPAWN_POSITION_GAME, -} from "@/data/playerConfig"; +} from "@/data/player/playerConfig"; const DEBUG_CAMERA_TARGET = [ PLAYER_SPAWN_POSITION_GAME[0], diff --git a/src/utils/debug/scene/DebugHelpers.tsx b/src/utils/debug/scene/DebugHelpers.tsx index 738c46e..17b50ac 100644 --- a/src/utils/debug/scene/DebugHelpers.tsx +++ b/src/utils/debug/scene/DebugHelpers.tsx @@ -5,7 +5,7 @@ import { DEBUG_GRID_SECONDARY_COLOR, DEBUG_GRID_SIZE, DEBUG_GRID_Y, -} from "@/data/debugConfig"; +} from "@/data/debug/debugConfig"; import { Debug } from "@/utils/debug/Debug"; export function DebugHelpers(): React.JSX.Element | null { diff --git a/src/world/Environment.tsx b/src/world/Environment.tsx index 72c12b6..b81a4ef 100644 --- a/src/world/Environment.tsx +++ b/src/world/Environment.tsx @@ -2,7 +2,7 @@ import { Environment as DreiEnvironment } from "@react-three/drei"; import { GAME_SCENE_SKYBOX_PATH, PHYSICS_SCENE_BACKGROUND_COLOR, -} from "@/data/environmentConfig"; +} from "@/data/world/environmentConfig"; import { useSceneMode } from "@/hooks/debug/useSceneMode"; export function Environment(): React.JSX.Element { diff --git a/src/world/Lighting.tsx b/src/world/Lighting.tsx index 37be86f..a7905b3 100644 --- a/src/world/Lighting.tsx +++ b/src/world/Lighting.tsx @@ -20,7 +20,7 @@ import { SUN_Z_MAX, SUN_Z_MIN, SUN_Z_STEP, -} from "@/data/lightingConfig"; +} from "@/data/world/lightingConfig"; import { useDebugFolder } from "@/hooks/debug/useDebugFolder"; type LightingState = { diff --git a/src/world/Map.tsx b/src/world/Map.tsx index 17a7d8f..532a780 100644 --- a/src/world/Map.tsx +++ b/src/world/Map.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef } from "react"; import { useThree } from "@react-three/fiber"; import { useGLTF } from "@react-three/drei"; import * as THREE from "three"; -import { MAP_DEBUG_BOX_HELPER_COLOR } from "@/data/debugConfig"; +import { MAP_DEBUG_BOX_HELPER_COLOR } from "@/data/debug/debugConfig"; import { useOctreeGraphNode } from "@/hooks/useOctreeGraphNode"; import type { OctreeReadyHandler } from "@/types/3d"; import { Debug } from "@/utils/debug/Debug"; diff --git a/src/world/World.tsx b/src/world/World.tsx index 3798050..c3c9dda 100644 --- a/src/world/World.tsx +++ b/src/world/World.tsx @@ -3,7 +3,7 @@ import type { Octree } from "three/addons/math/Octree.js"; import { PLAYER_SPAWN_POSITION_GAME, PLAYER_SPAWN_POSITION_PHYSICS, -} from "@/data/playerConfig"; +} from "@/data/player/playerConfig"; import { useCameraMode } from "@/hooks/debug/useCameraMode"; import { useSceneMode } from "@/hooks/debug/useSceneMode"; import { DebugCameraControls } from "@/utils/debug/scene/DebugCameraControls"; diff --git a/src/world/debug/TestScene.tsx b/src/world/debug/TestScene.tsx index 1bf51cf..0c41182 100644 --- a/src/world/debug/TestScene.tsx +++ b/src/world/debug/TestScene.tsx @@ -19,7 +19,7 @@ import { TEST_SCENE_TRIGGER_ROUGHNESS, TEST_SCENE_TRIGGER_SEGMENTS, TEST_SCENE_TRIGGER_SOUND_PATH, -} from "@/data/testSceneConfig"; +} from "@/data/debug/testSceneConfig"; import { useOctreeGraphNode } from "@/hooks/useOctreeGraphNode"; import type { OctreeReadyHandler } from "@/types/3d"; diff --git a/src/world/player/PlayerController.tsx b/src/world/player/PlayerController.tsx index 341c6d9..0158143 100644 --- a/src/world/player/PlayerController.tsx +++ b/src/world/player/PlayerController.tsx @@ -11,7 +11,7 @@ import { MOVE_LEFT_KEY, MOVE_RIGHT_KEY, PRIMARY_INTERACT_MOUSE_BUTTON, -} from "@/data/keybindings"; +} from "@/data/input/keybindings"; import { PLAYER_ACCELERATION_MULTIPLIER, PLAYER_AIR_CONTROL_FACTOR, @@ -22,7 +22,7 @@ import { PLAYER_MAX_DELTA, PLAYER_WALK_SPEED, PLAYER_XZ_DAMPING_FACTOR, -} from "@/data/playerConfig"; +} from "@/data/player/playerConfig"; import { InteractionManager } from "@/stateManager/InteractionManager"; import type { Vector3Tuple } from "@/types/3d";