From d5bc209eb6b1db89558a37602ae229b8e44caa16 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 12 Jun 2020 00:21:50 -0500 Subject: [PATCH] VideoCommon: Change 'Zoom' to 'MoveForward' since it really isn't a zoom --- Source/Core/VideoCommon/FreeLookCamera.cpp | 10 +++++----- Source/Core/VideoCommon/FreeLookCamera.h | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoCommon/FreeLookCamera.cpp b/Source/Core/VideoCommon/FreeLookCamera.cpp index 44907f7e70..7d498482ae 100644 --- a/Source/Core/VideoCommon/FreeLookCamera.cpp +++ b/Source/Core/VideoCommon/FreeLookCamera.cpp @@ -54,7 +54,7 @@ public: m_mat = Common::Matrix44::Translate(Common::Vec3{amt, 0, 0}) * m_mat; } - void Zoom(float amt) override + void MoveForward(float amt) override { m_mat = Common::Matrix44::Translate(Common::Vec3{0, 0, amt}) * m_mat; } @@ -97,7 +97,7 @@ public: m_position += right * amt; } - void Zoom(float amt) override + void MoveForward(float amt) override { Common::Vec3 forward{m_rotate_mat.data[8], m_rotate_mat.data[9], m_rotate_mat.data[10]}; m_position += forward * amt; @@ -150,7 +150,7 @@ public: void MoveHorizontal(float) override {} - void Zoom(float amt) override + void MoveForward(float amt) override { m_distance += -1 * amt; m_distance = std::clamp(m_distance, 0.0f, m_distance); @@ -221,9 +221,9 @@ void FreeLookCamera::MoveHorizontal(float amt) m_dirty = true; } -void FreeLookCamera::Zoom(float amt) +void FreeLookCamera::MoveForward(float amt) { - m_camera_controller->Zoom(amt); + m_camera_controller->MoveForward(amt); m_dirty = true; } diff --git a/Source/Core/VideoCommon/FreeLookCamera.h b/Source/Core/VideoCommon/FreeLookCamera.h index a3e032e55d..76bb53f0c5 100644 --- a/Source/Core/VideoCommon/FreeLookCamera.h +++ b/Source/Core/VideoCommon/FreeLookCamera.h @@ -29,7 +29,7 @@ public: virtual void MoveVertical(float amt) = 0; virtual void MoveHorizontal(float amt) = 0; - virtual void Zoom(float amt) = 0; + virtual void MoveForward(float amt) = 0; virtual void Rotate(const Common::Vec3& amt) = 0; @@ -47,8 +47,7 @@ public: void MoveVertical(float amt); void MoveHorizontal(float amt); - - void Zoom(float amt); + void MoveForward(float amt); void Rotate(const Common::Vec3& amt);