diff --git a/src/engine/core/AppSettings.hpp b/src/engine/core/AppSettings.hpp index d1707ff..de8140a 100644 --- a/src/engine/core/AppSettings.hpp +++ b/src/engine/core/AppSettings.hpp @@ -2,6 +2,7 @@ #include #include +#include namespace lei3d { @@ -9,7 +10,6 @@ namespace lei3d class AppSettings { public: - static AppSettings& GetInstance(); ~AppSettings() = default; diff --git a/src/engine/rendering/gui/screens/PauseMenuScreen.cpp b/src/engine/rendering/gui/screens/PauseMenuScreen.cpp index c706bbf..4209342 100644 --- a/src/engine/rendering/gui/screens/PauseMenuScreen.cpp +++ b/src/engine/rendering/gui/screens/PauseMenuScreen.cpp @@ -3,14 +3,13 @@ #include "SplashScreen.hpp" #include "core/Application.hpp" #include "rendering/gui/components/GuiTextBox.hpp" -#include "Logging/Log.hpp" +#include "logging/Log.hpp" #include "rendering/gui/GuiManager.hpp" namespace lei3d { PauseMenuScreen::PauseMenuScreen() { - } PauseMenuScreen::~PauseMenuScreen() @@ -22,11 +21,10 @@ namespace lei3d GuiScreen::Init(); AddComponent(new GuiRect( - GuiComponent::Anchor::TOP_LEFT, - { GuiComponent::Space::NORMALIZED, { 0, 0 } }, - { GuiComponent::Space::NORMALIZED, { 1, 1 } }, - { 0, 0, 0, 0.5 } - )); + GuiComponent::Anchor::TOP_LEFT, + { GuiComponent::Space::NORMALIZED, { 0, 0 } }, + { GuiComponent::Space::NORMALIZED, { 1, 1 } }, + { 0, 0, 0, 0.5 })); GuiTextBox* resumeButton = new GuiTextBox( "Resume", @@ -91,6 +89,6 @@ namespace lei3d AddComponent(resumeButton); AddComponent(restartButton); - AddComponent(exitButton); + AddComponent(exitButton); } -} \ No newline at end of file +} // namespace lei3d \ No newline at end of file diff --git a/src/engine/scenes/SceneIntro.cpp b/src/engine/scenes/SceneIntro.cpp index e4a6842..7822c37 100644 --- a/src/engine/scenes/SceneIntro.cpp +++ b/src/engine/scenes/SceneIntro.cpp @@ -69,7 +69,7 @@ namespace lei3d const std::string signPath = "data/models/leveldesignobj/sign/sign.gltf"; m_EnviromentModels.insert(std::make_pair("sign", std::make_unique(signPath))); - const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj"; + const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj"; m_EnviromentModels.insert(std::make_pair("fish", std::make_unique(fishPath))); const std::string treePath = "data/models/environment/palm_tree.gltf"; diff --git a/src/engine/scenes/SceneTitle.cpp b/src/engine/scenes/SceneTitle.cpp index 310758d..831f618 100644 --- a/src/engine/scenes/SceneTitle.cpp +++ b/src/engine/scenes/SceneTitle.cpp @@ -61,7 +61,7 @@ namespace lei3d const std::string signPath = "data/models/leveldesignobj/sign/sign.gltf"; m_EnviromentModels.insert(std::make_pair("sign", std::make_unique(signPath))); - const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj"; + const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj"; m_EnviromentModels["fish"] = (std::make_unique(fishPath)); m_EnviromentModels.insert(std::make_pair("fish", std::make_unique(fishPath))); diff --git a/src/engine/scenes/TestSceneKevin.cpp b/src/engine/scenes/TestSceneKevin.cpp index 7c1ce12..4b381cf 100644 --- a/src/engine/scenes/TestSceneKevin.cpp +++ b/src/engine/scenes/TestSceneKevin.cpp @@ -68,7 +68,7 @@ namespace lei3d const std::string housePath = "data/models/leveldesignobj/house/house_texture.obj"; m_EnviromentModels.insert(std::make_pair("house", std::make_unique(housePath))); - const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj"; + const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj"; m_EnviromentModels.insert(std::make_pair("fish", std::make_unique(fishPath))); const std::string treePath = "data/models/environment/palm_tree.gltf";