X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.hpp;h=1477a47ad1703d5ce7e2f0eb07be5a486cc4d35a;hb=4ef32c5a4a5bdb6da8383f66d8265715eb2ed4f9;hp=5be71e24295a7142f0bc2db146d1a3f3c2065ea8;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git diff --git a/src/camera.hpp b/src/camera.hpp index 5be71e2..1477a47 100644 --- a/src/camera.hpp +++ b/src/camera.hpp @@ -10,29 +10,20 @@ class Camera { public: Camera(); - ~Camera(); - - Camera(const Camera &) = delete; - Camera &operator =(const Camera &) = delete; - - glm::mat4 MakeMVP(const glm::mat4 &m) const { return vp * m; } void Viewport(int width, int height); void Viewport(int x, int y, int width, int height); + /// FOV in radians void FOV(float f); void Aspect(float r); 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(); } + const glm::mat4 &Projection() { return projection; } private: void UpdateProjection(); - void UpdateView(); private: float fov; @@ -40,13 +31,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; };