From 05327fbe7a62f6ab67c3a27aec7a28c66e7d5127 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 16 Jul 2014 23:28:40 -0700 Subject: [PATCH] =?UTF-8?q?Missed=20a=20few=20things=20when=20I=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed the (viewing) angle member - Added Up and Right vectors --- src/camera.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/camera.h b/src/camera.h index f9ccc80..b6e3551 100644 --- a/src/camera.h +++ b/src/camera.h @@ -29,19 +29,21 @@ public: float get_angle() const; virtual Ray compute_primary_ray(const int &x, const int &y) const = 0; + const Vector3& GetRight() const; + void SetRight(const Vector3& right); + const Vector3& GetUp() const; + void SetUp(const Vector3& up); + private: - // Pixel dimensions of the image plane. - int pwidth, pheight; - // Size of the image plane. Vector3 height, width; // Direction. A normalized vector defining where the camera is pointed. Vector3 direction; + Vector3 mRight; + Vector3 mUp; - // Horizontal viewing angle. - float angle; };