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

Misc aces adjustments

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) 

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) 
    {             

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">
     <Material
         Name="FloorGray"
-        mapTo="FloorGray">
+        mapTo="FloorGray"
+        originalAssetName="FloorGray">
         <Material.Stages>
             <Stages_beginarray
                 DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"/>

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">
     <Material
         Name="WallOrange"
-        mapTo="WallOrange">
+        mapTo="WallOrange"
+        originalAssetName="WallOrange">
         <Material.Stages>
             <Stages_beginarray
                 DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"/>