X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.hpp;h=419922a39f1c3ee32578b847d5c21c7f31a3a434;hb=4d0ef1687987a0801469c7262f81efd36636605a;hp=1ab086aeb66d257ac3c773f0cf1ae37dc30f6042;hpb=49c81f76b80e0de99ca57db49510eb5e3385e1d1;p=blank.git

diff --git a/src/camera.hpp b/src/camera.hpp
index 1ab086a..419922a 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -3,13 +3,14 @@
 
 #include <glm/glm.hpp>
 
-#include "model.hpp"
+#include "controller.hpp"
+#include "geometry.hpp"
 
 
 namespace blank {
 
 class Camera
-: public Model {
+: public FPSController {
 
 public:
 	Camera();
@@ -28,6 +29,11 @@ public:
 	void Aspect(float w, float h);
 	void Clip(float near, float far);
 
+	Ray Aim() const;
+
+	const glm::mat4 &Projection() { return projection; }
+	const glm::mat4 &View() { return view; }
+
 	void Update(int dt);
 
 private:
@@ -40,6 +46,7 @@ private:
 	float far_clip;
 
 	glm::mat4 projection;
+	glm::mat4 view;
 	glm::mat4 vp;
 
 };