From e6498e297539f0e5e8695b9974c8f080ac373452 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Thu, 24 Dec 2015 18:46:28 +0100 Subject: [PATCH] Tweaked HDR/ambient --- RELEASE-NOTES.txt | 1 - base/renderprogs/postprocess.ps.hlsl | 2 +- base/renderprogs/tonemap.ps.hlsl | 6 +++++- neo/renderer/RenderSystem_init.cpp | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1446ffa3..d5a3ba97 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -78,7 +78,6 @@ _______________________________ - Enhanced Subpixel Morphological Antialiasing For more information see "Anti-Aliasing Methods in CryENGINE 3" and the docs at http://www.iryoku.com/smaa/ - - Filmic post process effects like Technicolor color grading and film grain - Fixed issues with Mesa drivers and allowed them to use shadow mapping diff --git a/base/renderprogs/postprocess.ps.hlsl b/base/renderprogs/postprocess.ps.hlsl index 9dbfcc31..969079e5 100644 --- a/base/renderprogs/postprocess.ps.hlsl +++ b/base/renderprogs/postprocess.ps.hlsl @@ -47,7 +47,7 @@ struct PS_OUT #define USE_TECHNICOLOR 1 // [0 or 1] -#define Technicolor_Amount 0.5 // [0.00 to 1.00] +#define Technicolor_Amount 0.6 // [0.00 to 1.00] #define Technicolor_Power 4.0 // [0.00 to 8.00] #define Technicolor_RedNegativeAmount 0.88 // [0.00 to 1.00] #define Technicolor_GreenNegativeAmount 0.88 // [0.00 to 1.00] diff --git a/base/renderprogs/tonemap.ps.hlsl b/base/renderprogs/tonemap.ps.hlsl index 2d42d0d5..9b53ef3e 100644 --- a/base/renderprogs/tonemap.ps.hlsl +++ b/base/renderprogs/tonemap.ps.hlsl @@ -115,7 +115,11 @@ void main( PS_IN fragment, out PS_OUT result ) #if OPERATOR == 0 // advanced Reinhard operator, artistically desirable to burn out bright areas - float L = Yr * ( 1.0 + Yr / ( Ymax * Ymax ) ) / ( 1.0 + Yr ); + //float L = Yr * ( 1.0 + Yr / ( Ymax * Ymax ) ) / ( 1.0 + Yr ); + + // exponential tone mapper that is very similar to the Uncharted one + // very good in keeping the colors natural + float L = 1.0 - exp( -Yr ); color.rgb *= L; #elif OPERATOR == 1 diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index ce6b2c8b..8c06c1b5 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -267,7 +267,7 @@ idCVar r_ldrContrastThreshold( "r_ldrContrastThreshold", "1.1", CVAR_RENDERER | idCVar r_ldrContrastOffset( "r_ldrContrastOffset", "3", CVAR_RENDERER | CVAR_FLOAT, "" ); idCVar r_useFilmicPostProcessEffects( "r_useFilmicPostProcessEffects", "1", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_BOOL, "apply several post process effects to mimic a filmic look" ); -idCVar r_forceAmbient( "r_forceAmbient", "0.2", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_FLOAT, "render additional ambient pass to make the game less dark", 0.0f, 0.4f ); +idCVar r_forceAmbient( "r_forceAmbient", "0.3", CVAR_RENDERER | CVAR_FLOAT, "render additional ambient pass to make the game less dark", 0.0f, 0.4f ); idCVar r_useSSGI( "r_useSSGI", "0", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_BOOL, "use screen space global illumination and reflections" ); idCVar r_ssgiDebug( "r_ssgiDebug", "0", CVAR_RENDERER | CVAR_INTEGER, "" );