mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 23:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

InputCommon: Add "Dead Zone" setting to raw gyro inputs.

Browse source
This commit is contained in:
Jordan Woyak 2020-02-03 19:45:36 -06:00
parent 2d6a72e941
commit 82a3aa5ff6
3 changed files with 88 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
View file

@ -7,6 +7,7 @@
#include <memory>
#include "Common/Common.h"
#include "Common/MathUtil.h"
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/Control/Control.h"
@ -23,6 +24,21 @@ IMUGyroscope::IMUGyroscope(std::string name, std::string ui_name)
AddInput(Translate, _trans("Roll Right"));
AddInput(Translate, _trans("Yaw Left"));
AddInput(Translate, _trans("Yaw Right"));
AddSetting(&m_deadzone_setting,
{_trans("Dead Zone"),
// i18n: "°/s" is the symbol for degrees (angular measurement) divided by seconds.
_trans("°/s"),
// i18n: Refers to the dead-zone setting of gyroscope input.
_trans("Angular velocity to ignore.")},
1, 0, 180);
}
auto IMUGyroscope::GetRawState() const -> StateData
{
return StateData(controls[1]->GetState() - controls[0]->GetState(),
controls[2]->GetState() - controls[3]->GetState(),
controls[4]->GetState() - controls[5]->GetState());
}
std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const
@ -30,11 +46,18 @@ std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const
if (controls[0]->control_ref->BoundCount() == 0)
return std::nullopt;
StateData state;
state.x = (controls[1]->GetState() - controls[0]->GetState());
state.y = (controls[2]->GetState() - controls[3]->GetState());
state.z = (controls[4]->GetState() - controls[5]->GetState());
auto state = GetRawState();
// Apply "deadzone".
for (auto& c : state.data)
c *= std::abs(c) > GetDeadzone();
return state;
}
ControlState IMUGyroscope::GetDeadzone() const
{
return m_deadzone_setting.GetValue() / 360 * MathUtil::TAU;
}
} // namespace ControllerEmu

8
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h
View file

@ -9,6 +9,7 @@
#include "Common/Matrix.h"
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
namespace ControllerEmu
{
@ -19,6 +20,13 @@ public:
IMUGyroscope(std::string name, std::string ui_name);
StateData GetRawState() const;
std::optional<StateData> GetState() const;
// Value is in rad/s.
ControlState GetDeadzone() const;
private:
SettingValue<double> m_deadzone_setting;
};
} // namespace ControllerEmu