From ab9ece9bcab8a6d55dbe6f3a904d49231e5f73e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Tue, 26 Dec 2017 00:38:44 +0100 Subject: Replace MathUtil::Clamp with std::clamp --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp index dd5bc87887..410cf87b33 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp @@ -109,7 +109,7 @@ Cursor::StateData Cursor::GetState(const bool adjusted) // Smooth out z movement: // FYI: Not using relative input for Z. - m_state.z += MathUtil::Clamp(z - m_state.z, -max_z_step, max_z_step); + m_state.z += std::clamp(z - m_state.z, -max_z_step, max_z_step); // Relative input: if (m_relative_setting.GetValue()) @@ -122,8 +122,8 @@ Cursor::StateData Cursor::GetState(const bool adjusted) } else { - m_state.x = MathUtil::Clamp(m_state.x + input.x * max_step, -1.0, 1.0); - m_state.y = MathUtil::Clamp(m_state.y + input.y * max_step, -1.0, 1.0); + m_state.x = std::clamp(m_state.x + input.x * max_step, -1.0, 1.0); + m_state.y = std::clamp(m_state.y + input.y * max_step, -1.0, 1.0); } } // Absolute input: -- cgit v1.2.3