Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230

merge.

1 files changed, 20 insertions, 16 deletions

diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index 704be7e..fb63d77 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -5,28 +5,32 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>  // Include this header for glm::rotate
 
+void Camera::updateViewMatrix(SceneCameraData cameraData) {
+    m_viewMatrix = Vec4Ops::getViewMatrix4(cameraData.look, cameraData.up, cameraData.over);
+    //  add settings.xy rotation
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xy), glm::vec3(0.f, 1.f, 0.f));
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.yz), glm::vec3(1.f, 0.f, 0.f));
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xz), glm::vec3(0.f, 0.f, 1.f));
+
+    m_translationVector = -cameraData.pos;
+
+    m_inverseViewMatrix = glm::inverse(m_viewMatrix);
+    m_inverseTranslationVector = -m_translationVector;
+    m_controlPoints = {
+            {cameraData.pos[0], cameraData.pos[1], cameraData.pos[2]},
+            {cameraData.pos[0], cameraData.pos[1] - 2.f, cameraData.pos[2] - 2.f},
+            {cameraData.pos[0] + 2.f, cameraData.pos[1] + 2.f, cameraData.pos[2] -2.f},
+            {cameraData.pos[0] + 2.f, cameraData.pos[1], cameraData.pos[2]}
+    };
+}
+
 Camera::Camera(SceneCameraData cameraData) :
     m_pos(cameraData.pos),
     m_heightAngle(cameraData.heightAngle),
     m_focalLength(cameraData.focalLength),
     m_aperture(cameraData.aperture)
 {
-     m_viewMatrix = Vec4Ops::getViewMatrix4(cameraData.look, cameraData.up, cameraData.over);
-    //  add settings.xy rotation
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xy), glm::vec3(0.f, 1.f, 0.f));
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.yz), glm::vec3(1.f, 0.f, 0.f));
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xz), glm::vec3(0.f, 0.f, 1.f));
-
-     m_translationVector = -cameraData.pos;
-
-     m_inverseViewMatrix = glm::inverse(m_viewMatrix);
-     m_inverseTranslationVector = -m_translationVector;
-     m_controlPoints = {
-        {cameraData.pos[0], cameraData.pos[1], cameraData.pos[2]},
-        {cameraData.pos[0], cameraData.pos[1] - 2.f, cameraData.pos[2] - 2.f},
-        {cameraData.pos[0] + 2.f, cameraData.pos[1] + 2.f, cameraData.pos[2] -2.f},
-        {cameraData.pos[0] + 2.f, cameraData.pos[1], cameraData.pos[2]}
-     };
+    updateViewMatrix(cameraData);
 }
 
 glm::mat4 Camera::getViewMatrix() const {