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

VideoConfig: Rename StereoFocalLength to StereoConvergence.

This commit is contained in:
Jules Blok 2014-11-24 11:50:35 +01:00
parent 9b2cd82da5
commit 0f4d59f612
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1135,13 +1135,13 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
}
else if (IsHotkey(event, HK_INCREASE_CONVERGENCE))
{
if (++g_Config.iStereoFocalLength > 200)
g_Config.iStereoFocalLength = 200;
if (++g_Config.iStereoConvergence > 200)
g_Config.iStereoConvergence = 200;
}
else if (IsHotkey(event, HK_DECREASE_CONVERGENCE))
{
if (--g_Config.iStereoFocalLength < 10)
g_Config.iStereoFocalLength = 10;
if (--g_Config.iStereoConvergence < 10)
g_Config.iStereoConvergence = 10;
}
else

2
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -465,7 +465,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
szr_stereo->Add(new wxStaticText(page_enh, wxID_ANY, _("Separation:")), 1, wxALIGN_CENTER_VERTICAL, 0);
szr_stereo->Add(sep_slider, 0, wxEXPAND | wxRIGHT);
wxSlider* const conv_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoFocalLength, 10, 200, wxDefaultPosition, wxDefaultSize);
wxSlider* const conv_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoConvergence, 10, 200, wxDefaultPosition, wxDefaultSize);
conv_slider->Bind(wxEVT_SLIDER, &VideoConfigDiag::Event_StereoFoc, this);
RegisterControl(conv_slider, wxGetTranslation(stereo_convergence_desc));

2
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -174,7 +174,7 @@ protected:
void Event_StereoFoc(wxCommandEvent &ev)
{
vconfig.iStereoFocalLength = ev.GetInt();
vconfig.iStereoConvergence = ev.GetInt();
ev.Skip();
}

2
Source/Core/VideoCommon/VertexShaderManager.cpp
View File

@ -518,7 +518,7 @@ void VertexShaderManager::SetConstants()
float offset = g_ActiveConfig.iStereoSeparation / 10000.0f;
constants.stereoparams[0] = (g_ActiveConfig.bStereoSwapEyes) ? offset : -offset;
constants.stereoparams[1] = (g_ActiveConfig.bStereoSwapEyes) ? -offset : offset;
constants.stereoparams[2] = (float)g_ActiveConfig.iStereoFocalLength;
constants.stereoparams[2] = (float)g_ActiveConfig.iStereoConvergence;
}
else
{

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

@ -84,7 +84,7 @@ void VideoConfig::Load(const std::string& ini_file)
enhancements->Get("PostProcessingShader", &sPostProcessingShader, "");
enhancements->Get("StereoMode", &iStereoMode, 0);
enhancements->Get("StereoSeparation", &iStereoSeparation, 50);
enhancements->Get("StereoFocalLength", &iStereoFocalLength, 30);
enhancements->Get("StereoConvergence", &iStereoConvergence, 30);
enhancements->Get("StereoSwapEyes", &bStereoSwapEyes, false);
enhancements->Get("StereoMonoEFBDepth", &bStereoMonoEFBDepth, false);
@ -180,7 +180,7 @@ void VideoConfig::GameIniLoad()
CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
CHECK_SETTING("Video_Enhancements", "StereoMode", iStereoMode);
CHECK_SETTING("Video_Enhancements", "StereoSeparation", iStereoSeparation);
CHECK_SETTING("Video_Enhancements", "StereoFocalLength", iStereoFocalLength);
CHECK_SETTING("Video_Enhancements", "StereoConvergence", iStereoConvergence);
CHECK_SETTING("Video_Enhancements", "StereoSwapEyes", bStereoSwapEyes);
CHECK_SETTING("Video_Enhancements", "StereoMonoEFBDepth", bStereoMonoEFBDepth);
@ -254,7 +254,7 @@ void VideoConfig::Save(const std::string& ini_file)
enhancements->Set("PostProcessingShader", sPostProcessingShader);
enhancements->Set("StereoMode", iStereoMode);
enhancements->Set("StereoSeparation", iStereoSeparation);
enhancements->Set("StereoFocalLength", iStereoFocalLength);
enhancements->Set("StereoConvergence", iStereoConvergence);
enhancements->Set("StereoSwapEyes", bStereoSwapEyes);
enhancements->Set("StereoMonoEFBDepth", bStereoMonoEFBDepth);

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

@ -81,7 +81,7 @@ struct VideoConfig final
std::string sPostProcessingShader;
int iStereoMode;
int iStereoSeparation;
int iStereoFocalLength;
int iStereoConvergence;
bool bStereoSwapEyes;
bool bStereoMonoEFBDepth;