From 268f6782217e55d6c3ffe3b4970876e88fa2dc42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 2 Sep 2012 18:06:22 +0200
Subject: [PATCH] SceneGraph: Camera aspect ratio was not fixed after changing
 policy.

Also added test for projectionSize(), which couldn't be added before
because of gl*() calls.
---
 src/SceneGraph/Camera.cpp          |  6 +++++-
 src/SceneGraph/Camera.h            |  3 +--
 src/SceneGraph/Test/CameraTest.cpp | 15 ++++++++++++++-
 src/SceneGraph/Test/CameraTest.h   |  1 +
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/SceneGraph/Camera.cpp b/src/SceneGraph/Camera.cpp
index 4d6d3f305..13484dfdc 100644
--- a/src/SceneGraph/Camera.cpp
+++ b/src/SceneGraph/Camera.cpp
@@ -47,8 +47,12 @@ template Matrix4 aspectRatioFix<Matrix4>(AspectRatioPolicy, const Vector2&, cons
 
 template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::Camera(ObjectType* parent): ObjectType(parent), _aspectRatioPolicy(AspectRatioPolicy::NotPreserved) {}
 
-template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> void Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::setViewport(const Math::Vector2<GLsizei>& size) {
+template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> void Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::setAspectRatioPolicy(AspectRatioPolicy policy) {
+    _aspectRatioPolicy = policy;
+    fixAspectRatio();
+}
 
+template<class MatrixType, class VectorType, class ObjectType, class SceneType, class CameraType> void Camera<MatrixType, VectorType, ObjectType, SceneType, CameraType>::setViewport(const Math::Vector2<GLsizei>& size) {
     _viewport = size;
     fixAspectRatio();
 }
diff --git a/src/SceneGraph/Camera.h b/src/SceneGraph/Camera.h
index df3f82e61..b3104292c 100644
--- a/src/SceneGraph/Camera.h
+++ b/src/SceneGraph/Camera.h
@@ -73,7 +73,7 @@ template<class MatrixType, class VectorType, class ObjectType, class SceneType,
         inline AspectRatioPolicy aspectRatioPolicy() const { return _aspectRatioPolicy; }
 
         /** @brief Set aspect ratio policy */
-        void setAspectRatioPolicy(AspectRatioPolicy policy) { _aspectRatioPolicy = policy; }
+        void setAspectRatioPolicy(AspectRatioPolicy policy);
 
         /**
          * @brief Camera matrix
@@ -102,7 +102,6 @@ template<class MatrixType, class VectorType, class ObjectType, class SceneType,
          * @see projectionMatrix()
          */
         inline Vector2 projectionSize() const {
-            /** @todo Test this properly with fixAspectRatio() when Camera is free from gl*() calls */
             return {2.0f/_projectionMatrix[0].x(), 2.0f/_projectionMatrix[1].y()};
         }
 
diff --git a/src/SceneGraph/Test/CameraTest.cpp b/src/SceneGraph/Test/CameraTest.cpp
index 40dbcfa32..09e58dd7c 100644
--- a/src/SceneGraph/Test/CameraTest.cpp
+++ b/src/SceneGraph/Test/CameraTest.cpp
@@ -27,7 +27,8 @@ CameraTest::CameraTest() {
              &CameraTest::defaultProjection3D,
              &CameraTest::projection2D,
              &CameraTest::orthographic,
-             &CameraTest::perspective);
+             &CameraTest::perspective,
+             &CameraTest::projectionSizeViewport);
 }
 
 void CameraTest::fixAspectRatio() {
@@ -135,4 +136,16 @@ void CameraTest::perspective() {
     CORRADE_COMPARE(camera.projectionSize(), Vector2(0.48015756f));
 }
 
+void CameraTest::projectionSizeViewport() {
+    Camera3D camera;
+    camera.setViewport({200, 300});
+    CORRADE_COMPARE(camera.projectionSize(), Vector2(2.0f, 2.0f));
+
+    camera.setAspectRatioPolicy(Camera3D::AspectRatioPolicy::Extend);
+    CORRADE_COMPARE(camera.projectionSize(), Vector2(2.0f, 3.0f));
+
+    camera.setAspectRatioPolicy(Camera3D::AspectRatioPolicy::Clip);
+    CORRADE_COMPARE(camera.projectionSize(), Vector2(4.0f/3.0f, 2.0f));
+}
+
 }}}
diff --git a/src/SceneGraph/Test/CameraTest.h b/src/SceneGraph/Test/CameraTest.h
index 2bf0e93b5..2ada59d3b 100644
--- a/src/SceneGraph/Test/CameraTest.h
+++ b/src/SceneGraph/Test/CameraTest.h
@@ -29,6 +29,7 @@ class CameraTest: public Corrade::TestSuite::Tester<CameraTest> {
         void projection2D();
         void orthographic();
         void perspective();
+        void projectionSizeViewport();
 };
 
 }}}