ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ISOProperties: Replace the ConvergenceMinimum option by the Convergence option. 

The ConvergenceMinimum was replaced by Convergence in the GameINI.
This commit is contained in:
Jules Blok 2015-12-17 23:37:35 +01:00
parent c49bb57e09
commit 9a1b2f68cc
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -357,13 +357,13 @@ void CISOProperties::CreateGUIControls()
sDepthPercentage->Add(DepthPercentageText); sDepthPercentage->Add(DepthPercentageText);
sDepthPercentage->Add(DepthPercentage); sDepthPercentage->Add(DepthPercentage);
wxBoxSizer* const sConvergenceMinimum = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sConvergence = new wxBoxSizer(wxHORIZONTAL);
wxStaticText* const ConvergenceMinimumText = new wxStaticText(m_GameConfig, wxID_ANY, _("Convergence Minimum: ")); wxStaticText* const ConvergenceText = new wxStaticText(m_GameConfig, wxID_ANY, _("Convergence: "));
ConvergenceMinimum = new wxSpinCtrl(m_GameConfig, ID_CONVERGENCEMINIMUM); Convergence = new wxSpinCtrl(m_GameConfig, ID_CONVERGENCE);
ConvergenceMinimum->SetRange(0, INT32_MAX); Convergence->SetRange(0, INT32_MAX);
ConvergenceMinimum->SetToolTip(_("This value is added to the convergence value set in the graphics configuration.")); Convergence->SetToolTip(_("This value is added to the convergence value set in the graphics configuration."));
sConvergenceMinimum->Add(ConvergenceMinimumText); sConvergence->Add(ConvergenceText);
sConvergenceMinimum->Add(ConvergenceMinimum); sConvergence->Add(Convergence);
MonoDepth = new wxCheckBox(m_GameConfig, ID_MONODEPTH, _("Monoscopic Shadows"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video_Stereoscopy", "StereoEFBMonoDepth")); MonoDepth = new wxCheckBox(m_GameConfig, ID_MONODEPTH, _("Monoscopic Shadows"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video_Stereoscopy", "StereoEFBMonoDepth"));
MonoDepth->SetToolTip(_("Use a single depth buffer for both eyes. Needed for a few games.")); MonoDepth->SetToolTip(_("Use a single depth buffer for both eyes. Needed for a few games."));
@ -403,7 +403,7 @@ void CISOProperties::CreateGUIControls()
wxStaticBoxSizer* const sbStereoOverrides = wxStaticBoxSizer* const sbStereoOverrides =
new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Stereoscopy")); new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Stereoscopy"));
sbStereoOverrides->Add(sDepthPercentage); sbStereoOverrides->Add(sDepthPercentage);
sbStereoOverrides->Add(sConvergenceMinimum); sbStereoOverrides->Add(sConvergence);
sbStereoOverrides->Add(MonoDepth); sbStereoOverrides->Add(MonoDepth);
wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings")); wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
@ -1073,9 +1073,9 @@ void CISOProperties::LoadGameConfig()
default_stereoscopy->Get("StereoDepthPercentage", &iTemp, 100); default_stereoscopy->Get("StereoDepthPercentage", &iTemp, 100);
GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoDepthPercentage", &iTemp); GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoDepthPercentage", &iTemp);
DepthPercentage->SetValue(iTemp); DepthPercentage->SetValue(iTemp);
default_stereoscopy->Get("StereoConvergenceMinimum", &iTemp, 0); default_stereoscopy->Get("StereoConvergence", &iTemp, 0);
GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoConvergenceMinimum", &iTemp); GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoConvergence", &iTemp);
ConvergenceMinimum->SetValue(iTemp); Convergence->SetValue(iTemp);
PatchList_Load(); PatchList_Load();
ActionReplayList_Load(); ActionReplayList_Load();
@ -1154,7 +1154,7 @@ bool CISOProperties::SaveGameConfig()
int depth = DepthPercentage->GetValue() > 0 ? DepthPercentage->GetValue() : 100; int depth = DepthPercentage->GetValue() > 0 ? DepthPercentage->GetValue() : 100;
SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoDepthPercentage", depth, 100); SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoDepthPercentage", depth, 100);
SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoConvergenceMinimum", ConvergenceMinimum->GetValue(), 0); SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoConvergence", Convergence->GetValue(), 0);
PatchList_Save(); PatchList_Save();
ActionReplayList_Save(); ActionReplayList_Save();

4
Source/Core/DolphinWX/ISOProperties.h
View File

@ -98,7 +98,7 @@ private:
// Stereoscopy // Stereoscopy
wxSlider* DepthPercentage; wxSlider* DepthPercentage;
wxSpinCtrl* ConvergenceMinimum; wxSpinCtrl* Convergence;
wxCheckBox* MonoDepth; wxCheckBox* MonoDepth;
wxArrayString arrayStringFor_EmuState; wxArrayString arrayStringFor_EmuState;
@ -171,7 +171,7 @@ private:
ID_REMOVECHEAT, ID_REMOVECHEAT,
ID_GPUDETERMINISM, ID_GPUDETERMINISM,
ID_DEPTHPERCENTAGE, ID_DEPTHPERCENTAGE,
ID_CONVERGENCEMINIMUM, ID_CONVERGENCE,
ID_MONODEPTH, ID_MONODEPTH,
ID_NAME, ID_NAME,