aboutsummaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-12-13 02:27:47 -0500
committersotech117 <michael_foiani@brown.edu>2023-12-13 02:27:52 -0500
commit62c7e79578bd53b567760969e6d85ded510702e1 (patch)
tree15ba5768c0e2f630b8513f47a1ef8bf2f3b5c125 /src/camera
parent7de05373a0423a24f9719b0158bc9a78e3238aef (diff)
use parallel
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/camera.cpp5
-rw-r--r--src/camera/camera.h12
2 files changed, 11 insertions, 6 deletions
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<glm::vec3> 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{};
};