X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.hpp;h=1ab086aeb66d257ac3c773f0cf1ae37dc30f6042;hb=49c81f76b80e0de99ca57db49510eb5e3385e1d1;hp=5be71e24295a7142f0bc2db146d1a3f3c2065ea8;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git diff --git a/src/camera.hpp b/src/camera.hpp index 5be71e2..1ab086a 100644 --- a/src/camera.hpp +++ b/src/camera.hpp @@ -3,10 +3,13 @@ #include +#include "model.hpp" + namespace blank { -class Camera { +class Camera +: public Model { public: Camera(); @@ -25,14 +28,10 @@ public: void Aspect(float w, float h); void Clip(float near, float far); - void Position(glm::vec3 pos) { position = pos; UpdateView(); } - void Move(glm::vec3 delta) { position += delta; UpdateView(); } - - void LookAt(glm::vec3 tgt) { target = tgt; UpdateView(); } + void Update(int dt); private: void UpdateProjection(); - void UpdateView(); private: float fov; @@ -40,12 +39,7 @@ private: float near_clip; float far_clip; - glm::vec3 position; - glm::vec3 target; - glm::vec3 up; - glm::mat4 projection; - glm::mat4 view; glm::mat4 vp; };