mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 13:49:53 -06:00
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This reverts commit81414b4fa2
, reversing changes made tob926061f64
. Conflicts: Source/Core/DolphinWX/Frame.cpp Source/Core/VideoCommon/VideoConfig.cpp Source/Core/VideoCommon/VideoConfig.h
This commit is contained in:
@ -98,16 +98,6 @@ void VideoConfig::Load(const std::string& ini_file)
|
||||
stereoscopy->Get("StereoConvergencePercentage", &iStereoConvergencePercentage, 100);
|
||||
stereoscopy->Get("StereoSwapEyes", &bStereoSwapEyes, false);
|
||||
|
||||
//currently these settings are not saved in global config, so we could've initialized them directly
|
||||
for (size_t i = 0; i < oStereoPresets.size(); ++i)
|
||||
{
|
||||
stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage);
|
||||
stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth);
|
||||
}
|
||||
stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0);
|
||||
iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence;
|
||||
iStereoDepth = oStereoPresets[iStereoActivePreset].depth;
|
||||
|
||||
IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks");
|
||||
hacks->Get("EFBAccessEnable", &bEFBAccessEnable, true);
|
||||
hacks->Get("BBoxEnable", &bBBoxEnable, false);
|
||||
@ -208,17 +198,6 @@ void VideoConfig::GameIniLoad()
|
||||
CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy); // NOTE - this is x in (1 << x)
|
||||
CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
|
||||
|
||||
//these are not overrides, they are per-game settings, hence no warning
|
||||
IniFile::Section* stereoscopy = iniFile.GetOrCreateSection("Stereoscopy");
|
||||
for (size_t i = 0; i < oStereoPresets.size(); ++i)
|
||||
{
|
||||
stereoscopy->Get(StringFromFormat("StereoConvergencePercentage_%zu", i), &oStereoPresets[i].convergence, iStereoConvergencePercentage);
|
||||
stereoscopy->Get(StringFromFormat("StereoDepth_%zu", i), &oStereoPresets[i].depth, iStereoDepth);
|
||||
}
|
||||
stereoscopy->Get("StereoActivePreset", &iStereoActivePreset, 0);
|
||||
iStereoConvergencePercentage = oStereoPresets[iStereoActivePreset].convergence;
|
||||
iStereoDepth = oStereoPresets[iStereoActivePreset].depth;
|
||||
|
||||
CHECK_SETTING("Video_Stereoscopy", "StereoMode", iStereoMode);
|
||||
CHECK_SETTING("Video_Stereoscopy", "StereoDepth", iStereoDepth);
|
||||
CHECK_SETTING("Video_Stereoscopy", "StereoConvergence", iStereoConvergence);
|
||||
|
Reference in New Issue
Block a user