Use is_ortographic in Camera instead of checking fov directly

diff --git a/source/render/camera.cpp b/source/render/camera.cpp
index 7ffe0c155e60f6a6b968869901485a2c399fd7e6..6c85a7321d79af70adcda2a96d2f3c9e636fc4ad 100644 (file)
--- a/source/render/camera.cpp
+++ b/source/render/camera.cpp
@@ -148,16 +148,16 @@ bool Camera::is_in_frustum(const Renderable &renderable) const
 
 void Camera::update_projection_matrix()
 {
-       float frustum_h = (fov!=Geometry::Angle<float>::zero() ? tan(fov/2.0f)*clip_near : height/2);
+       float frustum_h = (is_orthographic() ? height/2 : tan(fov/2.0f)*clip_near);
        float frustum_w = frustum_h*aspect;
        float left = frustum_w*(frustum_x-1.0f);
        float right = frustum_w*(frustum_x+1.0f);
        float bottom = frustum_h*(frustum_y-1.0f);
        float top = frustum_h*(frustum_y+1.0f);
-       if(fov>Geometry::Angle<float>::zero())
-               proj_matrix = Matrix::frustum(left, right, bottom, top, clip_near, clip_far);
-       else
+       if(is_orthographic())
                proj_matrix = Matrix::ortho(left, right, bottom, top, clip_near, clip_far);
+       else
+               proj_matrix = Matrix::frustum(left, right, bottom, top, clip_near, clip_far);
        proj_matrix = Matrix::rotation(rotate, Vector3(0, 0, 1))*proj_matrix;
 
        shdata.uniform("clip_eye_matrix", proj_matrix);