refactored UIStats

Ipagaxi · Apr 26, 2024 · 4a22318 · 4a22318
1 parent 3ee83d1
commit 4a22318
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 50 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,10 +6,9 @@ file(GLOB source_files
     "src/main/*.cpp"
     "src/main/Activities/*.cpp"
     "src/main/UIElements/*.cpp"
-    "src/main/UIComponents/*.cpp"
     "src/main/Actors/*.cpp"
     "src/main/Animations/*.cpp"
-    "src/main/UI_Objects/*.cpp"
+    "src/main/UIObjects/*.cpp"
     "src/main/FightStates/*.cpp"
 )
 set(SOURCES ${source_files})
@@ -31,8 +30,6 @@ FetchContent_MakeAvailable(SFML)
 add_executable (
     ${PROJECT_NAME}
     ${SOURCES}
-        src/include/FightStates/FightState.hpp
-        src/include/FightEnv.hpp
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE "src/include")

diff --git a/src/include/Activities/FightActivity.hpp b/src/include/Activities/FightActivity.hpp
@@ -12,9 +12,9 @@
 #include "ActivityEnum.hpp"
 #include "Animations/TextFadingManager.hpp"
 #include "Animations/IncomingBanner.hpp"
-#include "UIComponents/UIStats.hpp"
-#include "UI_Objects/UIEnemyOverview.hpp"
-#include "UI_Objects/UIPlayerOverview.hpp"
+#include "UIElements/UIStats.hpp"
+#include "UIObjects/UIEnemyOverview.hpp"
+#include "UIObjects/UIPlayerOverview.hpp"
 #include "UIElements/UIColorPicker.hpp"
 #include "UIElements/UIButton.hpp"
 #include "UIElements/UIBox.hpp"

diff --git a/src/include/FightEnv.hpp b/src/include/FightEnv.hpp
@@ -2,9 +2,9 @@
 #define FIGHTEVENTS_HPP
 
 #include <SFML/Graphics.hpp>
-#include "UIComponents/UIStats.hpp"
-#include "UI_Objects/UIEnemyOverview.hpp"
-#include "UI_Objects/UIPlayerOverview.hpp"
+#include "UIElements/UIStats.hpp"
+#include "UIObjects/UIEnemyOverview.hpp"
+#include "UIObjects/UIPlayerOverview.hpp"
 #include "Animations/TextFadingManager.hpp"
 #include "Animations/IncomingBanner.hpp"
 #include "Game.hpp"

diff --git a/src/include/UIComponents/UIComponent.hpp b/src/include/UIComponents/UIComponent.hpp
diff --git a/src/include/UIComponents/UIStats.hpp → src/include/UIElements/UIStats.hpp b/src/include/UIComponents/UIStats.hpp → src/include/UIElements/UIStats.hpp
@@ -1,13 +1,13 @@
 #ifndef UIPLAYERSTATS_HPP
 #define UIPLAYERSTATS_HPP
 
-#include "UIComponents/UIComponent.hpp"
 #include "UIElements/UIBox.hpp"
+#include "UIElements/UIElement.hpp"
 #include "Actors/Actor.hpp"
 #include "Game.hpp"
 #include <iostream>
 
-class UIStats: public UIComponent {
+class UIStats: public UIElement {
     public:
         UIStats(Game &game, Actor actor);
 

diff --git a/src/include/UIObjects/UIEnemyOverview.hpp b/src/include/UIObjects/UIEnemyOverview.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <SFML/Graphics.hpp>
 
-#include "UIComponents/UIStats.hpp"
+#include "UIElements/UIStats.hpp"
 #include "UIElements/UIColorPicker.hpp"
 #include "UIElements/UIBorderedImage.hpp"
 #include "UIElements/UIBox.hpp"

diff --git a/src/include/UIObjects/UIPlayerOverview.hpp b/src/include/UIObjects/UIPlayerOverview.hpp
@@ -7,7 +7,7 @@
 #include "Game.hpp"
 #include "UIElements/UIBox.hpp"
 #include "UIElements/UIBorderedImage.hpp"
-#include "UIComponents/UIStats.hpp"
+#include "UIElements/UIStats.hpp"
 
 
 class UIPlayerOverview {

diff --git a/src/main/UIComponents/UIComponent.cpp b/src/main/UIComponents/UIComponent.cpp
diff --git a/src/main/UIComponents/UIStats.cpp → src/main/UIElements/UIStats.cpp b/src/main/UIComponents/UIStats.cpp → src/main/UIElements/UIStats.cpp
@@ -1,4 +1,4 @@
-#include "UIComponents/UIStats.hpp"
+#include "UIElements/UIStats.hpp"
 
 
 UIStats::UIStats(Game &game, Actor actor) {

diff --git a/src/main/UI_Objects/UIEnemyOverview.cpp → src/main/UIObjects/UIEnemyOverview.cpp b/src/main/UI_Objects/UIEnemyOverview.cpp → src/main/UIObjects/UIEnemyOverview.cpp
@@ -1,4 +1,4 @@
-#include "UI_Objects/UIEnemyOverview.hpp"
+#include "UIObjects/UIEnemyOverview.hpp"
 
 UIEnemyOverview::UIEnemyOverview(Game &game): UIEnemyOverview(game, Enemy()) {
 }

diff --git a/src/main/UI_Objects/UIPlayerOverview.cpp → src/main/UIObjects/UIPlayerOverview.cpp b/src/main/UI_Objects/UIPlayerOverview.cpp → src/main/UIObjects/UIPlayerOverview.cpp
@@ -1,4 +1,4 @@
-#include "UI_Objects/UIPlayerOverview.hpp"
+#include "UIObjects/UIPlayerOverview.hpp"
 
 UIPlayerOverview::UIPlayerOverview(Game &game): statsComponent(game, game.player), player(game.player), playerFrame("monster_landscape_cut/" + game.player.picPath, "actor_borders/fight_border.png") {
     sf::Vector2u windowSize = game.renderEngine.gameWindow->getSize();