From 5381d9e423529567153bdb89799702ba092c9448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 May 2012 17:49:20 +0200 Subject: [PATCH] Camera: stronly typed AspectRatioPolicy enum. --- src/Camera.cpp | 6 +++--- src/Camera.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Camera.cpp b/src/Camera.cpp index 5dc595899..f729afb1f 100644 --- a/src/Camera.cpp +++ b/src/Camera.cpp @@ -20,7 +20,7 @@ using namespace std; namespace Magnum { -Camera::Camera(Object* parent): Object(parent), _aspectRatioPolicy(Extend) {} +Camera::Camera(Object* parent): Object(parent), _aspectRatioPolicy(AspectRatioPolicy::Extend) {} void Camera::setOrthographic(GLfloat size, GLfloat near, GLfloat far) { _near = near; @@ -83,14 +83,14 @@ void Camera::fixAspectRatio() { } /* Extend on larger side = scale larger side down */ - if(_aspectRatioPolicy == Extend) { + if(_aspectRatioPolicy == AspectRatioPolicy::Extend) { _projectionMatrix = ((_viewport.x() > _viewport.y()) ? Matrix4::scaling({GLfloat(_viewport.y())/_viewport.x(), 1, 1}) : Matrix4::scaling({1, GLfloat(_viewport.x())/_viewport.y(), 1}) )*rawProjectionMatrix; /* Clip on smaller side = scale smaller side up */ - } else if(_aspectRatioPolicy == Clip) { + } else if(_aspectRatioPolicy == AspectRatioPolicy::Clip) { _projectionMatrix = ((_viewport.x() > _viewport.y()) ? Matrix4::scaling({1, GLfloat(_viewport.x())/_viewport.y(), 1}) : Matrix4::scaling({GLfloat(_viewport.y())/_viewport.x(), 1, 1}) diff --git a/src/Camera.h b/src/Camera.h index 136962673..3ecf89cdc 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -41,10 +41,10 @@ class MAGNUM_EXPORT Camera: public Object { }; /** @brief Aspect ratio policy */ - enum AspectRatioPolicy { - NotPreserved, /**< @brief Don't preserve aspect ratio */ - Extend, /**< @brief Extend on larger side of view */ - Clip /**< @brief Clip on smaller side of view */ + enum class AspectRatioPolicy { + NotPreserved, /**< Don't preserve aspect ratio */ + Extend, /**< Extend on larger side of view */ + Clip /**< Clip on smaller side of view */ }; /** @brief Set feature */