fix dec/rad error in camera FOV

[blank.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index fbf10bca2e1391a9f88522c0ba5ab9fe040475f1..7bf15bf66ccc1209101ce711c2b69c5cf14d72cb 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -1,5 +1,7 @@
 #include "camera.hpp"
 
+#include "geometry.hpp"
+
 #include <GL/glew.h>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -7,18 +9,11 @@
 namespace blank {
 
 Camera::Camera()
-: FPSController()
-, fov(45.0f)
+: fov(PI_0p25)
 , aspect(1.0f)
 , 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() {
+, far_clip(256.0f)
+, projection(glm::perspective(fov, aspect, near_clip, far_clip)) {
 
 }
 
@@ -53,12 +48,6 @@ void Camera::Clip(float near, float far) {
 }
 
 
-void Camera::Update(int dt) {
-       FPSController::Update(dt);
-       view = glm::inverse(Transform());
-       vp = projection * view;
-}
-
 void Camera::UpdateProjection() {
        projection = glm::perspective(fov, aspect, near_clip, far_clip);
 }