summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2017-12-26 00:38:44 +0100
committerLéo Lam <leo@innovatetechnologi.es>2019-05-04 23:12:17 +0200
commitab9ece9bcab8a6d55dbe6f3a904d49231e5f73e1 (patch)
tree3993f73a513f6f80ecddff85882042b73da261da /Source/Core/InputCommon/ControllerEmu/ControlGroup
parent6f84984b7b0514227327b2e2c5ef10907d150b96 (diff)
Replace MathUtil::Clamp with std::clamp
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp6
1 files changed, 3 insertions, 3 deletions
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: