From eaea332f31d8f14caf2f4675779241ad30655fc3 Mon Sep 17 00:00:00 2001 From: David Doan Date: Wed, 13 Dec 2023 03:58:13 -0500 Subject: camera movement --- src/camera/camera.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/camera') diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 78ae483..704be7e 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -2,6 +2,8 @@ #include "camera.h" #include "vec4ops/vec4ops.h" #include "settings.h" +#include +#include // Include this header for glm::rotate Camera::Camera(SceneCameraData cameraData) : m_pos(cameraData.pos), @@ -10,6 +12,11 @@ Camera::Camera(SceneCameraData cameraData) : 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); -- cgit v1.2.3-70-g09d2