simple HUD

[blank.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index 8804d115b36574cdab2618fb441f0d1a50958696..4bbb0f12f0fadb6955bf230d99a88fa116d65355 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -13,12 +13,7 @@ Camera::Camera()
 , near_clip(0.1f)
 , far_clip(100.0f)
 , projection(glm::perspective(fov, aspect, near_clip, far_clip))
-, view(glm::inverse(Transform()))
-, vp(projection) {
-
-}
-
-Camera::~Camera() {
+, view(glm::inverse(Transform())) {
 
 }
 
@@ -53,7 +48,7 @@ void Camera::Clip(float near, float far) {
 }
 
 Ray Camera::Aim() const {
-       const glm::mat4 inv_vp(glm::inverse(vp));
+       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);
@@ -65,7 +60,6 @@ Ray Camera::Aim() const {
 void Camera::Update(int dt) {
        FPSController::Update(dt);
        view = glm::inverse(Transform());
-       vp = projection * view;
 }
 
 void Camera::UpdateProjection() {