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

diff --git a/src/camera.hpp b/src/camera.hpp
index 88da8ca..1ab086a 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -8,7 +8,8 @@
 
 namespace blank {
 
-class Camera {
+class Camera
+: public Model {
 
 public:
 	Camera();
@@ -27,20 +28,10 @@ public:
 	void Aspect(float w, float h);
 	void Clip(float near, float far);
 
-	void Position(glm::vec3 pos) { model.Position(pos); UpdateView(); }
-	void Move(glm::vec3 delta) { model.Move(delta); UpdateView(); }
-
-	// all angles in radians (full circle = 2π)
-	float Pitch() const { return model.Pitch(); }
-	void Pitch(float p) { model.Pitch(p); UpdateView(); }
-	void RotatePitch(float delta) { model.RotatePitch(delta); UpdateView(); }
-	float Yaw() const { return model.Yaw(); }
-	void Yaw(float y) { model.Yaw(y); UpdateView(); }
-	void RotateYaw(float delta) { model.RotateYaw(delta); UpdateView(); }
+	void Update(int dt);
 
 private:
 	void UpdateProjection();
-	void UpdateView();
 
 private:
 	float fov;
@@ -48,10 +39,7 @@ private:
 	float near_clip;
 	float far_clip;
 
-	Model model;
-
 	glm::mat4 projection;
-	glm::mat4 view;
 	glm::mat4 vp;
 
 };