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

Merge pull request #888 from vvv-yeaf/Misc-HDR-And-Levels

Browse source 
Misc aces adjustments
This commit is contained in:
Brian Roberts 2022-09-12 09:43:23 -05:00 • committed by GitHub
commit 2104a8b458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
View file

@ -59,12 +59,11 @@ out vec4 OUT_col;
vec3 Tonemap(vec3 x) vec3 Tonemap(vec3 x)
{ {
//ACES //ACES
if(g_fTonemapMode == 1.0f) if(g_fTonemapMode == 1.0f)
{ {
x *= 2.0f; //ACES is crushing our blacks, need to pre-expose! x = ACESFitted(x, whitePoint) * 1.4f; //ACES is crushing our blacks, need to pre-expose!
x = ACESFitted(x, whitePoint);
} }
//Filmic Helji //Filmic Helji
if(g_fTonemapMode == 2.0f) if(g_fTonemapMode == 2.0f)

12
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
View file

@ -51,15 +51,15 @@ uniform float logContrast;
uniform float brightnessValue; uniform float brightnessValue;
uniform float saturationValue; uniform float saturationValue;
uniform float3 colorFilter; uniform float3 colorFilter;
float3 Tonemap(float3 x) float3 Tonemap(float3 x)
{ {
//ACES //ACES
if(g_fTonemapMode == 1.0f) if(g_fTonemapMode == 1.0f)
{ {
x *= 2.0; //ACES is crushing our blacks, need to pre-expose! x = ACESFitted(x, whitePoint) * 1.4f; //ACES is crushing our blacks, need to pre-expose!
x = ACESFitted(x, whitePoint); }
}
//Filmic Helji //Filmic Helji
if(g_fTonemapMode == 2.0f) if(g_fTonemapMode == 2.0f)
{ {

3
Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml
View file

@ -5,7 +5,8 @@
originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.png"> originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.png">
<Material <Material
Name="FloorGray" Name="FloorGray"
mapTo="FloorGray"> mapTo="FloorGray"
originalAssetName="FloorGray">
<Material.Stages> <Material.Stages>
<Stages_beginarray <Stages_beginarray
DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"/> DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"/>

3
Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml
View file

@ -5,7 +5,8 @@
originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.png"> originalFilePath="C:/dev/T3D/PRs/MiscFixes20220525/Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.png">
<Material <Material
Name="WallOrange" Name="WallOrange"
mapTo="WallOrange"> mapTo="WallOrange"
originalAssetName="WallOrange">
<Material.Stages> <Material.Stages>
<Stages_beginarray <Stages_beginarray
DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"/> DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"/>