Organized some source files.

afritz1 · Nov 21, 2024 · 6bdfd57 · 6bdfd57
1 parent 2ba8f54
commit 6bdfd57
Show file tree

Hide file tree

Showing 49 changed files with 80 additions and 79 deletions.
diff --git a/OpenTESArena/CMakeLists.txt b/OpenTESArena/CMakeLists.txt
@@ -133,14 +133,6 @@ SET(TES_COLLISION
 
 SET(TES_ENTITIES
     "${SRC_ROOT}/Entities/ArenaCitizenUtils.h"
-    "${SRC_ROOT}/Entities/CharacterClassDefinition.cpp"
-    "${SRC_ROOT}/Entities/CharacterClassDefinition.h"
-    "${SRC_ROOT}/Entities/CharacterClassLibrary.cpp"
-    "${SRC_ROOT}/Entities/CharacterClassLibrary.h"
-    "${SRC_ROOT}/Entities/CharacterRaceDefinition.cpp"
-    "${SRC_ROOT}/Entities/CharacterRaceDefinition.h"
-    "${SRC_ROOT}/Entities/CharacterRaceLibrary.cpp"
-    "${SRC_ROOT}/Entities/CharacterRaceLibrary.h"
     "${SRC_ROOT}/Entities/CitizenUtils.cpp"
     "${SRC_ROOT}/Entities/CitizenUtils.h"
     "${SRC_ROOT}/Entities/EntityAnimationDefinition.cpp"
@@ -167,32 +159,15 @@ SET(TES_ENTITIES
     "${SRC_ROOT}/Entities/EntityVisibilityChunk.cpp"
     "${SRC_ROOT}/Entities/EntityVisibilityChunk.h"
     "${SRC_ROOT}/Entities/EntityVisibilityChunkManager.cpp"
-    "${SRC_ROOT}/Entities/EntityVisibilityChunkManager.h"
-    "${SRC_ROOT}/Entities/Player.cpp"
-    "${SRC_ROOT}/Entities/Player.h"
-    "${SRC_ROOT}/Entities/WeaponAnimation.cpp"
-    "${SRC_ROOT}/Entities/WeaponAnimation.h")
+    "${SRC_ROOT}/Entities/EntityVisibilityChunkManager.h")
 
 SET(TES_GAME
-    "${SRC_ROOT}/Game/CharacterClassGeneration.cpp"
-    "${SRC_ROOT}/Game/CharacterClassGeneration.h"
-    "${SRC_ROOT}/Game/CharacterCreationState.cpp"
-    "${SRC_ROOT}/Game/CharacterCreationState.h"
-    "${SRC_ROOT}/Game/CharacterQuestion.cpp"
-    "${SRC_ROOT}/Game/CharacterQuestion.h"
     "${SRC_ROOT}/Game/Game.cpp"
     "${SRC_ROOT}/Game/Game.h"
     "${SRC_ROOT}/Game/GameState.cpp"
     "${SRC_ROOT}/Game/GameState.h"
     "${SRC_ROOT}/Game/Options.cpp"
-    "${SRC_ROOT}/Game/Options.h"
-    "${SRC_ROOT}/Game/PlayerInterface.h")
-
-SET(TES_GAME_LOGIC
-    "${SRC_ROOT}/GameLogic/MapLogicController.cpp"
-    "${SRC_ROOT}/GameLogic/MapLogicController.h"
-    "${SRC_ROOT}/GameLogic/PlayerLogicController.cpp"
-    "${SRC_ROOT}/GameLogic/PlayerLogicController.h")
+    "${SRC_ROOT}/Game/Options.h")
 
 SET(TES_INPUT
     "${SRC_ROOT}/Input/ApplicationEvents.h"
@@ -398,6 +373,21 @@ SET(TES_MATH
     "${SRC_ROOT}/Math/Vector4.cpp"
     "${SRC_ROOT}/Math/Vector4.h")
 
+SET(TES_PLAYER
+    "${SRC_ROOT}/Player/CharacterClassGeneration.cpp"
+    "${SRC_ROOT}/Player/CharacterClassGeneration.h"
+    "${SRC_ROOT}/Player/CharacterCreationState.cpp"
+    "${SRC_ROOT}/Player/CharacterCreationState.h"
+    "${SRC_ROOT}/Player/CharacterQuestion.cpp"
+    "${SRC_ROOT}/Player/CharacterQuestion.h"
+    "${SRC_ROOT}/Player/Player.cpp"
+    "${SRC_ROOT}/Player/Player.h"
+    "${SRC_ROOT}/Player/PlayerInterface.h"
+    "${SRC_ROOT}/Player/PlayerLogicController.cpp"
+    "${SRC_ROOT}/Player/PlayerLogicController.h"
+    "${SRC_ROOT}/Player/WeaponAnimation.cpp"
+    "${SRC_ROOT}/Player/WeaponAnimation.h")
+
 SET(TES_RENDERING
     "${SRC_ROOT}/Rendering/ArenaRenderUtils.cpp"
     "${SRC_ROOT}/Rendering/ArenaRenderUtils.h"
@@ -483,6 +473,14 @@ SET(TES_SKY
     "${SRC_ROOT}/Sky/SkyVisibilityManager.h")
 
 SET(TES_STATS
+    "${SRC_ROOT}/Stats/CharacterClassDefinition.cpp"
+    "${SRC_ROOT}/Stats/CharacterClassDefinition.h"
+    "${SRC_ROOT}/Stats/CharacterClassLibrary.cpp"
+    "${SRC_ROOT}/Stats/CharacterClassLibrary.h"
+    "${SRC_ROOT}/Stats/CharacterRaceDefinition.cpp"
+    "${SRC_ROOT}/Stats/CharacterRaceDefinition.h"
+    "${SRC_ROOT}/Stats/CharacterRaceLibrary.cpp"
+    "${SRC_ROOT}/Stats/CharacterRaceLibrary.h"
     "${SRC_ROOT}/Stats/PrimaryAttribute.cpp"
     "${SRC_ROOT}/Stats/PrimaryAttribute.h")
 
@@ -631,6 +629,8 @@ SET(TES_WORLD
     "${SRC_ROOT}/World/MapDefinition.h"
     "${SRC_ROOT}/World/MapGeneration.cpp"
     "${SRC_ROOT}/World/MapGeneration.h"
+    "${SRC_ROOT}/World/MapLogicController.cpp"
+    "${SRC_ROOT}/World/MapLogicController.h"
     "${SRC_ROOT}/World/MapType.h"
     "${SRC_ROOT}/World/MeshUtils.cpp"
     "${SRC_ROOT}/World/MeshUtils.h"
@@ -665,11 +665,11 @@ SET(TES_SOURCES
     ${TES_COLLISION}
     ${TES_ENTITIES}
     ${TES_GAME}
-    ${TES_GAME_LOGIC}
     ${TES_INPUT}
     ${TES_INTERFACE}
     ${TES_ITEMS}
     ${TES_MATH}
+    ${TES_PLAYER}
     ${TES_RENDERING}
     ${TES_SKY}
     ${TES_STATS}

diff --git a/OpenTESArena/src/Assets/ArenaAnimUtils.cpp b/OpenTESArena/src/Assets/ArenaAnimUtils.cpp
@@ -7,8 +7,8 @@
 #include "BinaryAssetLibrary.h"
 #include "MIFUtils.h"
 #include "../Assets/TextureManager.h"
-#include "../Entities/CharacterClassDefinition.h"
-#include "../Entities/CharacterClassLibrary.h"
+#include "../Stats/CharacterClassDefinition.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../World/MapType.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Assets/BinaryAssetLibrary.h b/OpenTESArena/src/Assets/BinaryAssetLibrary.h
@@ -8,7 +8,7 @@
 #include "CityDataFile.h"
 #include "ExeData.h"
 #include "WorldMapMask.h"
-#include "../Game/CharacterClassGeneration.h"
+#include "../Player/CharacterClassGeneration.h"
 
 #include "components/utilities/BufferView.h"
 #include "components/utilities/Singleton.h"

diff --git a/OpenTESArena/src/Assets/TextAssetLibrary.h b/OpenTESArena/src/Assets/TextAssetLibrary.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "../Game/CharacterQuestion.h"
+#include "../Player/CharacterQuestion.h"
 
 #include "components/utilities/BufferView.h"
 #include "components/utilities/Singleton.h"

diff --git a/OpenTESArena/src/Entities/EntityChunkManager.cpp b/OpenTESArena/src/Entities/EntityChunkManager.cpp
@@ -6,7 +6,6 @@
 #include "EntityChunkManager.h"
 #include "EntityDefinitionLibrary.h"
 #include "EntityObservedResult.h"
-#include "Player.h"
 #include "../Assets/ArenaAnimUtils.h"
 #include "../Assets/BinaryAssetLibrary.h"
 #include "../Assets/MIFUtils.h"
@@ -16,6 +15,7 @@
 #include "../Math/Constants.h"
 #include "../Math/RandomUtils.h"
 #include "../Math/Random.h"
+#include "../Player/Player.h"
 #include "../Rendering/Renderer.h"
 #include "../Voxels/VoxelChunk.h"
 #include "../Voxels/VoxelChunkManager.h"

diff --git a/OpenTESArena/src/Entities/EntityUtils.cpp b/OpenTESArena/src/Entities/EntityUtils.cpp
@@ -1,12 +1,12 @@
 #include <algorithm>
 
-#include "CharacterClassDefinition.h"
-#include "CharacterClassLibrary.h"
 #include "EntityDefinition.h"
 #include "EntityDefinitionLibrary.h"
 #include "EntityUtils.h"
 #include "../Math/Random.h"
 #include "../Rendering/ArenaRenderUtils.h"
+#include "../Stats/CharacterClassDefinition.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../World/ChunkUtils.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Game/Game.cpp b/OpenTESArena/src/Game/Game.cpp
@@ -15,7 +15,6 @@
 
 #include "Game.h"
 #include "Options.h"
-#include "PlayerInterface.h"
 #include "../Assets/ArenaLevelLibrary.h"
 #include "../Assets/BinaryAssetLibrary.h"
 #include "../Assets/CityDataFile.h"
@@ -27,10 +26,7 @@
 #include "../Collision/PhysicsBodyActivationListener.h"
 #include "../Collision/PhysicsContactListener.h"
 #include "../Collision/PhysicsLayer.h"
-#include "../Entities/CharacterClassLibrary.h"
-#include "../Entities/CharacterRaceLibrary.h"
 #include "../Entities/EntityDefinitionLibrary.h"
-#include "../GameLogic/PlayerLogicController.h"
 #include "../Input/InputActionName.h"
 #include "../Interface/CinematicLibrary.h"
 #include "../Interface/CommonUiController.h"
@@ -43,9 +39,13 @@
 #include "../Items/ItemConditionLibrary.h"
 #include "../Items/ItemLibrary.h"
 #include "../Items/ItemMaterialLibrary.h"
+#include "../Player/PlayerInterface.h"
+#include "../Player/PlayerLogicController.h"
 #include "../Rendering/RenderCamera.h"
 #include "../Rendering/Renderer.h"
 #include "../Rendering/RendererUtils.h"
+#include "../Stats/CharacterClassLibrary.h"
+#include "../Stats/CharacterRaceLibrary.h"
 #include "../Time/ClockLibrary.h"
 #include "../UI/CursorData.h"
 #include "../UI/FontLibrary.h"

diff --git a/OpenTESArena/src/Game/Game.h b/OpenTESArena/src/Game/Game.h
@@ -9,13 +9,13 @@
 #include "Jolt/Jolt.h"
 #include "Jolt/Physics/PhysicsSystem.h"
 
-#include "CharacterCreationState.h"
 #include "GameState.h"
 #include "Options.h"
 #include "../Assets/TextureManager.h"
 #include "../Audio/AudioManager.h"
 #include "../Input/InputManager.h"
 #include "../Interface/Panel.h"
+#include "../Player/CharacterCreationState.h"
 #include "../Rendering/Renderer.h"
 #include "../UI/TextBox.h"
 #include "../World/ChunkManager.h"

diff --git a/OpenTESArena/src/Game/GameState.cpp b/OpenTESArena/src/Game/GameState.cpp
@@ -14,11 +14,10 @@
 #include "../Assets/TextureManager.h"
 #include "../Audio/MusicLibrary.h"
 #include "../Entities/EntityDefinitionLibrary.h"
-#include "../Entities/Player.h"
-#include "../GameLogic/MapLogicController.h"
-#include "../GameLogic/PlayerLogicController.h"
 #include "../Interface/GameWorldUiView.h"
 #include "../Math/Constants.h"
+#include "../Player/Player.h"
+#include "../Player/PlayerLogicController.h"
 #include "../Rendering/RenderCamera.h"
 #include "../Rendering/Renderer.h"
 #include "../Rendering/RendererUtils.h"
@@ -30,6 +29,7 @@
 #include "../Voxels/ArenaVoxelUtils.h"
 #include "../Weather/ArenaWeatherUtils.h"
 #include "../Weather/WeatherUtils.h"
+#include "../World/MapLogicController.h"
 #include "../World/MapType.h"
 #include "../WorldMap/ArenaLocationUtils.h"
 #include "../WorldMap/LocationDefinition.h"

diff --git a/OpenTESArena/src/Game/GameState.h b/OpenTESArena/src/Game/GameState.h
@@ -13,10 +13,10 @@
 
 #include "../Assets/ArenaTypes.h"
 #include "../Assets/BinaryAssetLibrary.h"
-#include "../Entities/Player.h"
 #include "../Interface/ProvinceMapUiModel.h"
 #include "../Math/Random.h"
 #include "../Math/Vector2.h"
+#include "../Player/Player.h"
 #include "../Time/Clock.h"
 #include "../Time/Date.h"
 #include "../Weather/WeatherDefinition.h"

diff --git a/OpenTESArena/src/Interface/CharacterCreationUiController.cpp b/OpenTESArena/src/Interface/CharacterCreationUiController.cpp
@@ -20,12 +20,12 @@
 #include "WorldMapUiModel.h"
 #include "../Assets/TextAssetLibrary.h"
 #include "../Audio/MusicLibrary.h"
-#include "../Entities/CharacterClassLibrary.h"
 #include "../Entities/EntityDefinitionLibrary.h"
 #include "../Game/Game.h"
 #include "../Input/InputActionMapName.h"
 #include "../Input/InputActionName.h"
 #include "../Sky/SkyUtils.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../Time/ArenaClockUtils.h"
 #include "../UI/FontLibrary.h"
 #include "../UI/Surface.h"

diff --git a/OpenTESArena/src/Interface/CharacterCreationUiModel.cpp b/OpenTESArena/src/Interface/CharacterCreationUiModel.cpp
@@ -2,9 +2,10 @@
 #include "CharacterCreationUiView.h"
 #include "../Assets/ArenaPaletteName.h"
 #include "../Assets/TextAssetLibrary.h"
-#include "../Entities/CharacterClassLibrary.h"
-#include "../Entities/CharacterRaceLibrary.h"
 #include "../Game/Game.h"
+#include "../Player/CharacterCreationState.h"
+#include "../Stats/CharacterClassLibrary.h"
+#include "../Stats/CharacterRaceLibrary.h"
 #include "../Stats/PrimaryAttribute.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Interface/CharacterCreationUiView.cpp b/OpenTESArena/src/Interface/CharacterCreationUiView.cpp
@@ -6,8 +6,8 @@
 #include "CharacterSheetUiView.h"
 #include "../Assets/ArenaPortraitUtils.h"
 #include "../Assets/ArenaTextureName.h"
-#include "../Entities/CharacterClassLibrary.h"
 #include "../Game/Game.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../UI/FontDefinition.h"
 #include "../UI/FontLibrary.h"
 #include "../UI/Surface.h"

diff --git a/OpenTESArena/src/Interface/CharacterSheetUiModel.cpp b/OpenTESArena/src/Interface/CharacterSheetUiModel.cpp
@@ -1,9 +1,10 @@
 #include <vector>
 
 #include "CharacterSheetUiModel.h"
-#include "../Entities/CharacterClassLibrary.h"
-#include "../Entities/CharacterRaceLibrary.h"
 #include "../Game/Game.h"
+#include "../Player/Player.h"
+#include "../Stats/CharacterClassLibrary.h"
+#include "../Stats/CharacterRaceLibrary.h"
 #include "../Stats/PrimaryAttribute.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Interface/CharacterSheetUiView.cpp b/OpenTESArena/src/Interface/CharacterSheetUiView.cpp
@@ -6,9 +6,9 @@
 #include "../Assets/ArenaPaletteName.h"
 #include "../Assets/ArenaPortraitUtils.h"
 #include "../Assets/ArenaTextureName.h"
-#include "../Entities/CharacterClassLibrary.h"
-#include "../Entities/CharacterRaceLibrary.h"
 #include "../Game/Game.h"
+#include "../Stats/CharacterClassLibrary.h"
+#include "../Stats/CharacterRaceLibrary.h"
 #include "../Stats/PrimaryAttribute.h"
 
 TextBox::InitInfo CharacterSheetUiView::getPlayerNameTextBoxInitInfo(const std::string_view text,

diff --git a/OpenTESArena/src/Interface/ChooseClassPanel.cpp b/OpenTESArena/src/Interface/ChooseClassPanel.cpp
@@ -5,9 +5,9 @@
 #include "CharacterCreationUiView.h"
 #include "ChooseClassPanel.h"
 #include "CommonUiView.h"
-#include "../Entities/CharacterClassLibrary.h"
 #include "../Game/Game.h"
 #include "../Input/InputActionName.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../UI/FontLibrary.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Interface/ChooseClassPanel.h b/OpenTESArena/src/Interface/ChooseClassPanel.h
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "Panel.h"
-#include "../Entities/CharacterClassDefinition.h"
+#include "../Stats/CharacterClassDefinition.h"
 #include "../UI/Button.h"
 #include "../UI/ListBox.h"
 #include "../UI/TextBox.h"

diff --git a/OpenTESArena/src/Interface/GameWorldPanel.cpp b/OpenTESArena/src/Interface/GameWorldPanel.cpp
@@ -11,18 +11,18 @@
 #include "../Assets/ArenaPaletteName.h"
 #include "../Assets/ArenaPortraitUtils.h"
 #include "../Assets/ArenaTextureName.h"
-#include "../Entities/CharacterClassLibrary.h"
 #include "../Game/Game.h"
-#include "../GameLogic/MapLogicController.h"
-#include "../GameLogic/PlayerLogicController.h"
 #include "../Input/InputActionMapName.h"
 #include "../Input/InputActionName.h"
+#include "../Player/PlayerLogicController.h"
 #include "../Rendering/RenderCamera.h"
 #include "../Rendering/RenderCommandBuffer.h"
 #include "../Rendering/RendererUtils.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../Time/ArenaClockUtils.h"
 #include "../UI/CursorData.h"
 #include "../UI/FontLibrary.h"
+#include "../World/MapLogicController.h"
 #include "../World/MapType.h"
 
 #include "components/debug/Debug.h"

diff --git a/OpenTESArena/src/Interface/GameWorldUiController.cpp b/OpenTESArena/src/Interface/GameWorldUiController.cpp
@@ -8,9 +8,9 @@
 #include "PauseMenuPanel.h"
 #include "TextSubPanel.h"
 #include "WorldMapPanel.h"
-#include "../Entities/Player.h"
 #include "../Game/Game.h"
-#include "../GameLogic/PlayerLogicController.h"
+#include "../Player/Player.h"
+#include "../Player/PlayerLogicController.h"
 #include "../Time/ArenaClockUtils.h"
 #include "../Time/ArenaDateUtils.h"
 #include "../UI/FontLibrary.h"
@@ -26,8 +26,7 @@ void GameWorldUiController::onActivate(Game &game, const Int2 &screenPoint, Text
 	constexpr bool primaryInteraction = true;
 	const auto &inputManager = game.inputManager;
 	const bool debugFadeVoxel = inputManager.keyIsDown(SDL_SCANCODE_G);
-	PlayerLogicController::handleScreenToWorldInteraction(game, screenPoint, primaryInteraction,
-		debugFadeVoxel, actionText);
+	PlayerLogicController::handleScreenToWorldInteraction(game, screenPoint, primaryInteraction, debugFadeVoxel, actionText);
 }
 
 void GameWorldUiController::onActivateInputAction(const InputActionCallbackValues &values, TextBox &actionText)

diff --git a/OpenTESArena/src/Interface/GameWorldUiModel.cpp b/OpenTESArena/src/Interface/GameWorldUiModel.cpp
@@ -3,11 +3,11 @@
 #include "GameWorldUiModel.h"
 #include "GameWorldUiView.h"
 #include "../Assets/RMDFile.h"
-#include "../Entities/CharacterClassLibrary.h"
-#include "../Entities/Player.h"
 #include "../Game/Game.h"
+#include "../Player/Player.h"
 #include "../Rendering/RenderCamera.h"
 #include "../Rendering/RendererUtils.h"
+#include "../Stats/CharacterClassLibrary.h"
 #include "../Time/ArenaClockUtils.h"
 #include "../Time/ArenaDateUtils.h"
 #include "../Time/ClockLibrary.h"