begun extracting model class

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 9ec5f1f9b7de81c710aa74c9ce60247a995f86ca..4e381a2a2fa6d7e388ab3884ad7dc33f0227eaf5 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -4,7 +4,9 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
+#include "camera.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -27,14 +29,17 @@ public:
 
 private:
        InitSDL init_sdl;
+       InitIMG init_img;
        InitGL init_gl;
        Window window;
        GLContext ctx;
        InitGLEW init_glew;
        Program program;
 
+       Camera cam;
+       Model model;
+
        GLuint vtx_buf;
-       glm::mat4 mvp;
        GLuint mvp_handle;
 
        bool running;