Main states were organized

CMakeLists.txt

@@ -5,11 +5,12 @@ set(CMAKE_CXX_STANDARD 17)
 file(GLOB_RECURSE HEADERS include/*h)
 file(GLOB_RECURSE SOURCES src/*cpp)
 
-#set(SFML_STATIC_LIBRARIES TRUE)
+set(SFML_STATIC_LIBRARIES TRUE)
 set(BUILD_SHARED_LIBS FALSE)
 
-#FetchContent_Declare(SFML GIT_REPOSITORY https://github.com/SFML/SFML.git GIT_TAG 2.6.1)
-#FetchContent_MakeAvailable(SFML)
+include(FetchContent)
+FetchContent_Declare(SFML GIT_REPOSITORY https://github.com/SFML/SFML.git GIT_TAG 2.6.1)
+FetchContent_MakeAvailable(SFML)
 
 add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
-#target_link_libraries(${PROJECT_NAME} PRIVATE sfml-system sfml-window sfml-graphics)
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} PRIVATE sfml-system sfml-window sfml-graphics)
\ No newline at end of file

include/Application.h

@@ -15,6 +15,6 @@ private:
     ~Application() override = default;
     void set_next_state(std::unique_ptr<IState> state) override { m_ptr_state_next = std::move(state); };
     void apply_deffer_state_change();
-    std::unique_ptr<IState> m_ptr_state_current = std::make_unique<ExitState>(*this);
+    std::unique_ptr<IState> m_ptr_state_current = std::make_unique<SelectState>(*this, sf::VideoMode{100, 50}, sf::String{"Select state"});
     std::unique_ptr<IState> m_ptr_state_next;
 };
\ No newline at end of file

include/States/States.h

 #pragma once
+#include <iostream>
 #include "IState.h"
+#include <SFML/Graphics.hpp>
+
+class IWindowKeeper {
+public:
+    IWindowKeeper(const sf::VideoMode& video_mode, const sf::String& window_title) {};
+    virtual ~IWindowKeeper() = default;
+protected:
+    virtual void event_handling() = 0;
+    virtual void update() = 0;
+    virtual void render() = 0;
+    sf::RenderWindow m_window;
+};
 
 struct ExitState : IState {
     explicit ExitState(IStateManager& state_manager) : IState(state_manager) {}
-    bool do_step() override { return false; }
+    bool do_step() override {
+        std::cout << "Exiting..." << std::endl;
+        return false;
+    }
+};
+
+struct SelectState : IState, IWindowKeeper {
+    explicit SelectState(IStateManager& state_manager, const sf::VideoMode& video_mode, const sf::String& window_title) : IState(state_manager), IWindowKeeper(video_mode, window_title) {}
+    bool do_step() override;
+    void event_handling() override {};
+    void update() override {};
+    void render() override {};
+};
+
+struct GameState : IState, IWindowKeeper {
+    explicit GameState(IStateManager& state_manager, const sf::VideoMode& video_mode, const sf::String& window_title) : IState(state_manager), IWindowKeeper(video_mode, window_title) {}
+    bool do_step() override;
+    void event_handling() override {};
+    void update() override {};
+    void render() override {};
 };
\ No newline at end of file

src/States/GameState.cpp

+#include "../../include/States/States.h"
+
+bool GameState::do_step() {
+    std::cout << "Game state" << std::endl;
+    m_state_manager.set_next_state(std::make_unique<ExitState>(m_state_manager));
+    return true;
+}
\ No newline at end of file

src/States/SelectState.cpp

+#include "../../include/States/States.h"
+
+bool SelectState::do_step() {
+    std::cout << "Select state" << std::endl;
+    m_state_manager.set_next_state(std::make_unique<GameState>(m_state_manager, sf::VideoMode{100, 50}, sf::String{"Game state"}));
+    return true;
+}
\ No newline at end of file