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

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 97cac73..9644794 100644
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -3,12 +3,9 @@
 
 #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 "../ai/RandomWalk.hpp"
+#include "../audio/Audio.hpp"
+#include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
@@ -17,6 +14,8 @@
 
 namespace blank {
 
+class Window;
+
 class Application {
 
 public:
@@ -29,7 +28,8 @@ public:
 		World::Config world = World::Config();
 	};
 
-	explicit Application(const Config &);
+	Application(Window &, const Config &);
+	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -57,21 +57,12 @@ 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;
+	Window &window;
+	Viewport viewport;
 	Assets assets;
+	Audio audio;
 	FrameCounter counter;
 
-	BlockLighting chunk_prog;
-	DirectionalLighting entity_prog;
-	BlendedSprite sprite_prog;
-
-	Camera cam;
 	World world;
 	Interface interface;