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

InputCommon: List IMUAccelerometer's Up/Down inputs first for consistency.

This commit is contained in:
Jordan Woyak 2020-01-18 13:56:11 -06:00
parent dd7f9ed5da
commit a61dff67da
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
View File

@ -17,25 +17,24 @@ namespace ControllerEmu
IMUAccelerometer::IMUAccelerometer(std::string name, std::string ui_name) IMUAccelerometer::IMUAccelerometer(std::string name, std::string ui_name)
: ControlGroup(std::move(name), std::move(ui_name), GroupType::IMUAccelerometer) : ControlGroup(std::move(name), std::move(ui_name), GroupType::IMUAccelerometer)
{ {
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Up")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Down")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Left"))); controls.emplace_back(std::make_unique<Input>(Translate, _trans("Left")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Right"))); controls.emplace_back(std::make_unique<Input>(Translate, _trans("Right")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Forward"))); controls.emplace_back(std::make_unique<Input>(Translate, _trans("Forward")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Backward"))); controls.emplace_back(std::make_unique<Input>(Translate, _trans("Backward")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Up")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Down")));
} }
std::optional<IMUAccelerometer::StateData> IMUAccelerometer::GetState() const std::optional<IMUAccelerometer::StateData> IMUAccelerometer::GetState() const
{ {
StateData state; if (controls[0]->control_ref->BoundCount() == 0)
state.x = (controls[0]->control_ref->State() - controls[1]->control_ref->State());
state.y = (controls[3]->control_ref->State() - controls[2]->control_ref->State());
state.z = (controls[4]->control_ref->State() - controls[5]->control_ref->State());
if (controls[0]->control_ref->BoundCount() != 0)
return state;
else
return std::nullopt; return std::nullopt;
StateData state;
state.x = (controls[2]->control_ref->State() - controls[3]->control_ref->State());
state.y = (controls[5]->control_ref->State() - controls[4]->control_ref->State());
state.z = (controls[0]->control_ref->State() - controls[1]->control_ref->State());
return state;
} }
} // namespace ControllerEmu } // namespace ControllerEmu

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

@ -27,15 +27,14 @@ IMUGyroscope::IMUGyroscope(std::string name, std::string ui_name)
std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const
{ {
if (controls[0]->control_ref->BoundCount() == 0)
return std::nullopt;
StateData state; StateData state;
state.x = (controls[1]->control_ref->State() - controls[0]->control_ref->State()); state.x = (controls[1]->control_ref->State() - controls[0]->control_ref->State());
state.y = (controls[2]->control_ref->State() - controls[3]->control_ref->State()); state.y = (controls[2]->control_ref->State() - controls[3]->control_ref->State());
state.z = (controls[4]->control_ref->State() - controls[5]->control_ref->State()); state.z = (controls[4]->control_ref->State() - controls[5]->control_ref->State());
return state;
if (controls[0]->control_ref->BoundCount() != 0)
return state;
else
return std::nullopt;
} }
} // namespace ControllerEmu } // namespace ControllerEmu