diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl index 9757d618f..43e8a2f2e 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl +++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl @@ -59,12 +59,11 @@ out vec4 OUT_col; vec3 Tonemap(vec3 x) -{ +{ //ACES if(g_fTonemapMode == 1.0f) - { - x *= 2.0f; //ACES is crushing our blacks, need to pre-expose! - x = ACESFitted(x, whitePoint); + { + x = ACESFitted(x, whitePoint) * 1.4f; //ACES is crushing our blacks, need to pre-expose! } //Filmic Helji if(g_fTonemapMode == 2.0f) diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl index bd31c45ff..4da52c86f 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl +++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl @@ -51,15 +51,15 @@ uniform float logContrast; uniform float brightnessValue; uniform float saturationValue; uniform float3 colorFilter; - + + float3 Tonemap(float3 x) -{ +{ //ACES if(g_fTonemapMode == 1.0f) - { - x *= 2.0; //ACES is crushing our blacks, need to pre-expose! - x = ACESFitted(x, whitePoint); - } + { + x = ACESFitted(x, whitePoint) * 1.4f; //ACES is crushing our blacks, need to pre-expose! + } //Filmic Helji if(g_fTonemapMode == 2.0f) { diff --git a/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml b/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml index cbed018b2..c7fe40c9e 100644 --- a/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml +++ b/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml @@ -5,7 +5,8 @@ originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.png"> + mapTo="FloorGray" + originalAssetName="FloorGray"> diff --git a/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml b/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml index 7a90ebf4e..875c227e6 100644 --- a/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml +++ b/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml @@ -5,7 +5,8 @@ originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.png"> + mapTo="WallOrange" + originalAssetName="WallOrange">