X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.hpp;h=a8e0f2d00f3fdafda8df72d5533e4f86cbfe7c3c;hb=0e3f96ecb9ade07a7b831078fee025aff44d44d4;hp=99f0dc4fbad0b168249c20e18fc97797a19524ad;hpb=6f94235a5b7c140852703e60c8a74760b8b61d99;p=blank.git

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 99f0dc4..a8e0f2d 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -1,14 +1,16 @@
 #ifndef BLANK_APP_APPLICATION_HPP_
 #define BLANK_APP_APPLICATION_HPP_
 
+#include "Assets.hpp"
+#include "FrameCounter.hpp"
 #include "init.hpp"
 #include "RandomWalk.hpp"
-#include "../graphics/BlockLighting.hpp"
-#include "../graphics/Camera.hpp"
-#include "../graphics/DirectionalLighting.hpp"
+#include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
+#include <SDL.h>
+
 
 namespace blank {
 
@@ -43,6 +45,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
@@ -51,16 +54,11 @@ public:
 	static Entity &MakeTestEntity(World &);
 
 private:
-	InitSDL init_sdl;
-	InitIMG init_img;
-	InitGL init_gl;
-	Window window;
-	GLContext ctx;
-	InitGLEW init_glew;
-	BlockLighting chunk_prog;
-	DirectionalLighting entity_prog;
-
-	Camera cam;
+	Init init;
+	Viewport viewport;
+	Assets assets;
+	FrameCounter counter;
+
 	World world;
 	Interface interface;