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

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 97cac73..a8e0f2d 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -5,10 +5,7 @@
 #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 "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
@@ -57,21 +54,11 @@ public:
 	static Entity &MakeTestEntity(World &);
 
 private:
-	InitSDL init_sdl;
-	InitIMG init_img;
-	InitTTF init_ttf;
-	InitGL init_gl;
-	Window window;
-	GLContext ctx;
-	InitGLEW init_glew;
+	Init init;
+	Viewport viewport;
 	Assets assets;
 	FrameCounter counter;
 
-	BlockLighting chunk_prog;
-	DirectionalLighting entity_prog;
-	BlendedSprite sprite_prog;
-
-	Camera cam;
 	World world;
 	Interface interface;