From 6bdfd574b569a12160dd1270502444f0b66c10d4 Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 20 Nov 2024 21:34:45 -0800 Subject: [PATCH] Organized some source files. --- OpenTESArena/CMakeLists.txt | 56 +++++++++---------- OpenTESArena/src/Assets/ArenaAnimUtils.cpp | 4 +- OpenTESArena/src/Assets/BinaryAssetLibrary.h | 2 +- OpenTESArena/src/Assets/TextAssetLibrary.h | 2 +- .../src/Entities/EntityChunkManager.cpp | 2 +- OpenTESArena/src/Entities/EntityUtils.cpp | 4 +- OpenTESArena/src/Game/Game.cpp | 8 +-- OpenTESArena/src/Game/Game.h | 2 +- OpenTESArena/src/Game/GameState.cpp | 6 +- OpenTESArena/src/Game/GameState.h | 2 +- .../CharacterCreationUiController.cpp | 2 +- .../Interface/CharacterCreationUiModel.cpp | 5 +- .../src/Interface/CharacterCreationUiView.cpp | 2 +- .../src/Interface/CharacterSheetUiModel.cpp | 5 +- .../src/Interface/CharacterSheetUiView.cpp | 4 +- .../src/Interface/ChooseClassPanel.cpp | 2 +- OpenTESArena/src/Interface/ChooseClassPanel.h | 2 +- OpenTESArena/src/Interface/GameWorldPanel.cpp | 6 +- .../src/Interface/GameWorldUiController.cpp | 7 +-- .../src/Interface/GameWorldUiModel.cpp | 4 +- .../src/Interface/GameWorldUiView.cpp | 4 +- .../src/Interface/InventoryUiModel.cpp | 2 +- .../src/Interface/MainMenuUiController.cpp | 2 +- OpenTESArena/src/Interface/PauseMenuPanel.cpp | 2 +- .../src/Interface/WorldMapUiController.cpp | 2 +- .../CharacterClassGeneration.cpp | 0 .../CharacterClassGeneration.h | 0 .../CharacterCreationState.cpp | 0 .../{Game => Player}/CharacterCreationState.h | 0 .../{Game => Player}/CharacterQuestion.cpp | 0 .../src/{Game => Player}/CharacterQuestion.h | 2 +- .../src/{Entities => Player}/Player.cpp | 4 +- .../src/{Entities => Player}/Player.h | 0 .../src/{Game => Player}/PlayerInterface.h | 0 .../PlayerLogicController.cpp | 4 +- .../PlayerLogicController.h | 0 .../{Entities => Player}/WeaponAnimation.cpp | 0 .../{Entities => Player}/WeaponAnimation.h | 0 .../CharacterClassDefinition.cpp | 0 .../CharacterClassDefinition.h | 0 .../CharacterClassLibrary.cpp | 2 +- .../CharacterClassLibrary.h | 0 .../CharacterRaceDefinition.cpp | 0 .../CharacterRaceDefinition.h | 0 .../CharacterRaceLibrary.cpp | 2 +- .../CharacterRaceLibrary.h | 0 OpenTESArena/src/World/MapDefinition.cpp | 2 +- .../MapLogicController.cpp | 4 +- .../{GameLogic => World}/MapLogicController.h | 0 49 files changed, 80 insertions(+), 79 deletions(-) rename OpenTESArena/src/{Game => Player}/CharacterClassGeneration.cpp (100%) rename OpenTESArena/src/{Game => Player}/CharacterClassGeneration.h (100%) rename OpenTESArena/src/{Game => Player}/CharacterCreationState.cpp (100%) rename OpenTESArena/src/{Game => Player}/CharacterCreationState.h (100%) rename OpenTESArena/src/{Game => Player}/CharacterQuestion.cpp (100%) rename OpenTESArena/src/{Game => Player}/CharacterQuestion.h (94%) rename OpenTESArena/src/{Entities => Player}/Player.cpp (99%) rename OpenTESArena/src/{Entities => Player}/Player.h (100%) rename OpenTESArena/src/{Game => Player}/PlayerInterface.h (100%) rename OpenTESArena/src/{GameLogic => Player}/PlayerLogicController.cpp (99%) rename OpenTESArena/src/{GameLogic => Player}/PlayerLogicController.h (100%) rename OpenTESArena/src/{Entities => Player}/WeaponAnimation.cpp (100%) rename OpenTESArena/src/{Entities => Player}/WeaponAnimation.h (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterClassDefinition.cpp (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterClassDefinition.h (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterClassLibrary.cpp (99%) rename OpenTESArena/src/{Entities => Stats}/CharacterClassLibrary.h (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterRaceDefinition.cpp (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterRaceDefinition.h (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterRaceLibrary.cpp (100%) rename OpenTESArena/src/{Entities => Stats}/CharacterRaceLibrary.h (100%) rename OpenTESArena/src/{GameLogic => World}/MapLogicController.cpp (99%) rename OpenTESArena/src/{GameLogic => World}/MapLogicController.h (100%) diff --git a/OpenTESArena/CMakeLists.txt b/OpenTESArena/CMakeLists.txt index e7c7c55b5..73e5e5314 100644 --- 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 index c623a0a51..197c305a2 100644 --- 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 index 43c2c9f55..44d9527e7 100644 --- 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 index bdc3ac78b..6a997df6a 100644 --- a/OpenTESArena/src/Assets/TextAssetLibrary.h +++ b/OpenTESArena/src/Assets/TextAssetLibrary.h @@ -5,7 +5,7 @@ #include #include -#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 index 33b67cdc7..1d8e23c01 100644 --- 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 index a38d05fb9..1aa57b732 100644 --- a/OpenTESArena/src/Entities/EntityUtils.cpp +++ b/OpenTESArena/src/Entities/EntityUtils.cpp @@ -1,12 +1,12 @@ #include -#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 index 70b5ef117..e01c0e5b8 100644 --- 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 index d2cdb1bce..cfb28a234 100644 --- 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 index 557d635d1..ad84df2c3 100644 --- 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 index 34640b39a..4e2ad6d29 100644 --- 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 index 1e7955f6a..5a7e0f595 100644 --- 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 index ad1e4b158..99180ec35 100644 --- 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 index bc423f0dd..cebedb89c 100644 --- 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 index 0d176d0f5..ab0c2096c 100644 --- a/OpenTESArena/src/Interface/CharacterSheetUiModel.cpp +++ b/OpenTESArena/src/Interface/CharacterSheetUiModel.cpp @@ -1,9 +1,10 @@ #include #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 index 18451393e..64d69368a 100644 --- 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 index 1cb68f393..028f96e51 100644 --- 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 index 387ad5811..e9ce38908 100644 --- a/OpenTESArena/src/Interface/ChooseClassPanel.h +++ b/OpenTESArena/src/Interface/ChooseClassPanel.h @@ -5,7 +5,7 @@ #include #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 index 3f5d4a1ef..751aa79e8 100644 --- 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 index 59a3e9842..836ca6d7c 100644 --- 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 index df721a04d..d4f3af990 100644 --- 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" diff --git a/OpenTESArena/src/Interface/GameWorldUiView.cpp b/OpenTESArena/src/Interface/GameWorldUiView.cpp index 0a7f1edb2..be9a4fce0 100644 --- a/OpenTESArena/src/Interface/GameWorldUiView.cpp +++ b/OpenTESArena/src/Interface/GameWorldUiView.cpp @@ -7,11 +7,11 @@ #include "../Assets/ArenaPortraitUtils.h" #include "../Assets/ArenaTextureName.h" #include "../Collision/RayCastTypes.h" -#include "../Entities/CharacterClassLibrary.h" -#include "../Entities/CharacterRaceLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Game/Game.h" #include "../Math/Constants.h" +#include "../Stats/CharacterClassLibrary.h" +#include "../Stats/CharacterRaceLibrary.h" #include "../UI/ArenaFontName.h" #include "../UI/FontLibrary.h" #include "../UI/GuiUtils.h" diff --git a/OpenTESArena/src/Interface/InventoryUiModel.cpp b/OpenTESArena/src/Interface/InventoryUiModel.cpp index 1bc2565cc..0f929dd6e 100644 --- a/OpenTESArena/src/Interface/InventoryUiModel.cpp +++ b/OpenTESArena/src/Interface/InventoryUiModel.cpp @@ -2,9 +2,9 @@ #include "InventoryUiModel.h" #include "InventoryUiView.h" -#include "../Entities/Player.h" #include "../Game/Game.h" #include "../Items/ItemLibrary.h" +#include "../Player/Player.h" void InventoryUiModel::ItemUiDefinition::init(const std::string &text, const Color &color) { diff --git a/OpenTESArena/src/Interface/MainMenuUiController.cpp b/OpenTESArena/src/Interface/MainMenuUiController.cpp index 043083adc..b9200f78b 100644 --- a/OpenTESArena/src/Interface/MainMenuUiController.cpp +++ b/OpenTESArena/src/Interface/MainMenuUiController.cpp @@ -14,10 +14,10 @@ #include "../Assets/TextAssetLibrary.h" #include "../Audio/MusicLibrary.h" #include "../Audio/MusicUtils.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Game/Game.h" #include "../Sky/SkyUtils.h" +#include "../Stats/CharacterClassLibrary.h" #include "../Time/ArenaClockUtils.h" #include "../Weather/ArenaWeatherUtils.h" #include "../World/MapType.h" diff --git a/OpenTESArena/src/Interface/PauseMenuPanel.cpp b/OpenTESArena/src/Interface/PauseMenuPanel.cpp index afd744d1a..c3a24dd09 100644 --- a/OpenTESArena/src/Interface/PauseMenuPanel.cpp +++ b/OpenTESArena/src/Interface/PauseMenuPanel.cpp @@ -6,9 +6,9 @@ #include "PauseMenuUiController.h" #include "PauseMenuUiModel.h" #include "PauseMenuUiView.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Game/Game.h" #include "../Input/InputActionName.h" +#include "../Stats/CharacterClassLibrary.h" #include "../UI/CursorData.h" #include "../UI/FontLibrary.h" #include "../UI/Surface.h" diff --git a/OpenTESArena/src/Interface/WorldMapUiController.cpp b/OpenTESArena/src/Interface/WorldMapUiController.cpp index 8807adb23..f7bb4f85b 100644 --- a/OpenTESArena/src/Interface/WorldMapUiController.cpp +++ b/OpenTESArena/src/Interface/WorldMapUiController.cpp @@ -6,10 +6,10 @@ #include "WorldMapUiModel.h" #include "../Assets/TextAssetLibrary.h" #include "../Audio/MusicLibrary.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Game/Game.h" #include "../Sky/SkyUtils.h" +#include "../Stats/CharacterClassLibrary.h" #include "../Time/ArenaClockUtils.h" #include "../Weather/ArenaWeatherUtils.h" #include "../WorldMap/ArenaLocationUtils.h" diff --git a/OpenTESArena/src/Game/CharacterClassGeneration.cpp b/OpenTESArena/src/Player/CharacterClassGeneration.cpp similarity index 100% rename from OpenTESArena/src/Game/CharacterClassGeneration.cpp rename to OpenTESArena/src/Player/CharacterClassGeneration.cpp diff --git a/OpenTESArena/src/Game/CharacterClassGeneration.h b/OpenTESArena/src/Player/CharacterClassGeneration.h similarity index 100% rename from OpenTESArena/src/Game/CharacterClassGeneration.h rename to OpenTESArena/src/Player/CharacterClassGeneration.h diff --git a/OpenTESArena/src/Game/CharacterCreationState.cpp b/OpenTESArena/src/Player/CharacterCreationState.cpp similarity index 100% rename from OpenTESArena/src/Game/CharacterCreationState.cpp rename to OpenTESArena/src/Player/CharacterCreationState.cpp diff --git a/OpenTESArena/src/Game/CharacterCreationState.h b/OpenTESArena/src/Player/CharacterCreationState.h similarity index 100% rename from OpenTESArena/src/Game/CharacterCreationState.h rename to OpenTESArena/src/Player/CharacterCreationState.h diff --git a/OpenTESArena/src/Game/CharacterQuestion.cpp b/OpenTESArena/src/Player/CharacterQuestion.cpp similarity index 100% rename from OpenTESArena/src/Game/CharacterQuestion.cpp rename to OpenTESArena/src/Player/CharacterQuestion.cpp diff --git a/OpenTESArena/src/Game/CharacterQuestion.h b/OpenTESArena/src/Player/CharacterQuestion.h similarity index 94% rename from OpenTESArena/src/Game/CharacterQuestion.h rename to OpenTESArena/src/Player/CharacterQuestion.h index 56d9c802e..be7ce7542 100644 --- a/OpenTESArena/src/Game/CharacterQuestion.h +++ b/OpenTESArena/src/Player/CharacterQuestion.h @@ -3,7 +3,7 @@ #include -#include "../Entities/CharacterClassDefinition.h" +#include "../Stats/CharacterClassDefinition.h" // A definition for each question object in QUESTION.TXT. Each question has a // description and three choices. Each choice points to a particular class category diff --git a/OpenTESArena/src/Entities/Player.cpp b/OpenTESArena/src/Player/Player.cpp similarity index 99% rename from OpenTESArena/src/Entities/Player.cpp rename to OpenTESArena/src/Player/Player.cpp index 45e56c33e..2b86b1c01 100644 --- a/OpenTESArena/src/Entities/Player.cpp +++ b/OpenTESArena/src/Player/Player.cpp @@ -7,8 +7,6 @@ #include "Jolt/Physics/Body/BodyCreationSettings.h" #include "Jolt/Physics/Collision/Shape/CapsuleShape.h" -#include "CharacterClassDefinition.h" -#include "CharacterClassLibrary.h" #include "Player.h" #include "../Collision/CollisionChunk.h" #include "../Collision/CollisionChunkManager.h" @@ -21,6 +19,8 @@ #include "../Math/Constants.h" #include "../Math/Quaternion.h" #include "../Math/Random.h" +#include "../Stats/CharacterClassDefinition.h" +#include "../Stats/CharacterClassLibrary.h" #include "../Voxels/VoxelChunkManager.h" #include "../World/CardinalDirection.h" diff --git a/OpenTESArena/src/Entities/Player.h b/OpenTESArena/src/Player/Player.h similarity index 100% rename from OpenTESArena/src/Entities/Player.h rename to OpenTESArena/src/Player/Player.h diff --git a/OpenTESArena/src/Game/PlayerInterface.h b/OpenTESArena/src/Player/PlayerInterface.h similarity index 100% rename from OpenTESArena/src/Game/PlayerInterface.h rename to OpenTESArena/src/Player/PlayerInterface.h diff --git a/OpenTESArena/src/GameLogic/PlayerLogicController.cpp b/OpenTESArena/src/Player/PlayerLogicController.cpp similarity index 99% rename from OpenTESArena/src/GameLogic/PlayerLogicController.cpp rename to OpenTESArena/src/Player/PlayerLogicController.cpp index 878637e6e..65fd09a8e 100644 --- a/OpenTESArena/src/GameLogic/PlayerLogicController.cpp +++ b/OpenTESArena/src/Player/PlayerLogicController.cpp @@ -1,4 +1,3 @@ -#include "MapLogicController.h" #include "PlayerLogicController.h" #include "../Assets/ArenaPaletteName.h" #include "../Assets/ArenaSoundName.h" @@ -6,15 +5,16 @@ #include "../Collision/Physics.h" #include "../Collision/RayCastTypes.h" #include "../Collision/SelectionUtils.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Game/Game.h" #include "../Interface/GameWorldUiModel.h" #include "../Interface/GameWorldUiView.h" +#include "../Stats/CharacterClassLibrary.h" #include "../UI/TextBox.h" #include "../Voxels/ArenaVoxelUtils.h" #include "../World/CardinalDirection.h" #include "../World/CardinalDirectionName.h" +#include "../World/MapLogicController.h" #include "components/utilities/String.h" diff --git a/OpenTESArena/src/GameLogic/PlayerLogicController.h b/OpenTESArena/src/Player/PlayerLogicController.h similarity index 100% rename from OpenTESArena/src/GameLogic/PlayerLogicController.h rename to OpenTESArena/src/Player/PlayerLogicController.h diff --git a/OpenTESArena/src/Entities/WeaponAnimation.cpp b/OpenTESArena/src/Player/WeaponAnimation.cpp similarity index 100% rename from OpenTESArena/src/Entities/WeaponAnimation.cpp rename to OpenTESArena/src/Player/WeaponAnimation.cpp diff --git a/OpenTESArena/src/Entities/WeaponAnimation.h b/OpenTESArena/src/Player/WeaponAnimation.h similarity index 100% rename from OpenTESArena/src/Entities/WeaponAnimation.h rename to OpenTESArena/src/Player/WeaponAnimation.h diff --git a/OpenTESArena/src/Entities/CharacterClassDefinition.cpp b/OpenTESArena/src/Stats/CharacterClassDefinition.cpp similarity index 100% rename from OpenTESArena/src/Entities/CharacterClassDefinition.cpp rename to OpenTESArena/src/Stats/CharacterClassDefinition.cpp diff --git a/OpenTESArena/src/Entities/CharacterClassDefinition.h b/OpenTESArena/src/Stats/CharacterClassDefinition.h similarity index 100% rename from OpenTESArena/src/Entities/CharacterClassDefinition.h rename to OpenTESArena/src/Stats/CharacterClassDefinition.h diff --git a/OpenTESArena/src/Entities/CharacterClassLibrary.cpp b/OpenTESArena/src/Stats/CharacterClassLibrary.cpp similarity index 99% rename from OpenTESArena/src/Entities/CharacterClassLibrary.cpp rename to OpenTESArena/src/Stats/CharacterClassLibrary.cpp index ac11e63b6..64b84ea5f 100644 --- a/OpenTESArena/src/Entities/CharacterClassLibrary.cpp +++ b/OpenTESArena/src/Stats/CharacterClassLibrary.cpp @@ -2,7 +2,7 @@ #include "CharacterClassLibrary.h" #include "../Assets/ExeData.h" -#include "../Game/CharacterClassGeneration.h" +#include "../Player/CharacterClassGeneration.h" #include "components/debug/Debug.h" diff --git a/OpenTESArena/src/Entities/CharacterClassLibrary.h b/OpenTESArena/src/Stats/CharacterClassLibrary.h similarity index 100% rename from OpenTESArena/src/Entities/CharacterClassLibrary.h rename to OpenTESArena/src/Stats/CharacterClassLibrary.h diff --git a/OpenTESArena/src/Entities/CharacterRaceDefinition.cpp b/OpenTESArena/src/Stats/CharacterRaceDefinition.cpp similarity index 100% rename from OpenTESArena/src/Entities/CharacterRaceDefinition.cpp rename to OpenTESArena/src/Stats/CharacterRaceDefinition.cpp diff --git a/OpenTESArena/src/Entities/CharacterRaceDefinition.h b/OpenTESArena/src/Stats/CharacterRaceDefinition.h similarity index 100% rename from OpenTESArena/src/Entities/CharacterRaceDefinition.h rename to OpenTESArena/src/Stats/CharacterRaceDefinition.h diff --git a/OpenTESArena/src/Entities/CharacterRaceLibrary.cpp b/OpenTESArena/src/Stats/CharacterRaceLibrary.cpp similarity index 100% rename from OpenTESArena/src/Entities/CharacterRaceLibrary.cpp rename to OpenTESArena/src/Stats/CharacterRaceLibrary.cpp index c5f2d0a1e..86678d78a 100644 --- a/OpenTESArena/src/Entities/CharacterRaceLibrary.cpp +++ b/OpenTESArena/src/Stats/CharacterRaceLibrary.cpp @@ -1,7 +1,7 @@ +#include "CharacterRaceLibrary.h" #include "../Assets/ArenaPortraitUtils.h" #include "../Assets/CityDataFile.h" #include "../Assets/ExeData.h" -#include "CharacterRaceLibrary.h" #include "components/debug/Debug.h" diff --git a/OpenTESArena/src/Entities/CharacterRaceLibrary.h b/OpenTESArena/src/Stats/CharacterRaceLibrary.h similarity index 100% rename from OpenTESArena/src/Entities/CharacterRaceLibrary.h rename to OpenTESArena/src/Stats/CharacterRaceLibrary.h diff --git a/OpenTESArena/src/World/MapDefinition.cpp b/OpenTESArena/src/World/MapDefinition.cpp index 76872f033..9dca65d26 100644 --- a/OpenTESArena/src/World/MapDefinition.cpp +++ b/OpenTESArena/src/World/MapDefinition.cpp @@ -14,10 +14,10 @@ #include "../Assets/MIFUtils.h" #include "../Assets/RMDFile.h" #include "../Assets/TextAssetLibrary.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Math/Random.h" #include "../Sky/SkyGeneration.h" +#include "../Stats/CharacterClassLibrary.h" #include "../Weather/WeatherUtils.h" #include "components/debug/Debug.h" diff --git a/OpenTESArena/src/GameLogic/MapLogicController.cpp b/OpenTESArena/src/World/MapLogicController.cpp similarity index 99% rename from OpenTESArena/src/GameLogic/MapLogicController.cpp rename to OpenTESArena/src/World/MapLogicController.cpp index df7accbf9..aaf20bc43 100644 --- a/OpenTESArena/src/GameLogic/MapLogicController.cpp +++ b/OpenTESArena/src/World/MapLogicController.cpp @@ -1,18 +1,18 @@ #include "MapLogicController.h" +#include "MapType.h" #include "../Assets/ArenaPaletteName.h" #include "../Assets/TextAssetLibrary.h" #include "../Audio/MusicLibrary.h" #include "../Audio/MusicUtils.h" #include "../Collision/RayCastTypes.h" -#include "../Entities/CharacterClassLibrary.h" #include "../Entities/EntityDefinitionLibrary.h" #include "../Game/Game.h" #include "../Interface/WorldMapPanel.h" #include "../Sky/SkyUtils.h" +#include "../Stats/CharacterClassLibrary.h" #include "../Time/ArenaClockUtils.h" #include "../UI/TextBox.h" #include "../Voxels/VoxelFacing3D.h" -#include "../World/MapType.h" void MapLogicController::handleNightLightChange(Game &game, bool active) { diff --git a/OpenTESArena/src/GameLogic/MapLogicController.h b/OpenTESArena/src/World/MapLogicController.h similarity index 100% rename from OpenTESArena/src/GameLogic/MapLogicController.h rename to OpenTESArena/src/World/MapLogicController.h