X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.hpp;h=1477a47ad1703d5ce7e2f0eb07be5a486cc4d35a;hb=4ef32c5a4a5bdb6da8383f66d8265715eb2ed4f9;hp=33c69d373fd3327dea38e4cbc92ba9b29e7cfce4;hpb=81531352f0af10ef357e82595098fa596795f000;p=blank.git

diff --git a/src/camera.hpp b/src/camera.hpp
index 33c69d3..1477a47 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -3,32 +3,24 @@
 
 #include <glm/glm.hpp>
 
-#include "controller.hpp"
-
 
 namespace blank {
 
-class Camera
-: public FPSController {
+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 Update(int dt);
+	const glm::mat4 &Projection() { return projection; }
 
 private:
 	void UpdateProjection();
@@ -40,7 +32,6 @@ private:
 	float far_clip;
 
 	glm::mat4 projection;
-	glm::mat4 vp;
 
 };