move init out of Application class

[blank.git] / src / app / Application.hpp

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index ea7421161b9031e45aa9f54d78bff38c5be6db73..5909e3ba1437500497b69cee79925b4c5e267059 100644 (file)
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -2,12 +2,10 @@
 #define BLANK_APP_APPLICATION_HPP_
 
 #include "Assets.hpp"
-#include "init.hpp"
+#include "FrameCounter.hpp"
 #include "RandomWalk.hpp"
-#include "../graphics/BlendedSprite.hpp"
-#include "../graphics/BlockLighting.hpp"
-#include "../graphics/Camera.hpp"
-#include "../graphics/DirectionalLighting.hpp"
+#include "../audio/Audio.hpp"
+#include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
@@ -16,6 +14,8 @@
 
 namespace blank {
 
+class Window;
+
 class Application {
 
 public:
@@ -28,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;
@@ -56,20 +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;