diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 2c74b423b4..c1f0cf4288 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -81,6 +81,11 @@ static const struct { "FreelookZoomOut", 83 /* 'S' */, 4 /* wxMOD_SHIFT */ }, { "FreelookReset", 82 /* 'R' */, 4 /* wxMOD_SHIFT */ }, + { "IncreaseSeparation", 0, 0 /* wxMOD_NONE */ }, + { "DecreaseSeparation", 0, 0 /* wxMOD_NONE */ }, + { "IncreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "DecreaseConvergence", 0, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot3", 342 /* WXK_F3 */, 0 /* wxMOD_NONE */ }, diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 28686a55bc..94087f77e7 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -54,6 +54,11 @@ enum Hotkey HK_FREELOOK_ZOOM_OUT, HK_FREELOOK_RESET, + HK_INCREASE_SEPARATION, + HK_DECREASE_SEPARATION, + HK_INCREASE_CONVERGENCE, + HK_DECREASE_CONVERGENCE, + HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_2, HK_LOAD_STATE_SLOT_3, diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 3784ae4bc9..ebaac0c66c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1123,6 +1123,26 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { State::Load(g_saveSlot); } + else if (IsHotkey(event, HK_INCREASE_SEPARATION)) + { + if (++g_Config.iStereoSeparation > 100) + g_Config.iStereoSeparation = 100; + } + else if (IsHotkey(event, HK_DECREASE_SEPARATION)) + { + if (--g_Config.iStereoSeparation < 10) + g_Config.iStereoSeparation = 10; + } + else if (IsHotkey(event, HK_INCREASE_CONVERGENCE)) + { + if (++g_Config.iStereoFocalLength > 200) + g_Config.iStereoFocalLength = 200; + } + else if (IsHotkey(event, HK_DECREASE_CONVERGENCE)) + { + if (--g_Config.iStereoFocalLength < 10) + g_Config.iStereoFocalLength = 10; + } else { diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index 2be49b904d..91fc6b90a2 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -238,6 +238,11 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("Freelook Zoom Out"), _("Freelook Reset"), + _("Increase Stereocopy Separation"), + _("Decrease Stereocopy Separation"), + _("Increase Stereocopy Convergence"), + _("Decrease Stereocopy Convergence"), + _("Load State Slot 1"), _("Load State Slot 2"), _("Load State Slot 3"),