diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-12-23 00:35:19 +0100 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-12-23 00:35:19 +0100 |
| commit | 8bda12bcfdb20324cd5a764ea814b176b36a4687 (patch) | |
| tree | e10af787c7a7a923ecfe01c963e6fe105d7e7529 /Source/Core/DolphinWX/Frame.cpp | |
| parent | a55af16131e74bebb957648001ab9ac78e600325 (diff) | |
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This reverts commit 81414b4fa2edadf0b2a2bb0bd4df61dd59165eec, reversing
changes made to b926061f641692ae31bacbeba304f5941db7d3bc.
Conflicts:
Source/Core/DolphinWX/Frame.cpp
Source/Core/VideoCommon/VideoConfig.cpp
Source/Core/VideoCommon/VideoConfig.h
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 51 |
1 files changed, 4 insertions, 47 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index eb775534ba..c8604f07ae 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1482,72 +1482,29 @@ void CFrame::ParseHotkeys() } } - auto savePreset = [](const std::string& param, int value) - { - IniFile localIni = SConfig::GetInstance().LoadLocalGameIni(); - localIni.GetOrCreateSection("Enhancements")->Set( - StringFromFormat("Stereo%s_%d", param.c_str(), g_Config.iStereoActivePreset), - value); - std::string iniFileName = File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetUniqueID() + ".ini"; - OSD::AddMessage(StringFromFormat("%s: %d", param.c_str(), value) , 1000); - localIni.Save(iniFileName); - }; - - if (IsHotkey(HK_DECREASE_DEPTH)) + if (IsHotkey(HK_DECREASE_DEPTH, true)) { if (--g_Config.iStereoDepth < 0) g_Config.iStereoDepth = 0; - g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth = g_Config.iStereoDepth; - savePreset("Depth", g_Config.iStereoDepth); } - if (IsHotkey(HK_INCREASE_DEPTH)) + if (IsHotkey(HK_INCREASE_DEPTH, true)) { if (++g_Config.iStereoDepth > 100) g_Config.iStereoDepth = 100; - g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth = g_Config.iStereoDepth; - savePreset("Depth", g_Config.iStereoDepth); } - if (IsHotkey(HK_DECREASE_CONVERGENCE)) + if (IsHotkey(HK_DECREASE_CONVERGENCE, true)) { g_Config.iStereoConvergence -= 5; if (g_Config.iStereoConvergence < 0) g_Config.iStereoConvergence = 0; - g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence = g_Config.iStereoConvergence; - savePreset("Convergence", g_Config.iStereoConvergence); } - if (IsHotkey(HK_INCREASE_CONVERGENCE)) + if (IsHotkey(HK_INCREASE_CONVERGENCE, true)) { g_Config.iStereoConvergence += 5; if (g_Config.iStereoConvergence > 500) g_Config.iStereoConvergence = 500; - g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence = g_Config.iStereoConvergence; - savePreset("Convergence", g_Config.iStereoConvergence); } - if (IsHotkey(HK_SWITCH_STEREOSCOPY_PRESET)) - { - g_Config.iStereoActivePreset = !g_Config.iStereoActivePreset; - g_Config.iStereoConvergence = g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence; - g_Config.iStereoDepth = g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth; - } - if (IsHotkey(HK_USE_STEREOSCOPY_PRESET_0)) - { - g_Config.iStereoActivePreset = 0; - g_Config.iStereoConvergence = g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence; - g_Config.iStereoDepth = g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth; - } - if (IsHotkey(HK_USE_STEREOSCOPY_PRESET_1)) - { - g_Config.iStereoActivePreset = 1; - g_Config.iStereoConvergence = g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence; - g_Config.iStereoDepth = g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth; - } - if (IsHotkey(HK_USE_STEREOSCOPY_PRESET_2)) - { - g_Config.iStereoActivePreset = 2; - g_Config.iStereoConvergence = g_Config.oStereoPresets[g_Config.iStereoActivePreset].convergence; - g_Config.iStereoDepth = g_Config.oStereoPresets[g_Config.iStereoActivePreset].depth; - } static float debugSpeed = 1.0f; if (IsHotkey(HK_FREELOOK_DECREASE_SPEED, true)) debugSpeed /= 1.1f; |
