piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

ControllerEmu: Convert Translatability to enum class

Browse Source
This commit is contained in:
Dentomologist
2023-05-29 16:31:19 -07:00
parent c8559a7933
commit 527f8e783c
26 changed files with 137 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
View File

@ -27,9 +27,9 @@ AnalogStick::AnalogStick(const char* const name_, const char* const ui_name_,
: ReshapableInput(name_, ui_name_, GroupType::Stick), m_stick_gate(std::move(stick_gate))
{
for (auto& named_direction : named_directions)
AddInput(Translate, named_direction);
AddInput(Translatability::Translate, named_direction);
AddInput(Translate, _trans("Modifier"));
AddInput(Translatability::Translate, _trans("Modifier"));
}
AnalogStick::ReshapeData AnalogStick::GetReshapableState(bool adjusted) const

8
Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
View File

@ -25,12 +25,12 @@ Cursor::Cursor(std::string name_, std::string ui_name_)
m_last_update(Clock::now())
{
for (auto& named_direction : named_directions)
AddInput(Translate, named_direction);
AddInput(Translatability::Translate, named_direction);
AddInput(Translate, _trans("Hide"));
AddInput(Translate, _trans("Recenter"));
AddInput(Translatability::Translate, _trans("Hide"));
AddInput(Translatability::Translate, _trans("Recenter"));
AddInput(Translate, _trans("Relative Input Hold"));
AddInput(Translatability::Translate, _trans("Relative Input Hold"));
// Default values chosen to reach screen edges in most games including the Wii Menu.

18
Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
View File

@ -17,12 +17,12 @@ namespace ControllerEmu
{
Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType::Force)
{
AddInput(Translate, _trans("Up"));
AddInput(Translate, _trans("Down"));
AddInput(Translate, _trans("Left"));
AddInput(Translate, _trans("Right"));
AddInput(Translate, _trans("Forward"));
AddInput(Translate, _trans("Backward"));
AddInput(Translatability::Translate, _trans("Up"));
AddInput(Translatability::Translate, _trans("Down"));
AddInput(Translatability::Translate, _trans("Left"));
AddInput(Translatability::Translate, _trans("Right"));
AddInput(Translatability::Translate, _trans("Forward"));
AddInput(Translatability::Translate, _trans("Backward"));
AddSetting(&m_distance_setting,
{_trans("Distance"),
@ -126,11 +126,11 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale)
: ControlGroup(name_, name_, GroupType::Shake)
{
// i18n: Refers to a 3D axis (used when mapping motion controls)
AddInput(ControllerEmu::Translate, _trans("X"));
AddInput(Translatability::Translate, _trans("X"));
// i18n: Refers to a 3D axis (used when mapping motion controls)
AddInput(ControllerEmu::Translate, _trans("Y"));
AddInput(Translatability::Translate, _trans("Y"));
// i18n: Refers to a 3D axis (used when mapping motion controls)
AddInput(ControllerEmu::Translate, _trans("Z"));
AddInput(Translatability::Translate, _trans("Z"));
AddDeadzoneSetting(&m_deadzone_setting, 50);

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

@ -15,12 +15,12 @@ namespace ControllerEmu
IMUAccelerometer::IMUAccelerometer(std::string name_, std::string ui_name_)
: ControlGroup(std::move(name_), std::move(ui_name_), GroupType::IMUAccelerometer)
{
AddInput(Translate, _trans("Up"));
AddInput(Translate, _trans("Down"));
AddInput(Translate, _trans("Left"));
AddInput(Translate, _trans("Right"));
AddInput(Translate, _trans("Forward"));
AddInput(Translate, _trans("Backward"));
AddInput(Translatability::Translate, _trans("Up"));
AddInput(Translatability::Translate, _trans("Down"));
AddInput(Translatability::Translate, _trans("Left"));
AddInput(Translatability::Translate, _trans("Right"));
AddInput(Translatability::Translate, _trans("Forward"));
AddInput(Translatability::Translate, _trans("Backward"));
}
bool IMUAccelerometer::AreInputsBound() const

2
Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
View File

@ -26,7 +26,7 @@ IMUCursor::IMUCursor(std::string name_, std::string ui_name_)
ControlGroup::DefaultValue::Enabled)
#endif
{
AddInput(Translate, _trans("Recenter"));
AddInput(Translatability::Translate, _trans("Recenter"));
// Default values chosen to reach screen edges in most games including the Wii Menu.

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

@ -26,12 +26,12 @@ static constexpr auto WORST_ACCEPTABLE_CALIBRATION_UPDATE_FREQUENCY = 25;
IMUGyroscope::IMUGyroscope(std::string name_, std::string ui_name_)
: ControlGroup(std::move(name_), std::move(ui_name_), GroupType::IMUGyroscope)
{
AddInput(Translate, _trans("Pitch Up"));
AddInput(Translate, _trans("Pitch Down"));
AddInput(Translate, _trans("Roll Left"));
AddInput(Translate, _trans("Roll Right"));
AddInput(Translate, _trans("Yaw Left"));
AddInput(Translate, _trans("Yaw Right"));
AddInput(Translatability::Translate, _trans("Pitch Up"));
AddInput(Translatability::Translate, _trans("Pitch Down"));
AddInput(Translatability::Translate, _trans("Roll Left"));
AddInput(Translatability::Translate, _trans("Roll Right"));
AddInput(Translatability::Translate, _trans("Yaw Left"));
AddInput(Translatability::Translate, _trans("Yaw Right"));
AddSetting(&m_deadzone_setting,
{_trans("Dead Zone"),

2
Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
View File

@ -24,7 +24,7 @@ ModifySettingsButton::ModifySettingsButton(std::string button_name)
void ModifySettingsButton::AddInput(std::string button_name, bool toggle)
{
ControlGroup::AddInput(Translate, std::move(button_name));
ControlGroup::AddInput(Translatability::Translate, std::move(button_name));
m_threshold_exceeded.emplace_back(false);
m_associated_settings.emplace_back(false);
m_associated_settings_toggle.emplace_back(toggle);

4
Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
View File

@ -18,8 +18,8 @@ namespace ControllerEmu
Slider::Slider(const std::string& name_, const std::string& ui_name_)
: ControlGroup(name_, ui_name_, GroupType::Slider)
{
AddInput(Translate, _trans("Left"));
AddInput(Translate, _trans("Right"));
AddInput(Translatability::Translate, _trans("Left"));
AddInput(Translatability::Translate, _trans("Right"));
AddDeadzoneSetting(&m_deadzone_setting, 50);
}

10
Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
View File

@ -17,12 +17,12 @@ namespace ControllerEmu
{
Tilt::Tilt(const std::string& name_) : ReshapableInput(name_, name_, GroupType::Tilt)
{
AddInput(Translate, _trans("Forward"));
AddInput(Translate, _trans("Backward"));
AddInput(Translate, _trans("Left"));
AddInput(Translate, _trans("Right"));
AddInput(Translatability::Translate, _trans("Forward"));
AddInput(Translatability::Translate, _trans("Backward"));
AddInput(Translatability::Translate, _trans("Left"));
AddInput(Translatability::Translate, _trans("Right"));
AddInput(Translate, _trans("Modifier"));
AddInput(Translatability::Translate, _trans("Modifier"));
AddSetting(&m_max_angle_setting,
{_trans("Angle"),