moved entity spawn and control into its own class

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

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index 636b82e85899c389a7f69437a001495b638ec428..973234916a3afa541c2f2e41a544ef455e340521 100644 (file)
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -3,8 +3,7 @@
 
 #include "Assets.hpp"
 #include "FrameCounter.hpp"
-#include "init.hpp"
-#include "RandomWalk.hpp"
+#include "../ai/Spawner.hpp"
 #include "../audio/Audio.hpp"
 #include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
@@ -15,6 +14,8 @@
 
 namespace blank {
 
+class Window;
+
 class Application {
 
 public:
@@ -27,7 +28,7 @@ public:
                World::Config world = World::Config();
        };
 
-       explicit Application(const Config &);
+       Application(Window &, const Config &);
        ~Application();
 
        Application(const Application &) = delete;
@@ -53,10 +54,8 @@ public:
        /// push the current state to display
        void Render();
 
-       static Entity &MakeTestEntity(World &);
-
 private:
-       Init init;
+       Window &window;
        Viewport viewport;
        Assets assets;
        Audio audio;
@@ -65,7 +64,7 @@ private:
        World world;
        Interface interface;
 
-       RandomWalk test_controller;
+       Spawner spawner;
 
        bool running;