basic aiming

[blank.git] / src / camera.hpp

diff --git a/src/camera.hpp b/src/camera.hpp
index 5be71e24295a7142f0bc2db146d1a3f3c2065ea8..419922a39f1c3ee32578b847d5c21c7f31a3a434 100644 (file)
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -3,10 +3,14 @@
 
 #include <glm/glm.hpp>
 
+#include "controller.hpp"
+#include "geometry.hpp"
+
 
 namespace blank {
 
-class Camera {
+class Camera
+: public FPSController {
 
 public:
        Camera();
@@ -25,14 +29,15 @@ 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(); }
+       Ray Aim() const;
+
+       const glm::mat4 &Projection() { return projection; }
+       const glm::mat4 &View() { return view; }
 
-       void LookAt(glm::vec3 tgt) { target = tgt; UpdateView(); }
+       void Update(int dt);
 
 private:
        void UpdateProjection();
-       void UpdateView();
 
 private:
        float fov;
@@ -40,10 +45,6 @@ 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;