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

Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"

Browse Source 
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
This commit is contained in:
Jules Blok
2015-12-23 00:35:19 +01:00
parent a55af16131
commit 8bda12bcfd
12 changed files with 10 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Core/DolphinWX/Frame.cpp
View File

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