diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-03-23 15:12:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 15:12:06 -0400 |
| commit | e93f0de8a4bcf9f201347fba21a12960ffa3c15f (patch) | |
| tree | d266cdfbe7b79ea88f8515095fd3b4754cc2b398 /Source/Core/DolphinQt/TAS/TASInputWindow.cpp | |
| parent | 18979129f35f56de9f87e2a7919788679337abfa (diff) | |
| parent | ddb82a5e8ca84df1b95942c8b3a1fa6c9071010b (diff) | |
Merge pull request #13295 from jordan-woyak/controller-emu-cleanup
InputCommon/ControllerEmu: Break out functionality of EmulatedController to eliminate redundant members.
Diffstat (limited to 'Source/Core/DolphinQt/TAS/TASInputWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/TAS/TASInputWindow.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp index d3dc078375..8075c6af58 100644 --- a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp @@ -17,11 +17,8 @@ #include <QSpinBox> #include <QVBoxLayout> -#include "Common/CommonTypes.h" - #include "DolphinQt/Host.h" #include "DolphinQt/QtUtils/AspectRatioWidget.h" -#include "DolphinQt/QtUtils/QueueOnObject.h" #include "DolphinQt/Resources.h" #include "DolphinQt/TAS/StickWidget.h" #include "DolphinQt/TAS/TASCheckBox.h" @@ -250,14 +247,12 @@ std::optional<ControlState> TASInputWindow::GetButton(TASCheckBox* checkbox, std::optional<ControlState> TASInputWindow::GetSpinBox(TASSpinBox* spin, int zero, int min, int max, ControlState controller_state) { - const int controller_value = - ControllerEmu::EmulatedController::MapFloat<int>(controller_state, zero, 0, max); + const int controller_value = ControllerEmu::MapFloat<int>(controller_state, zero, 0, max); if (m_use_controller->isChecked()) spin->OnControllerValueChanged(controller_value); - return ControllerEmu::EmulatedController::MapToFloat<ControlState, int>(spin->GetValue(), zero, - min, max); + return ControllerEmu::MapToFloat<ControlState, int>(spin->GetValue(), zero, min, max); } std::optional<ControlState> TASInputWindow::GetSpinBox(TASSpinBox* spin, int zero, |
