From 0f4d59f61207af19f4977c1a11afc8cac1acdd91 Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Mon, 24 Nov 2014 11:50:35 +0100
Subject: [PATCH] VideoConfig: Rename StereoFocalLength to StereoConvergence.

---
 Source/Core/DolphinWX/Frame.cpp                 | 8 ++++----
 Source/Core/DolphinWX/VideoConfigDiag.cpp       | 2 +-
 Source/Core/DolphinWX/VideoConfigDiag.h         | 2 +-
 Source/Core/VideoCommon/VertexShaderManager.cpp | 2 +-
 Source/Core/VideoCommon/VideoConfig.cpp         | 6 +++---
 Source/Core/VideoCommon/VideoConfig.h           | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index ebaac0c66c..9f1642c2f2 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -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
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
index 28ef75a173..b930ec2dbe 100644
--- a/Source/Core/DolphinWX/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
@@ -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));
 
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h
index 7900039bea..10dc808bb9 100644
--- a/Source/Core/DolphinWX/VideoConfigDiag.h
+++ b/Source/Core/DolphinWX/VideoConfigDiag.h
@@ -174,7 +174,7 @@ protected:
 
 	void Event_StereoFoc(wxCommandEvent &ev)
 	{
-		vconfig.iStereoFocalLength = ev.GetInt();
+		vconfig.iStereoConvergence = ev.GetInt();
 
 		ev.Skip();
 	}
diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp
index 7237ee41f1..f71dd6514b 100644
--- a/Source/Core/VideoCommon/VertexShaderManager.cpp
+++ b/Source/Core/VideoCommon/VertexShaderManager.cpp
@@ -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
 		{
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
index f30c13f388..2caeaee778 100644
--- a/Source/Core/VideoCommon/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -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);
 
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
index 9d926a879b..c64ea8377d 100644
--- a/Source/Core/VideoCommon/VideoConfig.h
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -81,7 +81,7 @@ struct VideoConfig final
 	std::string sPostProcessingShader;
 	int iStereoMode;
 	int iStereoSeparation;
-	int iStereoFocalLength;
+	int iStereoConvergence;
 	bool bStereoSwapEyes;
 	bool bStereoMonoEFBDepth;