Make GUIState interface, rearrange include

include/application.h

@@ -6,11 +6,24 @@
 #include <SFML/Window/Keyboard.hpp>
 #include <SFML/Window/Event.hpp>
 
-#include "game.h"
+#include "game/game.h"
+#include "gui/state.h"
 
 class Application
 {
 public:
+
+    enum State
+    {
+        SPLASH_SCREEN,
+        MAIN_MENU,
+        GAME_PICKER,
+        GAME,
+        EDITOR_PICKER,
+        EDITOR,
+        SETTINGS
+    };
+
     Application();
     void run();
     void input();
@@ -18,9 +31,12 @@ public:
     void draw();
 
 private:
+    std::stack<std::shared_ptr<GUIState>> _states;
     sf::RenderWindow _game_window;
     std::shared_ptr<Game> _game;
 
+    State _state;
+
     void exec();
 };
 

include/game/game.h

@@ -2,7 +2,7 @@
 #define GAME_H
 
 #include <SFML/Graphics/RenderWindow.hpp>
-#include "inputtype.h"
+#include "game/inputtype.h"
 
 class Game
 {

include/game/inputtype.h

@@ -2,7 +2,7 @@
 #define INPUTTYPE_H
 
 #include <SFML/Window/Event.hpp>
-#include "mathutils.h"
+#include "game/mathutils.h"
 
 struct PlayerInput
 {

include/game/note.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "inputtype.h"
+#include "game/inputtype.h"
 
 class Note
 {

include/game/precisionevaluator.h

@@ -1,7 +1,7 @@
 #ifndef PRECISIONEVALUATOR_H
 #define PRECISIONEVALUATOR_H
 
-#include "mathutils.h"
+#include "game/mathutils.h"
 #include <numeric>
 #include <type_traits>
 #include <vector>

include/game/timeline.h

@@ -1,7 +1,8 @@
 #ifndef TIMELINE_H
 #define TIMELINE_H
 
-#include "mathutils.h"
+#include "game/mathutils.h"
+
 #include <memory>
 #include <vector>
 

include/gui/state.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stack>
+#include <memory>
+#include <SFML/Window/Event.hpp>
+#include <SFML/Graphics/Drawable.hpp>
+
+class GUIState : public sf::Drawable
+{
+    virtual ~GUIState() = default;
+
+    virtual void input(const sf::Event& event, std::stack<std::shared_ptr<GUIState>>& states) = 0;
+    virtual void update() = 0;
+    virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const = 0;
+};

src/application.cpp

@@ -1,5 +1,5 @@
 #include "application.h"
-#include "inputtype.h"
+#include "game/inputtype.h"
 
 #include "classicgame/classicgame.h"
 #include "classicgame/classicgraphicsmanager.h"
@@ -33,7 +33,6 @@ void Application::exec()
 
     while (_game_window.isOpen())
     {
-
         time_since_last_update += timer.restart();
 
         input();

src/classicgame/classicanimationscenario.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mathutils.h"
+#include "game/mathutils.h"
 #include <memory>
 
 class ClassicSprite;

src/classicgame/classicgame.h

@@ -2,7 +2,7 @@
 #define CLASSICGAME_H
 
 #include <map>
-#include "game.h"
+#include "game/game.h"
 #include "classicactions.h"
 #include <SFML/Audio/SoundBuffer.hpp>
 #include <SFML/Audio/Sound.hpp>

src/classicgame/classicgraphicsmanager.h

@@ -1,7 +1,7 @@
 #pragma once
 
+#include "game/spritecontainer.h"
 #include "classicactions.h"
-#include "spritecontainer.h"
 #include "classicspritefactory.h"
 
 #include <SFML/Graphics/RenderTarget.hpp>

src/classicgame/classicmapcreator.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "note.h"
+#include "game/mathutils.h"
 #include "classicgraphicsmanager.h"
 
 struct Beatmap

src/classicgame/classicnote.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "note.h"
-#include "precisionevaluator.h"
+#include "game/note.h"
+#include "game/precisionevaluator.h"
 #include "classicactions.h"
 
 #include <memory>

src/classicgame/classicsprite.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "mathutils.h"
-#include "sprite.h"
+#include "game/mathutils.h"
+#include "game/sprite.h"
 #include "SFML/Graphics/RectangleShape.hpp"
 #include "SFML/Graphics/Text.hpp"
 

src/classicgame/classictimeline.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "timeline.h"
+#include "game/timeline.h"
 
 #include <SFML/Audio/Music.hpp>
 #include <SFML/System/Clock.hpp>