ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IMUGyroscope: make GetState update optional (on by default), fix const, clean code 

My future PRs will split the UI state from the Emulation State of some of these emulated
controller values and this readies the code for it.
This commit is contained in:
Filoppi 2021-05-05 00:04:47 +03:00
parent a19a0096db
commit 379ffc268d
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
View File

@ -12,7 +12,6 @@
#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/Control/Control.h"
#include "InputCommon/ControllerEmu/Control/Input.h"
namespace ControllerEmu namespace ControllerEmu
{ {
@ -52,13 +51,13 @@ IMUGyroscope::IMUGyroscope(std::string name_, std::string ui_name_)
3, 0, 30); 3, 0, 30);
} }
void IMUGyroscope::RestartCalibration() const void IMUGyroscope::RestartCalibration()
{ {
m_calibration_period_start = Clock::now(); m_calibration_period_start = Clock::now();
m_running_calibration.Clear(); m_running_calibration.Clear();
} }
void IMUGyroscope::UpdateCalibration(const StateData& state) const void IMUGyroscope::UpdateCalibration(const StateData& state)
{ {
const auto now = Clock::now(); const auto now = Clock::now();
const auto calibration_period = m_calibration_period_setting.GetValue(); const auto calibration_period = m_calibration_period_setting.GetValue();
@ -123,21 +122,36 @@ auto IMUGyroscope::GetRawState() const -> StateData
controls[4]->GetState() - controls[5]->GetState()); controls[4]->GetState() - controls[5]->GetState());
} }
std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const bool IMUGyroscope::AreInputsBound() const
{ {
if (std::all_of(controls.begin(), controls.end(), return std::all_of(controls.begin(), controls.end(),
[](const auto& control) { return control->control_ref->BoundCount() == 0; })) [](const auto& control) { return control->control_ref->BoundCount() > 0; });
}
bool IMUGyroscope::CanCalibrate() const
{
// If the input gate is disabled, miscalibration to zero values would occur.
return ControlReference::GetInputGate();
}
std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState(bool update)
{
if (!AreInputsBound())
{ {
// Set calibration to zero. if (update)
m_calibration = {}; {
RestartCalibration(); // Set calibration to zero.
m_calibration = {};
RestartCalibration();
}
return std::nullopt; return std::nullopt;
} }
auto state = GetRawState(); auto state = GetRawState();
// If the input gate is disabled, miscalibration to zero values would occur. // Alternatively we could open the control gate around GetRawState() while calibrating,
if (ControlReference::GetInputGate()) // but that would imply background input would temporarily be treated differently for our controls
if (update && CanCalibrate())
UpdateCalibration(state); UpdateCalibration(state);
state -= m_calibration; state -= m_calibration;

15
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h
View File

@ -23,7 +23,8 @@ public:
IMUGyroscope(std::string name, std::string ui_name); IMUGyroscope(std::string name, std::string ui_name);
StateData GetRawState() const; StateData GetRawState() const;
std::optional<StateData> GetState() const; // Also updates the state by default
std::optional<StateData> GetState(bool update = true);
// Value is in rad/s. // Value is in rad/s.
ControlState GetDeadzone() const; ControlState GetDeadzone() const;
@ -33,14 +34,16 @@ public:
private: private:
using Clock = std::chrono::steady_clock; using Clock = std::chrono::steady_clock;
void RestartCalibration() const; bool AreInputsBound() const;
void UpdateCalibration(const StateData&) const; bool CanCalibrate() const;
void RestartCalibration();
void UpdateCalibration(const StateData&);
SettingValue<double> m_deadzone_setting; SettingValue<double> m_deadzone_setting;
SettingValue<double> m_calibration_period_setting; SettingValue<double> m_calibration_period_setting;
mutable StateData m_calibration = {}; StateData m_calibration = {};
mutable MathUtil::RunningMean<StateData> m_running_calibration; MathUtil::RunningMean<StateData> m_running_calibration;
mutable Clock::time_point m_calibration_period_start = Clock::now(); Clock::time_point m_calibration_period_start = Clock::now();
}; };
} // namespace ControllerEmu } // namespace ControllerEmu