piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -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

1
Source/Core/VideoCommon/VideoBackendBase.h
View File

@ -72,7 +72,6 @@ public:
virtual std::string GetName() const = 0;
virtual std::string GetDisplayName() const { return GetName(); }
virtual std::string GetConfigName() const = 0;
virtual void ShowConfig(void*) = 0;

21
Source/Core/VideoCommon/VideoConfig.cpp
View File

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

10
Source/Core/VideoCommon/VideoConfig.h
View File

@ -51,14 +51,6 @@ enum StereoMode
STEREO_3DVISION
};
constexpr int STEREOSCOPY_PRESETS_NUM = 3;
struct StereoscopyPreset final
{
int depth;
int convergence;
};
// NEVER inherit from this class.
struct VideoConfig final
{
@ -88,8 +80,6 @@ struct VideoConfig final
bool bForceFiltering;
int iMaxAnisotropy;
std::string sPostProcessingShader;
std::array<StereoscopyPreset, STEREOSCOPY_PRESETS_NUM> oStereoPresets;
int iStereoActivePreset;
// Information
bool bShowFPS;