X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.cpp;h=4bbb0f12f0fadb6955bf230d99a88fa116d65355;hb=f62562b0f87d571bd7b32ae2f8ca659c24e9911b;hp=21df87414cee2ce382a3e2014efb94187c602240;hpb=ea1ce7b0fb7709ae56977480821ac96a231a0686;p=blank.git

diff --git a/src/camera.cpp b/src/camera.cpp
index 21df874..4bbb0f1 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -7,18 +7,13 @@
 namespace blank {
 
 Camera::Camera()
-: fov(45.0f)
+: FPSController()
+, fov(45.0f)
 , aspect(1.0f)
 , near_clip(0.1f)
 , far_clip(100.0f)
-, model()
 , projection(glm::perspective(fov, aspect, near_clip, far_clip))
-, view(model.Transform())
-, vp(projection * view) {
-
-}
-
-Camera::~Camera() {
+, view(glm::inverse(Transform())) {
 
 }
 
@@ -52,15 +47,23 @@ void Camera::Clip(float near, float far) {
 	UpdateProjection();
 }
 
+Ray Camera::Aim() const {
+	const glm::mat4 inv_vp(glm::inverse(projection * view));
+	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);
-	vp = projection * view;
+
+void Camera::Update(int dt) {
+	FPSController::Update(dt);
+	view = glm::inverse(Transform());
 }
 
-void Camera::UpdateView() {
-	view = glm::inverse(model.Transform());
-	vp = projection * view;
+void Camera::UpdateProjection() {
+	projection = glm::perspective(fov, aspect, near_clip, far_clip);
 }
 
 }