move RandomWalk into new "ai" module

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

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 99f0dc4fbad0b168249c20e18fc97797a19524ad..9644794c1e7d54a9ff5bade9b0c9a0f9c155a5d5 100644 (file)
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -1,17 +1,21 @@
 #ifndef BLANK_APP_APPLICATION_HPP_
 #define BLANK_APP_APPLICATION_HPP_
 
-#include "init.hpp"
-#include "RandomWalk.hpp"
-#include "../graphics/BlockLighting.hpp"
-#include "../graphics/Camera.hpp"
-#include "../graphics/DirectionalLighting.hpp"
+#include "Assets.hpp"
+#include "FrameCounter.hpp"
+#include "../ai/RandomWalk.hpp"
+#include "../audio/Audio.hpp"
+#include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
+#include <SDL.h>
+
 
 namespace blank {
 
+class Window;
+
 class Application {
 
 public:
@@ -24,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;
@@ -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
@@ -51,16 +57,12 @@ 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;
+       Window &window;
+       Viewport viewport;
+       Assets assets;
+       Audio audio;
+       FrameCounter counter;
+
        World world;
        Interface interface;