X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.cpp;h=8804d115b36574cdab2618fb441f0d1a50958696;hb=4d0ef1687987a0801469c7262f81efd36636605a;hp=8309fe6414965b2a67d7c560f7c30e3d34227db6;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git

diff --git a/src/camera.cpp b/src/camera.cpp
index 8309fe6..8804d11 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -7,16 +7,14 @@
 namespace blank {
 
 Camera::Camera()
-: fov(45.0f)
+: FPSController()
+, fov(45.0f)
 , aspect(1.0f)
 , near_clip(0.1f)
 , far_clip(100.0f)
-, position(0, 0, 0)
-, target(0, 0, -1)
-, up(0, 1, 0)
 , projection(glm::perspective(fov, aspect, near_clip, far_clip))
-, view(glm::lookAt(position, target, up))
-, vp(projection * view) {
+, view(glm::inverse(Transform()))
+, vp(projection) {
 
 }
 
@@ -54,15 +52,24 @@ void Camera::Clip(float near, float far) {
 	UpdateProjection();
 }
 
+Ray Camera::Aim() const {
+	const glm::mat4 inv_vp(glm::inverse(vp));
+	glm::vec4 from = inv_vp * glm::vec4(0.0f, 0.0f, -1.0f, 1.0f);
+	from /= from.w;
+	glm::vec4 to = inv_vp * glm::vec4(0.0f, 0.0f, 1.0f, 1.0f);
+	to /= to.w;
+	return Ray{ glm::vec3(from), glm::normalize(glm::vec3(to - from)) };
+}
 
-void Camera::UpdateProjection() {
-	projection = glm::perspective(fov, aspect, near_clip, far_clip);
+
+void Camera::Update(int dt) {
+	FPSController::Update(dt);
+	view = glm::inverse(Transform());
 	vp = projection * view;
 }
 
-void Camera::UpdateView() {
-	view = glm::lookAt(position, target, up);
-	vp = projection * view;
+void Camera::UpdateProjection() {
+	projection = glm::perspective(fov, aspect, near_clip, far_clip);
 }
 
 }