move controller from camera to world

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 9534da7ec1d6f3a0677dda703e2dfea4bb19d63d..0443942108906b14e59dcaf87b10ff17fae1a376 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,6 +6,7 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
@@ -38,20 +39,16 @@ private:
        InitGLEW init_glew;
        DirectionalLighting program;
 
-       float move_velocity;
-       float pitch_sensitivity;
-       float yaw_sensitivity;
-
        Camera cam;
+       HUD hud;
        World world;
-       OutlineModel outline;
 
+       OutlineModel outline;
        bool outline_visible;
        glm::mat4 outline_transform;
 
        bool running;
 
-       bool front, back, left, right, up, down;
        bool place, remove, pick;
 
        int remove_id;