TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Apply vignette settings properly for #1302.

Browse source
This commit is contained in:
Daniel Buckmaster 2015-05-16 17:52:58 +10:00
parent a879ad4dcf
commit 9cfc852192
5 changed files with 15 additions and 0 deletions
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. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$PostFXManager::Settings::EnableVignette = "0";
$PostFXManager::Settings::EnableDOF = "0"; $PostFXManager::Settings::EnableDOF = "0";
$PostFXManager::Settings::EnabledSSAO = "0"; $PostFXManager::Settings::EnabledSSAO = "0";
$PostFXManager::Settings::EnableHDR = "0"; $PostFXManager::Settings::EnableHDR = "0";
$PostFXManager::Settings::EnableLightRays = "0"; $PostFXManager::Settings::EnableLightRays = "0";
$PostFXManager::Settings::EnablePostFX = "0"; $PostFXManager::Settings::EnablePostFX = "0";
$PostFXManager::Settings::Vignette::VMax = "0.6";
$PostFXManager::Settings::DOF::BlurCurveFar = ""; $PostFXManager::Settings::DOF::BlurCurveFar = "";
$PostFXManager::Settings::DOF::BlurCurveNear = ""; $PostFXManager::Settings::DOF::BlurCurveNear = "";
$PostFXManager::Settings::DOF::BlurMax = ""; $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::FocusRangeMax = $PostFXManager::Settings::DOF::FocusRangeMax;
$DOFPostFx::BlurCurveNear = $PostFXManager::Settings::DOF::BlurCurveNear; $DOFPostFx::BlurCurveNear = $PostFXManager::Settings::DOF::BlurCurveNear;
$DOFPostFx::BlurCurveFar = $PostFXManager::Settings::DOF::BlurCurveFar; $DOFPostFx::BlurCurveFar = $PostFXManager::Settings::DOF::BlurCurveFar;
//Vignette settings
$VignettePostEffect::VMax = $PostFXManager::Settings::Vignette::VMax;
if ( $PostFXManager::forceEnableFromPresets ) if ( $PostFXManager::forceEnableFromPresets )
{ {
@ -392,6 +395,8 @@ function PostFXManager::settingsApplyDOF(%this)
function PostFXManager::settingsApplyVignette(%this) function PostFXManager::settingsApplyVignette(%this)
{ {
$PostFXManager::Settings::Vignette::VMax = $VignettePostEffect::VMax;
postVerbose("% - PostFX Manager - Settings Saved - Vignette"); 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. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$PostFXManager::Settings::EnableVignette = "0";
$PostFXManager::Settings::EnableDOF = "0"; $PostFXManager::Settings::EnableDOF = "0";
$PostFXManager::Settings::EnabledSSAO = "0"; $PostFXManager::Settings::EnabledSSAO = "0";
$PostFXManager::Settings::EnableHDR = "0"; $PostFXManager::Settings::EnableHDR = "0";
$PostFXManager::Settings::EnableLightRays = "0"; $PostFXManager::Settings::EnableLightRays = "0";
$PostFXManager::Settings::EnablePostFX = "0"; $PostFXManager::Settings::EnablePostFX = "0";
$PostFXManager::Settings::Vignette::VMax = "0.6";
$PostFXManager::Settings::DOF::BlurCurveFar = ""; $PostFXManager::Settings::DOF::BlurCurveFar = "";
$PostFXManager::Settings::DOF::BlurCurveNear = ""; $PostFXManager::Settings::DOF::BlurCurveNear = "";
$PostFXManager::Settings::DOF::BlurMax = ""; $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::FocusRangeMax = $PostFXManager::Settings::DOF::FocusRangeMax;
$DOFPostFx::BlurCurveNear = $PostFXManager::Settings::DOF::BlurCurveNear; $DOFPostFx::BlurCurveNear = $PostFXManager::Settings::DOF::BlurCurveNear;
$DOFPostFx::BlurCurveFar = $PostFXManager::Settings::DOF::BlurCurveFar; $DOFPostFx::BlurCurveFar = $PostFXManager::Settings::DOF::BlurCurveFar;
//Vignette settings
$VignettePostEffect::VMax = $PostFXManager::Settings::Vignette::VMax;
if ( $PostFXManager::forceEnableFromPresets ) if ( $PostFXManager::forceEnableFromPresets )
{ {
@ -392,6 +395,8 @@ function PostFXManager::settingsApplyDOF(%this)
function PostFXManager::settingsApplyVignette(%this) function PostFXManager::settingsApplyVignette(%this)
{ {
$PostFXManager::Settings::Vignette::VMax = $VignettePostEffect::VMax;
postVerbose("% - PostFX Manager - Settings Saved - Vignette"); 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::EnableDOF = "";
$PostFXManager::Settings::DOF::FocusRangeMax = ""; $PostFXManager::Settings::DOF::FocusRangeMax = "";
$PostFXManager::Settings::DOF::FocusRangeMin = ""; $PostFXManager::Settings::DOF::FocusRangeMin = "";
$PostFXManager::Settings::EnableVignette = "0";
$PostFXManager::Settings::EnableDOF = "1"; $PostFXManager::Settings::EnableDOF = "1";
$PostFXManager::Settings::EnabledSSAO = "1"; $PostFXManager::Settings::EnabledSSAO = "1";
$PostFXManager::Settings::EnableHDR = "1"; $PostFXManager::Settings::EnableHDR = "1";