X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.hpp;h=97cac73805b5ddad01c194e2f22d023830869d36;hb=5c295a495e02b4987b63c682406f5f29402c00da;hp=a3c62769164d9f5d7277aff0fb456caae0f5e1d2;hpb=282d731ea8f10342efa82012028de7043b3dd639;p=blank.git

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index a3c6276..97cac73 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -1,14 +1,19 @@
 #ifndef BLANK_APP_APPLICATION_HPP_
 #define BLANK_APP_APPLICATION_HPP_
 
+#include "Assets.hpp"
+#include "FrameCounter.hpp"
 #include "init.hpp"
 #include "RandomWalk.hpp"
+#include "../graphics/BlendedSprite.hpp"
 #include "../graphics/BlockLighting.hpp"
 #include "../graphics/Camera.hpp"
 #include "../graphics/DirectionalLighting.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
+#include <SDL.h>
+
 
 namespace blank {
 
@@ -43,6 +48,7 @@ public:
 
 	/// process all events in SDL's queue
 	void HandleEvents();
+	void Handle(const SDL_WindowEvent &);
 	/// integrate to the next step with dt milliseconds passed
 	void Update(int dt);
 	/// push the current state to display
@@ -58,8 +64,12 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
+	Assets assets;
+	FrameCounter counter;
+
 	BlockLighting chunk_prog;
 	DirectionalLighting entity_prog;
+	BlendedSprite sprite_prog;
 
 	Camera cam;
 	World world;