From 62c7e79578bd53b567760969e6d85ded510702e1 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Wed, 13 Dec 2023 02:27:47 -0500 Subject: use parallel --- src/camera/camera.cpp | 5 +++++ src/camera/camera.h | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/camera') diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 5097b6c..78ae483 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -32,6 +32,11 @@ glm::mat4 Camera::getInverseViewMatrix() const { return m_inverseViewMatrix; } +glm::vec4 Camera::getPos() const { + // Optional TODO: implement the getter or make your own design + return m_pos; +} + glm::vec4 Camera::getTranslationVector() const { return m_translationVector; } diff --git a/src/camera/camera.h b/src/camera/camera.h index a6e8c0a..08750fb 100644 --- a/src/camera/camera.h +++ b/src/camera/camera.h @@ -35,21 +35,21 @@ public: // You can ignore if you are not attempting to implement depth of field. float getAperture() const; - glm::vec3 getPos() const; + glm::vec4 getPos() const; float cameraDepth = -1.f; std::vector m_controlPoints; private: - glm::mat4 m_viewMatrix; - glm::mat4 m_inverseViewMatrix; + glm::mat4 m_viewMatrix{}; + glm::mat4 m_inverseViewMatrix{}; float m_heightAngle; - glm::vec3 m_pos; + glm::vec4 m_pos; float m_focalLength; float m_aperture; - glm::vec4 m_translationVector; - glm::vec4 m_inverseTranslationVector; + glm::vec4 m_translationVector{}; + glm::vec4 m_inverseTranslationVector{}; }; -- cgit v1.2.3-70-g09d2