From 425ee13d3509d36c96f151c6c4eebc732eb7796b Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 17 Mar 2021 20:51:35 -0500 Subject: FreeLook: update camera and manager to use a delta time for movement (in case we decide to move this somewhere else in the future) --- Source/Core/VideoCommon/FreeLookCamera.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoCommon/FreeLookCamera.cpp') diff --git a/Source/Core/VideoCommon/FreeLookCamera.cpp b/Source/Core/VideoCommon/FreeLookCamera.cpp index 25eb2a7c89..99c504db4d 100644 --- a/Source/Core/VideoCommon/FreeLookCamera.cpp +++ b/Source/Core/VideoCommon/FreeLookCamera.cpp @@ -265,18 +265,18 @@ void FreeLookCamera::Rotate(const Common::Quaternion& amt) void FreeLookCamera::IncreaseFovX(float fov) { m_fov_x += fov; - m_fov_x = std::clamp(m_fov_x, m_fov_step_size, m_fov_x); + m_fov_x = std::clamp(m_fov_x, m_min_fov_multiplier, m_fov_x); } void FreeLookCamera::IncreaseFovY(float fov) { m_fov_y += fov; - m_fov_y = std::clamp(m_fov_y, m_fov_step_size, m_fov_y); + m_fov_y = std::clamp(m_fov_y, m_min_fov_multiplier, m_fov_y); } float FreeLookCamera::GetFovStepSize() const { - return m_fov_step_size; + return 1.5f; } void FreeLookCamera::Reset() @@ -287,14 +287,15 @@ void FreeLookCamera::Reset() m_dirty = true; } -void FreeLookCamera::ModifySpeed(float multiplier) +void FreeLookCamera::ModifySpeed(float amt) { - m_speed *= multiplier; + m_speed += amt; + m_speed = std::clamp(m_speed, 0.0f, m_speed); } void FreeLookCamera::ResetSpeed() { - m_speed = 1.0f; + m_speed = 60.0f; } float FreeLookCamera::GetSpeed() const -- cgit v1.2.3