From 56a3084dd33731f84f284f335567e314f48df696 Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Sat, 16 May 2015 17:52:58 +1000
Subject: [PATCH] Apply vignette settings properly for #1302.

---
 .../game/core/scripts/client/postFx/default.postfxpreset.cs  | 2 ++
 .../core/scripts/client/postFx/postFxManager.gui.settings.cs | 5 +++++
 .../game/core/scripts/client/postFx/default.postfxpreset.cs  | 2 ++
 .../core/scripts/client/postFx/postFxManager.gui.settings.cs | 5 +++++
 Templates/Full/game/levels/Outpost.postfxpreset.cs           | 1 +
 5 files changed, 15 insertions(+)

diff --git a/Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs b/Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs
index bd7a56d640..e2d8ae1258 100644
--- a/Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs
+++ b/Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs
@@ -20,11 +20,13 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
+$PostFXManager::Settings::EnableVignette = "0";
 $PostFXManager::Settings::EnableDOF = "0";
 $PostFXManager::Settings::EnabledSSAO = "0";
 $PostFXManager::Settings::EnableHDR = "0";
 $PostFXManager::Settings::EnableLightRays = "0";
 $PostFXManager::Settings::EnablePostFX = "0";
+$PostFXManager::Settings::Vignette::VMax = "0.6";
 $PostFXManager::Settings::DOF::BlurCurveFar = "";
 $PostFXManager::Settings::DOF::BlurCurveNear = "";
 $PostFXManager::Settings::DOF::BlurMax = "";
diff --git a/Templates/Empty/game/core/scripts/client/postFx/postFxManager.gui.settings.cs b/Templates/Empty/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
index a73f7c7029..d30d2314ba 100644
--- a/Templates/Empty/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
+++ b/Templates/Empty/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
@@ -298,6 +298,9 @@
    $DOFPostFx::FocusRangeMax           = $PostFXManager::Settings::DOF::FocusRangeMax;
    $DOFPostFx::BlurCurveNear           = $PostFXManager::Settings::DOF::BlurCurveNear;
    $DOFPostFx::BlurCurveFar            = $PostFXManager::Settings::DOF::BlurCurveFar;
+
+   //Vignette settings   
+   $VignettePostEffect::VMax           = $PostFXManager::Settings::Vignette::VMax;
   
    if ( $PostFXManager::forceEnableFromPresets )
    {
@@ -392,6 +395,8 @@
 
 function PostFXManager::settingsApplyVignette(%this)
 {
+   $PostFXManager::Settings::Vignette::VMax                 = $VignettePostEffect::VMax;
+
    postVerbose("% - PostFX Manager - Settings Saved - Vignette");   
    
 }
diff --git a/Templates/Full/game/core/scripts/client/postFx/default.postfxpreset.cs b/Templates/Full/game/core/scripts/client/postFx/default.postfxpreset.cs
index bd7a56d640..e2d8ae1258 100644
--- a/Templates/Full/game/core/scripts/client/postFx/default.postfxpreset.cs
+++ b/Templates/Full/game/core/scripts/client/postFx/default.postfxpreset.cs
@@ -20,11 +20,13 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
+$PostFXManager::Settings::EnableVignette = "0";
 $PostFXManager::Settings::EnableDOF = "0";
 $PostFXManager::Settings::EnabledSSAO = "0";
 $PostFXManager::Settings::EnableHDR = "0";
 $PostFXManager::Settings::EnableLightRays = "0";
 $PostFXManager::Settings::EnablePostFX = "0";
+$PostFXManager::Settings::Vignette::VMax = "0.6";
 $PostFXManager::Settings::DOF::BlurCurveFar = "";
 $PostFXManager::Settings::DOF::BlurCurveNear = "";
 $PostFXManager::Settings::DOF::BlurMax = "";
diff --git a/Templates/Full/game/core/scripts/client/postFx/postFxManager.gui.settings.cs b/Templates/Full/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
index a73f7c7029..d30d2314ba 100644
--- a/Templates/Full/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
+++ b/Templates/Full/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
@@ -298,6 +298,9 @@
    $DOFPostFx::FocusRangeMax           = $PostFXManager::Settings::DOF::FocusRangeMax;
    $DOFPostFx::BlurCurveNear           = $PostFXManager::Settings::DOF::BlurCurveNear;
    $DOFPostFx::BlurCurveFar            = $PostFXManager::Settings::DOF::BlurCurveFar;
+
+   //Vignette settings   
+   $VignettePostEffect::VMax           = $PostFXManager::Settings::Vignette::VMax;
   
    if ( $PostFXManager::forceEnableFromPresets )
    {
@@ -392,6 +395,8 @@
 
 function PostFXManager::settingsApplyVignette(%this)
 {
+   $PostFXManager::Settings::Vignette::VMax                 = $VignettePostEffect::VMax;
+
    postVerbose("% - PostFX Manager - Settings Saved - Vignette");   
    
 }
diff --git a/Templates/Full/game/levels/Outpost.postfxpreset.cs b/Templates/Full/game/levels/Outpost.postfxpreset.cs
index bec904f6a3..01f6d1ae53 100644
--- a/Templates/Full/game/levels/Outpost.postfxpreset.cs
+++ b/Templates/Full/game/levels/Outpost.postfxpreset.cs
@@ -7,6 +7,7 @@
 $PostFXManager::Settings::DOF::EnableDOF = "";
 $PostFXManager::Settings::DOF::FocusRangeMax = "";
 $PostFXManager::Settings::DOF::FocusRangeMin = "";
+$PostFXManager::Settings::EnableVignette = "0";
 $PostFXManager::Settings::EnableDOF = "1";
 $PostFXManager::Settings::EnabledSSAO = "1";
 $PostFXManager::Settings::EnableHDR = "1";