X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.hpp;h=22e2ba598fd9f9990e228fda37f43f7878c0ca1f;hb=88620c3c816c47b32a90758f40efe5d02c50bbfa;hp=3adb800ce344b03da6a2261d5486c2ef4fd58365;hpb=6af76d9e1a6499ebdab405c1d679d24b9e19fded;p=blank.git

diff --git a/src/camera.hpp b/src/camera.hpp
index 3adb800..22e2ba5 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -3,23 +3,14 @@
 
 #include <glm/glm.hpp>
 
-#include "controller.hpp"
-#include "geometry.hpp"
-
 
 namespace blank {
 
-class Camera
-: public FPSController {
+class Camera {
 
 public:
 	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);
 
@@ -28,12 +19,7 @@ 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:
 	void UpdateProjection();
@@ -45,8 +31,6 @@ private:
 	float far_clip;
 
 	glm::mat4 projection;
-	glm::mat4 view;
-	glm::mat4 vp;
 
 };