random walk test controller

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 8bafb2368d4f685c7b60f629e5bcd39e6b883fca..413b6f19869430f22b665d690d4d8a67cd0ff50d 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -1,13 +1,12 @@
 #ifndef BLANK_APP_HPP_
 #define BLANK_APP_HPP_
 
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
-#include "model.hpp"
+#include "interface.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -16,17 +15,27 @@ class Application {
 
 public:
        Application();
-       ~Application();
 
        Application(const Application &) = delete;
        Application &operator =(const Application &) = delete;
 
+       /// run until user quits
        void Run();
        void Loop(int dt);
 
+       /// run for n frames
+       void RunN(size_t n);
+       /// run for t milliseconds
+       void RunT(size_t t);
+       /// run for n frames, assuming t milliseconds for each
+       void RunS(size_t n, size_t t);
+
        void HandleEvents();
+       void Update(int dt);
        void Render();
 
+       static Entity &MakeTestEntity(World &);
+
 private:
        InitSDL init_sdl;
        InitIMG init_img;
@@ -34,16 +43,13 @@ private:
        Window window;
        GLContext ctx;
        InitGLEW init_glew;
-       Program program;
-
-       float pitch_sensitivity;
-       float yaw_sensitivity;
+       DirectionalLighting program;
 
        Camera cam;
-       Model model;
+       World world;
+       Interface interface;
 
-       GLuint vtx_buf;
-       GLuint mvp_handle;
+       RandomWalk test_controller;
 
        bool running;