X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.hpp;h=bae8435a0084811151300e825b9c5fec402f35d8;hb=74b5bd523b0312ee71f0443789bb40f1476054a4;hp=5909e3ba1437500497b69cee79925b4c5e267059;hpb=bfa8d0303d57e62fb73dad96d1b521760d475cf8;p=blank.git

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 5909e3b..bae8435 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -1,34 +1,20 @@
 #ifndef BLANK_APP_APPLICATION_HPP_
 #define BLANK_APP_APPLICATION_HPP_
 
-#include "Assets.hpp"
-#include "FrameCounter.hpp"
-#include "RandomWalk.hpp"
-#include "../audio/Audio.hpp"
-#include "../graphics/Viewport.hpp"
-#include "../ui/Interface.hpp"
-#include "../world/World.hpp"
-
 #include <SDL.h>
+#include <stack>
 
 
 namespace blank {
 
+class Environment;
+class State;
 class Window;
 
 class Application {
 
 public:
-	struct Config {
-		bool vsync = true;
-		bool doublebuf = true;
-		int multisampling = 1;
-
-		Interface::Config interface = Interface::Config();
-		World::Config world = World::Config();
-	};
-
-	Application(Window &, const Config &);
+	explicit Application(Environment &);
 	~Application();
 
 	Application(const Application &) = delete;
@@ -48,27 +34,22 @@ public:
 
 	/// process all events in SDL's queue
 	void HandleEvents();
+	void Handle(const SDL_Event &);
 	void Handle(const SDL_WindowEvent &);
 	/// integrate to the next step with dt milliseconds passed
 	void Update(int dt);
 	/// push the current state to display
 	void Render();
 
-	static Entity &MakeTestEntity(World &);
+	void PushState(State *);
+	State *PopState();
+	State *SwitchState(State *);
+	State &GetState();
+	bool HasState() const noexcept;
 
 private:
-	Window &window;
-	Viewport viewport;
-	Assets assets;
-	Audio audio;
-	FrameCounter counter;
-
-	World world;
-	Interface interface;
-
-	RandomWalk test_controller;
-
-	bool running;
+	Environment &env;
+	std::stack<State *> states;
 
 };