aboutsummaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/camera.cpp12
-rw-r--r--src/camera/camera.h4
2 files changed, 13 insertions, 3 deletions
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index b63164b..4cc9e56 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -1,6 +1,6 @@
#include <stdexcept>
#include "camera.h"
-#include "4dvecops/vec4ops.h"
+#include "vec4ops/vec4ops.h"
Camera::Camera(SceneCameraData cameraData) :
m_pos(cameraData.pos),
@@ -23,7 +23,15 @@ glm::mat4 Camera::getViewMatrix() const {
glm::mat4 Camera::getInverseViewMatrix() const {
// Optional TODO: implement the getter or make your own design
- return m_inverse;
+ return m_inverseViewMatrix;
+}
+
+glm::vec3 Camera::getTranslationVector() const {
+ return m_translationVector;
+}
+
+glm::vec3 Camera::getInverseTranslationVector() const {
+ return m_inverseTranslationVector;
}
float Camera::getAspectRatio() const {
diff --git a/src/camera/camera.h b/src/camera/camera.h
index 4fa9ab0..5059655 100644
--- a/src/camera/camera.h
+++ b/src/camera/camera.h
@@ -16,6 +16,8 @@ public:
// You might also want to define another function that return the inverse of the view matrix.
glm::mat4 getViewMatrix() const;
glm::mat4 getInverseViewMatrix() const;
+ glm::vec3 getTranslationVector() const;
+ glm::vec3 getInverseTranslationVector() const;
// Returns the aspect ratio of the camera.
float getAspectRatio() const;
@@ -39,7 +41,7 @@ public:
private:
glm::mat4 m_viewMatrix;
- glm::mat4 m_inverse;
+ glm::mat4 m_inverseViewMatrix;
float m_heightAngle;
glm::vec3 m_pos;