TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1305 from eightyeight/vignette-settings

Browse source 
Apply vignette settings properly for #1302
This commit is contained in:
Daniel Buckmaster 2015-05-22 16:27:24 +10:00
parent f827411338 9cfc852192
commit 7a54e300e3
5 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Templates/Empty/game/core/scripts/client/postFx/default.postfxpreset.cs
View file

@ -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 = "";

5
Templates/Empty/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
View file

@ -298,6 +298,9 @@ function PostFXManager::settingsApplyFromPreset(%this)
$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::settingsApplyDOF(%this)
function PostFXManager::settingsApplyVignette(%this)
{
$PostFXManager::Settings::Vignette::VMax = $VignettePostEffect::VMax;
postVerbose("% - PostFX Manager - Settings Saved - Vignette");
}

2
Templates/Full/game/core/scripts/client/postFx/default.postfxpreset.cs
View file

@ -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 = "";

5
Templates/Full/game/core/scripts/client/postFx/postFxManager.gui.settings.cs
View file

@ -298,6 +298,9 @@ function PostFXManager::settingsApplyFromPreset(%this)
$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::settingsApplyDOF(%this)
function PostFXManager::settingsApplyVignette(%this)
{
$PostFXManager::Settings::Vignette::VMax = $VignettePostEffect::VMax;
postVerbose("% - PostFX Manager - Settings Saved - Vignette");
}

1
Templates/Full/game/levels/Outpost.postfxpreset.cs
View file

@ -7,6 +7,7 @@ $PostFXManager::Settings::DOF::EnableAutoFocus = "";
$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";