mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 22:29:39 -06:00
Replace MathUtil::Clamp with std::clamp
This commit is contained in:
@ -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:
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
#include "InputCommon/ControllerEmu/StickGate.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
||||
#include "Common/Common.h"
|
||||
@ -277,8 +278,8 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
|
||||
// Scale to the gate shape/radius:
|
||||
dist *= gate_max_dist;
|
||||
|
||||
return {MathUtil::Clamp(std::cos(angle) * dist, -1.0, 1.0),
|
||||
MathUtil::Clamp(std::sin(angle) * dist, -1.0, 1.0)};
|
||||
return {std::clamp(std::cos(angle) * dist, -1.0, 1.0),
|
||||
std::clamp(std::sin(angle) * dist, -1.0, 1.0)};
|
||||
}
|
||||
|
||||
} // namespace ControllerEmu
|
||||
|
@ -2,6 +2,7 @@
|
||||
// Licensed under GPLv2+
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cstdlib>
|
||||
#include <fcntl.h>
|
||||
@ -15,7 +16,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "Common/FileUtil.h"
|
||||
#include "Common/MathUtil.h"
|
||||
#include "Common/StringUtil.h"
|
||||
#include "InputCommon/ControllerInterface/ControllerInterface.h"
|
||||
#include "InputCommon/ControllerInterface/Pipes/Pipes.h"
|
||||
@ -123,7 +123,7 @@ void PipeDevice::AddAxis(const std::string& name, double value)
|
||||
|
||||
void PipeDevice::SetAxis(const std::string& entry, double value)
|
||||
{
|
||||
value = MathUtil::Clamp(value, 0.0, 1.0);
|
||||
value = std::clamp(value, 0.0, 1.0);
|
||||
double hi = std::max(0.0, value - 0.5) * 2.0;
|
||||
double lo = (0.5 - std::min(0.5, value)) * 2.0;
|
||||
auto search_hi = m_axes.find(entry + " +");
|
||||
|
@ -2,6 +2,7 @@
|
||||
// Licensed under GPLv2+
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
#include <fcntl.h>
|
||||
#include <libudev.h>
|
||||
|
Reference in New Issue
Block a user