diff options
author | sotech117 <michael_foiani@brown.edu> | 2023-12-13 15:36:52 -0500 |
---|---|---|
committer | sotech117 <michael_foiani@brown.edu> | 2023-12-13 15:36:52 -0500 |
commit | 6e27cd596611758bf82f58cff25ad6310bb5ad6e (patch) | |
tree | 6794163f31433cf63475956859abebf3c2cb1fa6 /src/camera/camera.cpp | |
parent | 4a1527bdb10f8953fa3f387f5cb3144805541738 (diff) |
add translation of camera
Diffstat (limited to 'src/camera/camera.cpp')
-rw-r--r-- | src/camera/camera.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index fb63d77..69f2787 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -7,12 +7,14 @@ 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; + + // TODO: link sliders here. make them smaller changes since our objects are so small + glm::vec4 uiTranslation = glm::vec4(settings.xw, settings.yw, 0.f, settings.zw); + m_translationVector = -cameraData.pos + uiTranslation; m_inverseViewMatrix = glm::inverse(m_viewMatrix); m_inverseTranslationVector = -m_translationVector; |