summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup
diff options
context:
space:
mode:
authorJoshua Vandaƫle <joshua@vandaele.software>2026-06-28 08:33:40 +0200
committerJoshua Vandaƫle <joshua@vandaele.software>2026-07-13 02:32:33 +0200
commit6dcb0817a2cd1a507dbf5e3c42bf13623b5b5cae (patch)
tree3da2430b2edd92a2af41ee010b82da2b8ef09968 /Source/Core/InputCommon/ControllerEmu/ControlGroup
parent774200dcf4ccea148ef357cc8cf86d8eab4446da (diff)
MathUtil: C++20/23 modernisations
I've also created DegreesToRadians/RadiansToDegrees utility functions since there was a lot of repeated code
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
index 9ff06d4056..68a24dff25 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
@@ -99,7 +99,7 @@ OctagonAnalogStick::OctagonAnalogStick(const char* name_, const char* ui_name_,
ControlState OctagonAnalogStick::GetVirtualNotchSize() const
{
- return m_virtual_notch_setting.GetValue() * MathUtil::TAU / 360;
+ return MathUtil::DegreesToRadians(m_virtual_notch_setting.GetValue());
}
ControlState OctagonAnalogStick::GetGateRadiusAtAngle(double ang) const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
index 169846c947..431b25012f 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
@@ -167,12 +167,12 @@ Cursor::StateData Cursor::UpdateState(Cursor::ReshapeData input)
ControlState Cursor::GetTotalYaw() const
{
- return m_yaw_setting.GetValue() * MathUtil::TAU / 360;
+ return MathUtil::DegreesToRadians(m_yaw_setting.GetValue());
}
ControlState Cursor::GetTotalPitch() const
{
- return m_pitch_setting.GetValue() * MathUtil::TAU / 360;
+ return MathUtil::DegreesToRadians(m_pitch_setting.GetValue());
}
ControlState Cursor::GetVerticalOffset() const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
index d74c4df5eb..214d948f44 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
@@ -106,7 +106,7 @@ ControlState Force::GetReturnSpeed() const
ControlState Force::GetTwistAngle() const
{
- return m_angle_setting.GetValue() * MathUtil::TAU / 360;
+ return MathUtil::DegreesToRadians(m_angle_setting.GetValue());
}
ControlState Force::GetMaxDistance() const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
index f9a2b0fba0..033477aeb7 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
@@ -49,7 +49,7 @@ IMUCursor::IMUCursor(std::string name_, std::string ui_name_)
ControlState IMUCursor::GetTotalYaw() const
{
- return m_yaw_setting.GetValue() * MathUtil::TAU / 360;
+ return MathUtil::DegreesToRadians(m_yaw_setting.GetValue());
}
ControlState IMUCursor::GetAccelWeight() const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
index 316ed45f84..11bcad964a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
@@ -163,7 +163,7 @@ std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState(bool update)
ControlState IMUGyroscope::GetDeadzone() const
{
- return m_deadzone_setting.GetValue() / 360 * MathUtil::TAU;
+ return MathUtil::DegreesToRadians(m_deadzone_setting.GetValue());
}
bool IMUGyroscope::IsCalibrating() const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
index 5c604ef3d1..82b6eccb73 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
@@ -69,7 +69,7 @@ ControlState Tilt::GetDefaultInputRadiusAtAngle(double ang) const
ControlState Tilt::GetMaxRotationalVelocity() const
{
- return m_max_rotational_velocity.GetValue() * MathUtil::TAU;
+ return m_max_rotational_velocity.GetValue() * MathUtil::TAU_v<ControlState>;
}
Control* Tilt::GetModifierInput() const