Merge pull request #13295 from jordan-woyak/controller-emu-cleanup

InputCommon/ControllerEmu: Break out functionality of EmulatedController to eliminate redundant members.
This commit is contained in:
JMC47
2025-03-23 15:12:06 -04:00
committed by GitHub
26 changed files with 312 additions and 245 deletions

View File

@ -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,