diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.cpp b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
index 508cbf0e..947b58df 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.cpp
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
@@ -22,7 +22,7 @@ OptionsDialog::OptionsDialog(QWidget* parent, OptionsDialogSettings settings) :
this->gameboyRomLineEdit->setText(QString::fromStdString(settings.GameboyRom));
this->gameboySaveLineEdit->setText(QString::fromStdString(settings.GameboySave));
this->removeDuplicateMappingsCheckbox->setChecked(settings.RemoveDuplicateMappings);
-
+ this->invertAxisCheckBox->setChecked(settings.InvertAxis);
if (!CoreIsEmulationRunning() && !CoreIsEmulationPaused())
{
this->hideEmulationInfoText();
@@ -66,6 +66,7 @@ void OptionsDialog::on_buttonBox_clicked(QAbstractButton *button)
this->settings.GameboyRom = this->gameboyRomLineEdit->text().toStdString();
this->settings.GameboySave = this->gameboySaveLineEdit->text().toStdString();
this->settings.RemoveDuplicateMappings = this->removeDuplicateMappingsCheckbox->isChecked();
+ this->settings.InvertAxis = this->invertAxisCheckBox->isChecked();
}
this->accept();
diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.hpp b/Source/RMG-Input/UserInterface/OptionsDialog.hpp
index 707b2156..86a12c0e 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.hpp
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.hpp
@@ -24,6 +24,7 @@ struct OptionsDialogSettings
// UI settings
bool RemoveDuplicateMappings = false;
+ bool InvertAxis = false;
};
namespace UserInterface
diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.ui b/Source/RMG-Input/UserInterface/OptionsDialog.ui
index 8aaeadfd..5c9e461d 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.ui
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.ui
@@ -202,6 +202,13 @@
+ -
+
+
+ Invert Axes Mapped To LRZ
+
+
+
-
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
index c1a6fcd8..c85be736 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
@@ -664,7 +664,7 @@ void ControllerWidget::on_MainDialog_SdlEvent(SDL_Event* event)
// more than 50%, otherwise we might detect
// an accidental axis movement (due to i.e deadzone)
const bool sdlAxisButtonPressed = (abs(sdlAxisValue) >= (SDL_AXIS_PEAK / 2));
- const int sdlAxisDirection = (sdlAxisValue > 0 ? 1 : 0);
+ int sdlAxisDirection = (sdlAxisValue > 0 ? 1 : 0);
// make sure we have the right joystick
if (joystickId != this->currentJoystickId)
@@ -677,6 +677,18 @@ void ControllerWidget::on_MainDialog_SdlEvent(SDL_Event* event)
{
if (sdlAxisButtonPressed)
{
+ // invert axis for left, right & z trigger mappings
+ if (this->optionsDialogSettings.InvertAxis)
+ {
+ if (this->currentButton == this->leftTriggerButton ||
+ this->currentButton == this->rightTriggerButton ||
+ this->currentButton == this->zTriggerButton)
+ {
+ sdlAxisDirection = (sdlAxisDirection == 1 ? 0 : 1);
+ sdlAxisName = "axis " + QString::number(sdlAxis);
+ sdlAxisName += sdlAxisDirection > 0 ? "+" : "-";
+ }
+ }
this->currentButton->SetInputData(
inputType,
sdlAxis,
@@ -885,6 +897,7 @@ void ControllerWidget::LoadSettings(QString sectionQString)
this->controllerPluggedCheckBox->setChecked(CoreSettingsGetBoolValue(SettingsID::Input_PluggedIn, section));
this->deadZoneSlider->setValue(CoreSettingsGetIntValue(SettingsID::Input_Deadzone, section));
this->optionsDialogSettings.RemoveDuplicateMappings = CoreSettingsGetBoolValue(SettingsID::Input_RemoveDuplicateMappings, section);
+ this->optionsDialogSettings.InvertAxis = CoreSettingsGetBoolValue(SettingsID::Input_InvertAxis, section);
this->optionsDialogSettings.ControllerPak = CoreSettingsGetIntValue(SettingsID::Input_Pak, section);
this->optionsDialogSettings.GameboyRom = CoreSettingsGetStringValue(SettingsID::Input_GameboyRom, section);
this->optionsDialogSettings.GameboySave = CoreSettingsGetStringValue(SettingsID::Input_GameboySave, section);
@@ -915,6 +928,7 @@ void ControllerWidget::SaveDefaultSettings()
CoreSettingsSetValue(SettingsID::Input_Deadzone, section, 9);
CoreSettingsSetValue(SettingsID::Input_Pak, section, 0);
CoreSettingsSetValue(SettingsID::Input_RemoveDuplicateMappings, section, true);
+ CoreSettingsSetValue(SettingsID::Input_InvertAxis, section, true);
for (auto& buttonSetting : this->buttonSettingMappings)
{
@@ -948,6 +962,7 @@ void ControllerWidget::SaveSettings()
CoreSettingsSetValue(SettingsID::Input_GameboyRom, section, this->optionsDialogSettings.GameboyRom);
CoreSettingsSetValue(SettingsID::Input_GameboySave, section, this->optionsDialogSettings.GameboySave);
CoreSettingsSetValue(SettingsID::Input_RemoveDuplicateMappings, section, this->optionsDialogSettings.RemoveDuplicateMappings);
+ CoreSettingsSetValue(SettingsID::Input_InvertAxis, section, this->optionsDialogSettings.InvertAxis);
for (auto& buttonSetting : this->buttonSettingMappings)
{