From 7efc7281db0e5bdef072c060d32ed2472452845a Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 28 Aug 2022 22:24:23 -0500
Subject: [PATCH 01/11] from yeaf - HDR revamp gl side is wipwork

---
 .../core/postFX/scripts/HDR/HDRPostFX.tscript | 151 ++++++++--------
 .../HDR/{ => HDR_Bloom}/bloomGaussBlurHP.glsl |   0
 .../HDR/{ => HDR_Bloom}/bloomGaussBlurHP.hlsl |   0
 .../HDR/{ => HDR_Bloom}/bloomGaussBlurVP.glsl |   0
 .../HDR/{ => HDR_Bloom}/bloomGaussBlurVP.hlsl |   0
 .../HDR/{ => HDR_Bloom}/downScale4x4P.glsl    |   0
 .../HDR/{ => HDR_Bloom}/downScale4x4P.hlsl    |   0
 .../HDR/{ => HDR_Bloom}/downScale4x4V.glsl    |   0
 .../HDR/{ => HDR_Bloom}/downScale4x4V.hlsl    |   0
 .../{ => HDR_Utils}/brightPassFilterP.glsl    |   0
 .../{ => HDR_Utils}/brightPassFilterP.hlsl    |   0
 .../{ => HDR_Utils}/calculateAdaptedLumP.glsl |   0
 .../{ => HDR_Utils}/calculateAdaptedLumP.hlsl |   0
 .../HDR/{ => HDR_Utils}/luminanceVisP.glsl    |   0
 .../HDR/{ => HDR_Utils}/luminanceVisP.hlsl    |   0
 .../{ => HDR_Utils}/sampleLumInitialP.glsl    |   0
 .../{ => HDR_Utils}/sampleLumInitialP.hlsl    |   0
 .../{ => HDR_Utils}/sampleLumIterativeP.glsl  |   0
 .../{ => HDR_Utils}/sampleLumIterativeP.hlsl  |   0
 .../postFX/scripts/HDR/HDR_colorUtils.glsl    |  40 +++++
 .../postFX/scripts/HDR/HDR_colorUtils.hlsl    |  43 +++++
 ...alPassCombineP.glsl => HDR_finalPass.glsl} | 153 ++++++++--------
 .../postFX/scripts/HDR/HDR_finalPass.hlsl     | 153 ++++++++++++++++
 .../core/postFX/scripts/HDR/HDR_toneMap.glsl  | 124 +++++++++++++
 .../core/postFX/scripts/HDR/HDR_toneMap.hlsl  | 126 +++++++++++++
 .../postFX/scripts/HDR/finalPassCombineP.hlsl | 167 ------------------
 .../scripts/default.postfxpreset.tscript      |  39 ++--
 27 files changed, 670 insertions(+), 326 deletions(-)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/bloomGaussBlurHP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/bloomGaussBlurHP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/bloomGaussBlurVP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/bloomGaussBlurVP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/downScale4x4P.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/downScale4x4P.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/downScale4x4V.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Bloom}/downScale4x4V.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/brightPassFilterP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/brightPassFilterP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/calculateAdaptedLumP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/calculateAdaptedLumP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/luminanceVisP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/luminanceVisP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/sampleLumInitialP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/sampleLumInitialP.hlsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/sampleLumIterativeP.glsl (100%)
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{ => HDR_Utils}/sampleLumIterativeP.hlsl (100%)
 create mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.glsl
 create mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.hlsl
 rename Templates/BaseGame/game/core/postFX/scripts/HDR/{finalPassCombineP.glsl => HDR_finalPass.glsl} (50%)
 create mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
 create mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
 create mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.hlsl
 delete mode 100644 Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.hlsl

diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
index a1c84b3c2..726830b77 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
@@ -29,49 +29,48 @@ $PostFX::HDRPostFX::enableToneMapping = 0.5;
 ///
 /// 0.18 is fairly common value.
 ///
-$PostFX::HDRPostFX::keyValue = 0.18;
+
+$PostFX::HDRPostFX::keyValue = 0.115;
 
 
-$PostFX::HDRPostFX::exposureValue = 1.0;
+//Explicit HDR Params
+$PostFX::HDRPostFX::exposureValue = 1.5;
+
+$PostFX::HDRPostFX::whitePoint = 2.5;
+
+//HDR Color Corrections Vars
+
+$PostFX::HDRPostFX::logContrast = 1.0;
+
+$PostFX::HDRPostFX::saturationValue = 1.0;
+
+$PostFX::HDRPostFX::colorFilter = "1.0 1.0 1.0";
+
 
 /// The minimum luninace value to allow when tone mapping 
 /// the scene.  Is particularly useful if your scene very 
 /// dark or has a black ambient color in places.
 $PostFX::HDRPostFX::minLuminace = 0.001;
 
-/// The lowest luminance value which is mapped to white.  This
-/// is usually set to the highest visible luminance in your 
-/// scene.  By setting this to smaller values you get a contrast
-/// enhancement.
-$PostFX::HDRPostFX::whiteCutoff = 1.0;
-
 /// The rate of adaptation from the previous and new 
 /// average scene luminance. 
-$PostFX::HDRPostFX::adaptRate = 2.0;
-
-/// Blends between the scene and the blue shifted version
-/// of the scene for a cinematic desaturated night effect.
-$PostFX::HDRPostFX::enableBlueShift = 0.0;
-
-/// The blue shift color value.
-$PostFX::HDRPostFX::blueShiftColor = "1.05 0.97 1.27";
-
+$PostFX::HDRPostFX::adaptRate = 0.85;
 
 /// Blends between the scene and the bloomed scene.
 $PostFX::HDRPostFX::enableBloom = 1.0;
 
 /// The threshold luminace value for pixels which are
 /// considered "bright" and need to be bloomed.
-$PostFX::HDRPostFX::brightPassThreshold = 0.2;
+$PostFX::HDRPostFX::brightPassThreshold = 0.08;
 
 /// These are used in the gaussian blur of the
 /// bright pass for the bloom effect.
-$PostFX::HDRPostFX::gaussMultiplier = 0.145;
+$PostFX::HDRPostFX::gaussMultiplier = 0.4;
 $PostFX::HDRPostFX::gaussMean = 0;
 $PostFX::HDRPostFX::gaussStdDev = 0.5;
 
 // The tonemapping algo to use
-$PostFX::HDRPostFX::tonemapMode = "Filmic";
+$PostFX::HDRPostFX::tonemapMode = "ACES";
 
 $PostFX::HDRPostFX::enableAutoExposure = true;
 
@@ -79,9 +78,9 @@ $PostFX::HDRPostFX::enableAutoExposure = true;
 singleton ShaderData( HDR_BrightPassShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./brightPassFilterP.hlsl";   
+   DXPixelShaderFile 	= "./HDR_utils/brightPassFilterP.hlsl";   
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./brightPassFilterP.glsl";
+   OGLPixelShaderFile   = "./HDR_utils/brightPassFilterP.glsl";
    
    samplerNames[0] = "$inputTex";
    samplerNames[1] = "$luminanceTex";
@@ -91,10 +90,10 @@ singleton ShaderData( HDR_BrightPassShader )
 
 singleton ShaderData( HDR_DownScale4x4Shader )
 {
-   DXVertexShaderFile 	= "./downScale4x4V.hlsl";
-   DXPixelShaderFile 	= "./downScale4x4P.hlsl";
-   OGLVertexShaderFile  = "./downScale4x4V.glsl";
-   OGLPixelShaderFile   = "./downScale4x4P.glsl";
+   DXVertexShaderFile 	= "./HDR_Bloom/downScale4x4V.hlsl";
+   DXPixelShaderFile 	= "./HDR_Bloom/downScale4x4P.hlsl";
+   OGLVertexShaderFile  = "./HDR_Bloom/downScale4x4V.glsl";
+   OGLPixelShaderFile   = "./HDR_Bloom/downScale4x4P.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -104,9 +103,9 @@ singleton ShaderData( HDR_DownScale4x4Shader )
 singleton ShaderData( HDR_BloomGaussBlurHShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./bloomGaussBlurHP.hlsl";
+   DXPixelShaderFile 	= "./HDR_Bloom/bloomGaussBlurHP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./bloomGaussBlurHP.glsl";
+   OGLPixelShaderFile   = "./HDR_Bloom/bloomGaussBlurHP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -116,9 +115,9 @@ singleton ShaderData( HDR_BloomGaussBlurHShader )
 singleton ShaderData( HDR_BloomGaussBlurVShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./bloomGaussBlurVP.hlsl";
+   DXPixelShaderFile 	= "./HDR_Bloom/bloomGaussBlurVP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./bloomGaussBlurVP.glsl";
+   OGLPixelShaderFile   = "./HDR_Bloom/bloomGaussBlurVP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -128,9 +127,9 @@ singleton ShaderData( HDR_BloomGaussBlurVShader )
 singleton ShaderData( HDR_SampleLumShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./sampleLumInitialP.hlsl";
+   DXPixelShaderFile 	= "./HDR_utils/sampleLumInitialP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./sampleLumInitialP.glsl";
+   OGLPixelShaderFile   = "./HDR_utils/sampleLumInitialP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -140,9 +139,9 @@ singleton ShaderData( HDR_SampleLumShader )
 singleton ShaderData( HDR_DownSampleLumShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./sampleLumIterativeP.hlsl";
+   DXPixelShaderFile 	= "./HDR_utils/sampleLumIterativeP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./sampleLumIterativeP.glsl";
+   OGLPixelShaderFile   = "./HDR_utils/sampleLumIterativeP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -152,9 +151,9 @@ singleton ShaderData( HDR_DownSampleLumShader )
 singleton ShaderData( HDR_CalcAdaptedLumShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./calculateAdaptedLumP.hlsl";
+   DXPixelShaderFile 	= "./HDR_utils/calculateAdaptedLumP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./calculateAdaptedLumP.glsl";
+   OGLPixelShaderFile   = "./HDR_utils/calculateAdaptedLumP.glsl";
    
    samplerNames[0] = "$currLum";
    samplerNames[1] = "$lastAdaptedLum";
@@ -165,9 +164,9 @@ singleton ShaderData( HDR_CalcAdaptedLumShader )
 singleton ShaderData( HDR_CombineShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= "./finalPassCombineP.hlsl";
+   DXPixelShaderFile 	= "./HDR_finalPass.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = "./finalPassCombineP.glsl";
+   OGLPixelShaderFile   = "./HDR_finalPass.glsl";
    
    samplerNames[0] = "$sceneTex";
    samplerNames[1] = "$luminanceTex";
@@ -225,8 +224,12 @@ singleton GFXStateBlockData( HDRStateBlock )
 function HDRPostFX::setShaderConsts( %this )
 {
    %this.setShaderConst( "$brightPassThreshold", $PostFX::HDRPostFX::brightPassThreshold );
-   %this.setShaderConst( "$g_fMiddleGray", $PostFX::HDRPostFX::keyValue );  
-   %this.setShaderConst( "$ExposureValue", $PostFX::HDRPostFX::exposureValue );    
+   %this.setShaderConst( "$g_fMiddleGray",   $PostFX::HDRPostFX::keyValue );  
+   %this.setShaderConst( "$exposureValue",   $PostFX::HDRPostFX::exposureValue );
+   %this.setShaderConst( "$whitePoint",      $PostFX::HDRPostFX::whitePoint ); 
+   %this.setShaderConst( "$logContrast",     $PostFX::HDRPostFX::logContrast );
+   %this.setShaderConst( "$saturationValue",     $PostFX::HDRPostFX::saturationValue );
+   
          
    %bloomH = %this-->bloomH;
    %bloomH.setShaderConst( "$gaussMultiplier", $PostFX::HDRPostFX::gaussMultiplier );
@@ -249,25 +252,31 @@ function HDRPostFX::setShaderConsts( %this )
         
    %this-->finalLum.setShaderConst( "$adaptRate", $PostFX::HDRPostFX::adaptRate );
    
+  
    %combinePass = %this-->combinePass;   
    %combinePass.setShaderConst( "$g_fEnableToneMapping", $PostFX::HDRPostFX::enableToneMapping );
    %combinePass.setShaderConst( "$g_fMiddleGray", $PostFX::HDRPostFX::keyValue );
-   %combinePass.setShaderConst( "$ExposureValue", $PostFX::HDRPostFX::exposureValue );
-   %combinePass.setShaderConst( "$g_fBloomScale", $PostFX::HDRPostFX::enableBloom );      
-   %combinePass.setShaderConst( "$g_fEnableBlueShift", $PostFX::HDRPostFX::enableBlueShift );   
-   %combinePass.setShaderConst( "$g_fBlueShiftColor", $PostFX::HDRPostFX::blueShiftColor );   
    
+   %combinePass.setShaderConst( "$whitePoint", $PostFX::HDRPostFX::whitePoint );
+   %combinePass.setShaderConst( "$exposureValue", $PostFX::HDRPostFX::exposureValue );
+   %combinePass.setShaderConst( "$colorFilter", $PostFX::HDRPostFX::colorFilter );  
+   %combinePass.setShaderConst( "$saturationValue", $PostFX::HDRPostFX::saturationValue );
+   %combinePass.setShaderConst( "$logContrast", $PostFX::HDRPostFX::logContrast );
+ 
+   %combinePass.setShaderConst( "$g_fBloomScale", $PostFX::HDRPostFX::enableBloom );       
    %combinePass.setShaderConst( "$g_fEnableAutoExposure", $PostFX::HDRPostFX::enableAutoExposure );
    
    %tonemapMode = 1;
    if($PostFX::HDRPostFX::tonemapMode $= "ACES")
       %tonemapMode = 1;
-   else if($PostFX::HDRPostFX::tonemapMode $= "Uncharted 2")
+   else if($PostFX::HDRPostFX::tonemapMode $= "Filmic Helji")
       %tonemapMode = 2;
-   else if($PostFX::HDRPostFX::tonemapMode $= "Filmic")
+   else if($PostFX::HDRPostFX::tonemapMode $= "Hable U2")
       %tonemapMode = 3;
- else if($PostFX::HDRPostFX::tonemapMode $= "Reinhard")
-      %tonemapMode = 4;
+   else if($PostFX::HDRPostFX::tonemapMode $= "Reinhard")
+      %tonemapMode = 4;	  
+ else if($PostFX::HDRPostFX::tonemapMode $= "Linear")
+      %tonemapMode = 5;
  
       
    %combinePass.setShaderConst( "$g_fTonemapMode", %tonemapMode );
@@ -276,10 +285,7 @@ function HDRPostFX::setShaderConsts( %this )
    %combinePass.setShaderConst( "$g_fOneOverGamma",  1 / %clampedGamma );       
    %combinePass.setShaderConst( "$Brightness", $pref::Video::Brightness );
    %combinePass.setShaderConst( "$Contrast", $pref::Video::Contrast );
-
-   %whiteCutoff = ( $PostFX::HDRPostFX::whiteCutoff * $PostFX::HDRPostFX::whiteCutoff ) *
-                  ( $PostFX::HDRPostFX::whiteCutoff * $PostFX::HDRPostFX::whiteCutoff );                  
-   %combinePass.setShaderConst( "$g_fWhiteCutoff", %whiteCutoff );
+ 
 }
 
 function HDRPostFX::preProcess( %this )
@@ -352,6 +358,7 @@ function HDRPostFX::onAdd( %this )
    PostFXManager.registerPostEffect(%this);
    
    $PostFX::HDRPostFX::enableToneMapping = 1;
+	
 }
 
 //This is used to populate the PostFXEditor's settings so the post FX can be edited
@@ -361,29 +368,31 @@ function HDRPostFX::populatePostFXSettings(%this)
 {
    PostEffectEditorInspector.startGroup("HDR - General");
    PostEffectEditorInspector.addCallbackField("$PostFX::HDRPostFX::Enabled", "Enabled", "bool", "", $PostFX::HDRPostFX::Enabled, "", "toggleHDRPostFX");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::minLuminace", "Minimum Luminance", "range", "", $PostFX::HDRPostFX::minLuminace, "0 1 100");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::whiteCutoff", "White Cutoff", "range", "", $PostFX::HDRPostFX::whiteCutoff, "0 10 20");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::exposureValue", "Exposure", "range", "", $PostFX::HDRPostFX::exposureValue, "0 5 50");
    PostEffectEditorInspector.endGroup();
    
    PostEffectEditorInspector.startGroup("HDR - Tonemapping");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::tonemapMode", "Tonemapping Mode", "list", "", $PostFX::HDRPostFX::tonemapMode, "ACES,Uncharted 2,Filmic,Reinhard");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::exposureValue", "Exposure", "float", "", $PostFX::HDRPostFX::exposureValue, " 1");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::tonemapMode", "Tonemapping Mode", "list", "", $PostFX::HDRPostFX::tonemapMode, "ACES,Filmic Helji,Hable U2,Reinhard,Linear");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::whitePoint", "White Point", "float", "", $PostFX::HDRPostFX::whitePoint, " 2");
+   PostEffectEditorInspector.endGroup();
+    
+   PostEffectEditorInspector.startGroup("HDR - Color Correction");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::logContrast", "Contrast", "range", "", $PostFX::HDRPostFX::logContrast, "1 2 20");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::saturationValue", "Saturation", "range", "", $PostFX::HDRPostFX::saturationValue, "0 2 20");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::colorFilter", "Color Tint", "colorF", "", $PostFX::HDRPostFX::colorFilter, "0 0 0");
    PostEffectEditorInspector.endGroup();
    
-   PostEffectEditorInspector.startGroup("HDR - Bloom");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::enableBloom", "Enable Bloom", "bool", "", $PostFX::HDRPostFX::enableBloom, "");
+   PostEffectEditorInspector.startGroup("HDR - HDR Bloom");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::enableBloom", "Enable HDR Bloom", "bool", "", $PostFX::HDRPostFX::enableBloom, "");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::gaussMultiplier", "Bloom Multiplier", "range", "", $PostFX::HDRPostFX::gaussMultiplier, "0.0 1.0 2.0");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::brightPassThreshold", "Bright Pass Threshold", "float", "", $PostFX::HDRPostFX::brightPassThreshold, "");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::gaussMultiplier", "Blur Multiplier", "range", "", $PostFX::HDRPostFX::gaussMultiplier, "0 1 10");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::gaussMean", "Blur Mean Value", "range", "", $PostFX::HDRPostFX::gaussMean, "0 1 10");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::gaussStdDev", "Blur Std. Dev Value", "range", "", $PostFX::HDRPostFX::gaussStdDev, "0 1 10");
-   PostEffectEditorInspector.endGroup();
+   PostEffectEditorInspector.endGroup(); 
    
    PostEffectEditorInspector.startGroup("HDR - Adaptation");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::enableAutoExposure", "Enable Auto Exposure", "bool", "", $PostFX::HDRPostFX::enableAutoExposure, "");
+   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::minLuminace", "Minimum Luminance", "range", "", $PostFX::HDRPostFX::minLuminace, "0 1 100");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::adaptRate", "Brightness Adapt Rate", "range", "", $PostFX::HDRPostFX::adaptRate, "0 1 10");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::keyValue", "Key Value", "range", "", $PostFX::HDRPostFX::keyValue, "0 1 10");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::enableBlueShift", "Enable Blue Shift", "bool", "", $PostFX::HDRPostFX::enableBlueShift, "");
-   PostEffectEditorInspector.addField("$PostFX::HDRPostFX::blueShiftColor", "Blue Shift Color", "colorF", "", $PostFX::HDRPostFX::blueShiftColor, "");
    PostEffectEditorInspector.endGroup();
 }
 
@@ -403,10 +412,16 @@ function HDRPostFX::applyFromPreset(%this)
       HDRPostFX.disable();
 }
 
+
+
 function HDRPostFX::savePresetSettings(%this)
 {
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::Enabled");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::exposureValue");
+   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::whitePoint");
+   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::logContrast");
+   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::saturationValue");
+   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::colorFilter");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::minLuminace");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::whiteCutoff");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::adaptRate");
@@ -414,12 +429,8 @@ function HDRPostFX::savePresetSettings(%this)
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::enableBloom");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::brightPassThreshold");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::gaussMultiplier");
-   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::gaussMean");
-   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::gaussStdDev");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::enableAutoExposure");
    PostFXManager::savePresetSetting("$PostFX::HDRPostFX::keyValue");
-   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::enableBlueShift");
-   PostFXManager::savePresetSetting("$PostFX::HDRPostFX::blueShiftColor");
 }
 
 singleton PostEffect( HDRPostFX )
@@ -570,9 +581,9 @@ singleton PostEffect( HDRPostFX )
 singleton ShaderData( LuminanceVisShader )
 {
    DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/luminanceVisP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/HDR_utils/luminanceVisP.hlsl";
    OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/luminanceVisP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/HDR_utils/luminanceVisP.glsl";
    
    samplerNames[0] = "$inputTex";
    
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurHP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurHP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurHP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurHP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurHP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurHP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurHP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurHP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurVP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurVP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurVP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurVP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurVP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurVP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/bloomGaussBlurVP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomGaussBlurVP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4P.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4P.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4P.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4P.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4P.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4P.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4V.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4V.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4V.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4V.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/downScale4x4V.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/downScale4x4V.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/brightPassFilterP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/brightPassFilterP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/brightPassFilterP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/brightPassFilterP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/brightPassFilterP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/brightPassFilterP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/brightPassFilterP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/brightPassFilterP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/calculateAdaptedLumP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/calculateAdaptedLumP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/calculateAdaptedLumP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/calculateAdaptedLumP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/calculateAdaptedLumP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/calculateAdaptedLumP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/calculateAdaptedLumP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/calculateAdaptedLumP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/luminanceVisP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/luminanceVisP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/luminanceVisP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/luminanceVisP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/luminanceVisP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/luminanceVisP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/luminanceVisP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/luminanceVisP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumInitialP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumInitialP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumInitialP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumInitialP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumInitialP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumInitialP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumInitialP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumInitialP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumIterativeP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumIterativeP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumIterativeP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumIterativeP.glsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumIterativeP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumIterativeP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/sampleLumIterativeP.hlsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Utils/sampleLumIterativeP.hlsl
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.glsl
new file mode 100644
index 000000000..fe374ba40
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.glsl
@@ -0,0 +1,40 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+vec3 TO_Exposure (vec3 x, float exposureValue, vec3 colorFilter)
+{
+   x = exp2(vec3(exposureValue))/2 * colorFilter;
+   return x;     
+} 
+
+vec3 TO_Saturation (vec3 x, float saturation)
+{   
+    float L = hdrLuminance(x); 
+	x = mix(vec3(L), x, saturation);	
+    return x; 
+}   
+     
+float TO_LogContrast (float x, float contrast)
+{       
+    float a =  0.15 + (log2(x + 0.0001f ) - 0.15)* contrast ;
+    return clamp(exp2(a)-0.0001f,0.0 , 2.5);  
+}  
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.hlsl
new file mode 100644
index 000000000..99aaf6316
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_colorUtils.hlsl
@@ -0,0 +1,43 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+#include "core/rendering/shaders/torque.hlsl"
+
+
+float3 TO_Exposure (float3 x, float exposureValue, float3 colorFilter)
+{
+   x = exp2(exposureValue)/2 * colorFilter;
+   return x;     
+} 
+
+float3 TO_Saturation (float3 x, float saturation)
+{   
+    float L = hdrLuminance(x); 
+	x = lerp(L, x, saturation);	
+    return x; 
+}   
+     
+float TO_LogContrast (float x, float contrast)
+{       
+    float a =  0.15 + (log2(x + 0.0001f ) - 0.15)* contrast ;
+    return clamp(exp2(a)-0.0001f,0.0 , 2.5);  
+}  
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
similarity index 50%
rename from Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.glsl
rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
index 3935cbf43..db171321c 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.glsl
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
@@ -24,7 +24,9 @@
 #include "core/rendering/shaders/gl/hlslCompat.glsl"
 #include "core/rendering/shaders/postFX/gl/postFx.glsl"
 #include "shadergen:/autogenConditioners.h"
-
+#include "HDR_Tonemap.glsl"   
+#include "HDR_colorUtils.glsl"
+#line 29
 uniform sampler2D sceneTex;
 uniform sampler2D luminanceTex;
 uniform sampler2D bloomTex;
@@ -39,59 +41,57 @@ uniform float g_fWhiteCutoff;
 uniform float g_fEnableAutoExposure;
 uniform float g_fTonemapMode;
 
-uniform float g_fEnableBlueShift;
-uniform vec3 g_fBlueShiftColor; 
-
 uniform float g_fBloomScale;
 
 uniform float g_fOneOverGamma;
 uniform float Brightness;
 uniform float Contrast;
 
+//Explicit HDR Params
+uniform float exposureValue;
+uniform float whitePoint;
+uniform float logContrast;
+uniform float brightnessValue;
+uniform float saturationValue;
+uniform float3 colorFilter;
+
 out vec4 OUT_col;
 
-// uncharted 2 tonemapper see: http://filmicgames.com/archives/75
-vec3 Uncharted2Tonemap(vec3 x)
-{
-   const float A = 0.15;
-   const float B = 0.50;
-   const float C = 0.10;
-   const float D = 0.20;
-   const float E = 0.02;
-   const float F = 0.30;
-   return ((x*(A*x + C*B) + D*E) / (x*(A*x + B) + D*F)) - E / F;
-}
 
-float3 ACESFilm( float3 x )
-{
-    const float a = 2.51;
-    const float b = 0.03;
-    const float c = 2.43;
-    const float d = 0.59;
-    const float e = 0.14;
-    return saturate((x*(a*x+b))/(x*(c*x+d)+e));
-}
-
-vec3 tonemap(vec3 c)
-{
-   vec3 colorOut = c;
-    
-   if(g_fTonemapMode == 1.0)
-   {
-      const float W = 11.2;
-      float ExposureBias = 2.0f;
-      //float ExposureAdjust = 1.5f;
-      //c *= ExposureAdjust;
-      colorOut = Uncharted2Tonemap(ExposureBias*colorOut);
-      colorOut = colorOut * (1.0f / Uncharted2Tonemap(vec3(W,W,W)));
+vec3 Tonemap(vec3 x)
+{ 
+    //ACES      
+    if(g_fTonemapMode == 1.0f)    
+   {           
+	  x = ACESFitted(x, whitePoint);    	  
+   }             
+   //Filmic Helji	       
+   if(g_fTonemapMode == 2.0f) 
+   {             
+      x = TO_Hejl(x, whitePoint);
+   }   
+   //Hable Uncharted 2          
+   if (g_fTonemapMode == 3.0)      
+   {                                              
+      x = TO_HableU2(x, whitePoint);         
+   }      
+                           
+   //Reinhard       
+   if (g_fTonemapMode == 4.0)
+   {   
+	  float L = hdrLuminance(x);   
+      vec3 nL = TO_Reinhard(vec3(L), whitePoint);
+      x *= (nL / L);                  	    	                           
+   }  
+        
+   //Linear Tonemap  
+   else if (g_fTonemapMode == 5.0)
+   {  
+      x = TO_Linear(x);  	   
    }
-   else if(g_fTonemapMode == 2.0)
-   {
-      colorOut = ACESFilm(colorOut);
-   }
-
-   return colorOut;
-}
+        
+   return x;
+}  
 
 void main()
 {
@@ -99,45 +99,48 @@ void main()
    float adaptedLum = texture( luminanceTex, vec2( 0.5f, 0.5f ) ).r;
    vec4 bloom = texture( bloomTex, IN_uv0 );
 
-   // For very low light conditions, the rods will dominate the perception
-   // of light, and therefore color will be desaturated and shifted
-   // towards blue.
-   if ( g_fEnableBlueShift > 0.0f )
-   {
-      const vec3 LUMINANCE_VECTOR = vec3(0.2125f, 0.7154f, 0.0721f);
-
-      // Define a linear blending from -1.5 to 2.6 (log scale) which
-      // determines the mix amount for blue shift
-      float coef = 1.0f - ( adaptedLum + 1.5 ) / 4.1;
-      coef = saturate( coef * g_fEnableBlueShift );
-
-      // Lerp between current color and blue, desaturated copy
-      vec3 rodColor = dot( _sample.rgb, LUMINANCE_VECTOR ) * g_fBlueShiftColor;
-      _sample.rgb = mix( _sample.rgb, rodColor, coef );
-	  
-      rodColor = dot( bloom.rgb, LUMINANCE_VECTOR ) * g_fBlueShiftColor;
-      bloom.rgb = mix( bloom.rgb, rodColor, coef );
-   }
-
-   // Add the bloom effect.
-   _sample.rgb += clamp(vec3(g_fBloomScale,g_fBloomScale,g_fBloomScale) * bloom.rgb, vec3(0,0,0), vec3(1.0,1.0,1.0));
+   
+        	    
+   // Add the bloom effect.     
+   _sample += (g_fBloomScale * bloom) / 10; 
+   
+   //Apply Exposure     
+   _sample.rgb *= TO_Exposure(_sample.rgb, exposureValue, colorFilter);
+   
+   	//Apply Saturation
+   _sample.rgb = TO_Saturation(_sample.rgb, saturationValue);
 
    // Apply contrast
    _sample.rgb = ((_sample.rgb - 0.5f) * Contrast) + 0.5f;
 
    // Apply brightness
    //_sample.rgb += Brightness;
+   
+    //Apply Color Contrast   
+   _sample.r = TO_LogContrast(_sample.r, logContrast);
+   _sample.g = TO_LogContrast(_sample.g, logContrast);  
+   _sample.b = TO_LogContrast(_sample.b, logContrast);
 
    //tonemapping - TODO fix up eye adaptation
-   if ( g_fEnableToneMapping > 0.0f )
-   {
-      float adapation = 1;
-
-      if ( g_fEnableAutoExposure > 0.0f )
-         adapation = (g_fMiddleGray / (adaptedLum + 0.0001)) * hdrLuminance( _sample.rgb );
-
-      _sample.rgb = tonemap(_sample.rgb * adapation);
-   }
+   if ( g_fEnableToneMapping > 0.0f )  
+   {    
+      float adapation = 1.0;  
+	   
+      if( g_fEnableAutoExposure > 0.0f )  
+	   {  	     		 
+         adaptedLum = saturate(adaptedLum); 
+         float linearExposure = (g_fMiddleGray / adaptedLum);
+         adapation = log2(max(linearExposure, 0.0001f));     
+		          
+         _sample.rgb = Tonemap(exposureValue * _sample.rgb *exp2(adapation)); 
+	   }   
+         
+        else {
+		
+		  _sample.rgb = Tonemap(_sample.rgb);
+	    }		
+      	           
+   }      
 
    OUT_col = _sample;
 }
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
new file mode 100644
index 000000000..7f4316b10
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
@@ -0,0 +1,153 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+      
+#include "core/rendering/shaders/torque.hlsl"
+#include "core/rendering/shaders/postFX/postFx.hlsl"
+#include "core/rendering/shaders/shaderModelAutoGen.hlsl"
+#include "./HDR_Tonemap.hlsl"   
+#include "./HDR_colorUtils.hlsl"
+                 
+TORQUE_UNIFORM_SAMPLER2D(sceneTex, 0);
+TORQUE_UNIFORM_SAMPLER2D(luminanceTex, 1);
+TORQUE_UNIFORM_SAMPLER2D(bloomTex, 2);
+
+uniform float2 texSize0;
+uniform float2 texSize2;
+ 
+uniform float g_fEnableToneMapping;
+uniform float g_fMiddleGray;
+
+uniform float g_fEnableAutoExposure;
+uniform float g_fTonemapMode;
+
+uniform float g_fBloomScale;
+uniform float g_fOneOverGamma;
+uniform float Brightness;
+uniform float Contrast;
+
+//Explicit HDR Params
+uniform float exposureValue;
+uniform float whitePoint;
+uniform float logContrast;
+uniform float brightnessValue;
+uniform float saturationValue;
+uniform float3 colorFilter;
+
+vec3 ACESFitted(vec3 x, float w)
+{
+     x = tMul(ACESInputMat, x);
+
+     // Apply RRT and ODT
+     x = RRTAndODTFit(x, w);
+
+     x = tMul(ACESOutputMat, x);
+     
+     // Clamp to [0, 1]
+    return saturate(x);
+     
+}
+            
+float3 Tonemap(float3 x)
+{ 
+    //ACES      
+    if(g_fTonemapMode == 1.0f)    
+   {           
+	  x = ACESFitted(x, whitePoint);    	  
+   }             
+   //Filmic Helji	       
+   if(g_fTonemapMode == 2.0f) 
+   {             
+      x = TO_Hejl(x, whitePoint);
+   }   
+   //Hable Uncharted 2          
+   if (g_fTonemapMode == 3.0)      
+   {                                              
+      x = TO_HableU2(x, whitePoint);         
+   }      
+                           
+   //Reinhard       
+   if (g_fTonemapMode == 4.0)
+   {   
+	  float L = hdrLuminance(x);   
+      float3 nL = TO_Reinhard(L, whitePoint);
+      x *= (nL / L);                  	    	                           
+   }  
+        
+   //Linear Tonemap  
+   else if (g_fTonemapMode == 5.0)
+   {  
+      x = TO_Linear(x);  	   
+   }
+        
+   return x;
+}  
+   
+float4 main( PFXVertToPix IN ) : TORQUE_TARGET0
+{
+   float4 sample = hdrDecode( TORQUE_TEX2D( sceneTex, IN.uv0 ) );
+   float adaptedLum = TORQUE_TEX2D( luminanceTex, float2( 0.5f, 0.5f ) ).r;
+   float4 bloom = TORQUE_TEX2D( bloomTex, IN.uv0 ); 
+        	    
+   // Add the bloom effect.     
+   sample += (g_fBloomScale * bloom) / 10;         
+   			
+	//Apply Exposure     
+   sample.rgb *= TO_Exposure(sample.rgb, exposureValue, colorFilter); 
+                                        
+   	//Apply Saturation
+   sample.rgb = TO_Saturation(sample.rgb, saturationValue);	      	    
+                                                         
+   // Apply Screen contrast 
+   sample.rgb = ((sample.rgb - 0.5f) * Contrast) + 0.5f;
+      
+   // Apply Screen brightness
+   //sample.rgb += Brightness;
+                                                  
+   	 //Apply Color Contrast   
+   sample.r = TO_LogContrast(sample.r, logContrast);
+   sample.g = TO_LogContrast(sample.g, logContrast);  
+   sample.b = TO_LogContrast(sample.b, logContrast);
+                                                                                                     
+   //tonemapping - TODO fix up eye adaptation
+   if ( g_fEnableToneMapping > 0.0f )  
+   {    
+      float adapation = 1.0;  
+	   
+      if( g_fEnableAutoExposure > 0.0f )  
+	   {  	     		 
+         adaptedLum = saturate(adaptedLum); 
+         float linearExposure = (g_fMiddleGray * rcp(adaptedLum));
+         adapation = log2(max(linearExposure, 0.0001f));     
+		          
+         sample.rgb = Tonemap(exposureValue * sample.rgb *exp2(adapation)); 
+	   }   
+         
+        else {
+		
+		  sample.rgb = Tonemap(sample.rgb);
+	    }		
+      	           
+   }      
+      
+   return sample;
+}  
+      
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
new file mode 100644
index 000000000..973111d02
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
@@ -0,0 +1,124 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+// Stephen Hill's ACES Fit
+// Source: https://github.com/TheRealMJP/BakingLab/blob/master/BakingLab/ACES.hlsl
+#line 24
+// sRGB => XYZ => D65_2_D60 => AP1 => RRT_SAT
+const mat3 ACESInputMat = mat3
+(
+     0.59719, 0.35458, 0.04823,
+     0.07600, 0.90834, 0.01566,
+     0.02840, 0.13383, 0.83777
+); 
+
+// ODT_SAT => XYZ => D60_2_D65 => sRGB
+const mat3 ACESOutputMat = mat3
+(
+     1.60475, -0.53108, -0.07367,
+     -0.10208,  1.10813, -0.00605,
+     -0.00327, -0.07276,  1.07602
+);
+
+vec3 RRTAndODTFit(vec3 x, float w)
+{
+     vec3 a = vec3((x * (x + 0.0245786f) - 0.000090537f) / (x * (0.983729f * x + 0.4329510f) + 0.238081f));
+     vec3 b = vec3((w * (w + 0.0245786f) - 0.000090537f) / (w * (0.983729f * w + 0.4329510f) + 0.238081f));
+     return a/b;
+}
+
+vec3 ACESFitted(vec3 x, float w)
+{
+     x = tMul(ACESInputMat, x);
+
+     // Apply RRT and ODT
+     x = RRTAndODTFit(x, w);
+
+     x = tMul(ACESOutputMat, x);
+     
+     // Clamp to [0, 1]
+    return saturate(x);
+     
+}
+
+
+// Luminance Reinhard Operator as explained in: 
+// Source: https://imdoingitwrong.wordpress.com/2010/08/19/why-reinhard-desaturates-my-blacks-3/  
+vec3 TO_Reinhard(vec3 x, float w) 
+{
+     vec3 n = x * (1.0f + (x / (w * w)));
+     return saturate(n / (1.0f + x)); 
+} 
+           
+// John Hable Uncharted 2 Operator
+// We're actually using his filmic curve from: https://www.slideshare.net/naughty_dog/lighting-shading-by-john-hable
+vec3 TO_HableU2(vec3 x, float w)
+{
+      
+     //x *= 1.5f;	  //Hardcoded Exposure
+	 vec3 curr =  vec3(((x* (0.22f * x + 0.10f * 0.30f) + 0.20f * 0.01f)/
+	                 (x* (0.22f * x + 0.30f) + 0.20f * 0.30f))-0.01f/0.30f);
+	 
+	 vec3 white = vec3(((w* (0.22f * w + 0.10f * 0.30f) + 0.20f * 0.01f)/
+	                 (w* (0.22f * w + 0.30f) + 0.20f * 0.30f))-0.01f/0.30f);
+	  
+     return saturate(curr / white);        
+}
+  
+// Jim Hejl 2015 Filmic Curve 
+// Source: https://twitter.com/jimhejl/status/633777619998130176/
+vec3 TO_Hejl (vec3 x, float w)
+{
+     vec4 vh = vec4 (x, w);
+	 vec4 va = (1.425 * vh) + 0.05f;
+	 vec4 vf = ((vh * va + 0.004f) / ((vh * (va + 0.55f) + 0.0491f))) - 0.0821f;
+	
+	return saturate(vf.rgb / vf.www);
+}
+
+
+vec3 TO_Linear (vec3 x)
+{
+     return saturate((x * (1.8 * x + 1.4)) / (x * (1.8 * x + 0.5) + 1.5));
+}
+
+
+/* Narkowicz ACES Tonemap Curve
+   Source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
+vec3 ACES_Narkowicz( vec3 x )
+{
+     const float a = 2.51f;
+     const float b = 0.03f;
+     const float c = 2.43f;
+     const float d = 0.59f;
+     const float e = 0.14f;
+    return saturate((x*(a*x+b))/(x*(c*x+d)+e));
+}
+
+ Filmic ALU Curve Jim Hejl and Richard Burgess-Dawson 
+ Source: http://filmicworlds.com/blog/filmic-tonemapping-operators/
+vec3 TO_Filmic(vec3 x)
+{   
+     x = max(0,x-0.004f);
+     return (x*(6.2f*x+.5f))/(x*(6.2f*x+1.7f)+0.06f);
+}   
+
+*/  
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.hlsl
new file mode 100644
index 000000000..aace8b38f
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.hlsl
@@ -0,0 +1,126 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+
+// Stephen Hill's ACES Fit
+// Source: https://github.com/TheRealMJP/BakingLab/blob/master/BakingLab/ACES.hlsl
+
+// sRGB => XYZ => D65_2_D60 => AP1 => RRT_SAT
+static const float3x3 ACESInputMat =
+{
+     {0.59719, 0.35458, 0.04823},
+     {0.07600, 0.90834, 0.01566},
+     {0.02840, 0.13383, 0.83777}
+}; 
+
+// ODT_SAT => XYZ => D60_2_D65 => sRGB
+static const float3x3 ACESOutputMat =
+{
+     { 1.60475, -0.53108, -0.07367},
+     {-0.10208,  1.10813, -0.00605},
+     {-0.00327, -0.07276,  1.07602}
+};
+
+float3 RRTAndODTFit(float3 x, float w)
+{
+     float3 a = (x * (x + 0.0245786f) - 0.000090537f) / (x * (0.983729f * x + 0.4329510f) + 0.238081f);
+     float3 b = (w * (w + 0.0245786f) - 0.000090537f) / (w * (0.983729f * w + 0.4329510f) + 0.238081f);
+     return a/b;
+}
+
+float3 ACESFitted(float3 x, float w)
+{
+     x = mul(ACESInputMat, x);
+
+     // Apply RRT and ODT
+     x = RRTAndODTFit(x, w);
+
+     x = mul(ACESOutputMat, x);
+     
+     // Clamp to [0, 1]
+    return saturate(x);
+     
+}
+
+
+// Luminance Reinhard Operator as explained in: 
+// Source: https://imdoingitwrong.wordpress.com/2010/08/19/why-reinhard-desaturates-my-blacks-3/  
+float3 TO_Reinhard(float3 x, float w) 
+{
+     float3 n = x * (1.0f + (x / (w * w)));
+     return saturate(n / (1.0f + x)); 
+} 
+           
+// John Hable Uncharted 2 Operator
+// We're actually using his filmic curve from: https://www.slideshare.net/naughty_dog/lighting-shading-by-john-hable
+float3 TO_HableU2(float3 x, float w)
+{
+      
+     //x *= 1.5f;	  //Hardcoded Exposure
+	 float3 curr =  ((x* (0.22f * x + 0.10f * 0.30f) + 0.20f * 0.01f)/
+	                 (x* (0.22f * x + 0.30f) + 0.20f * 0.30f))-0.01f/0.30f;
+	 
+	 float3 white = ((w* (0.22f * w + 0.10f * 0.30f) + 0.20f * 0.01f)/
+	                 (w* (0.22f * w + 0.30f) + 0.20f * 0.30f))-0.01f/0.30f;
+	  
+     return saturate(curr / white);        
+}
+  
+// Jim Hejl 2015 Filmic Curve 
+// Source: https://twitter.com/jimhejl/status/633777619998130176/
+float3 TO_Hejl (float3 x, float w)
+{
+     float4 vh = float4 (x, w);
+	 float4 va = (1.425 * vh) + 0.05f;
+	 float4 vf = ((vh * va + 0.004f) / ((vh * (va + 0.55f) + 0.0491f))) - 0.0821f;
+	
+	return saturate(vf.rgb / vf.www);
+}
+
+
+float3 TO_Linear (float3 x)
+{
+     return saturate((x * (1.8 * x + 1.4)) / (x * (1.8 * x + 0.5) + 1.5));
+}
+
+
+/* Narkowicz ACES Tonemap Curve
+   Source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
+float3 ACES_Narkowicz( float3 x )
+{
+     const float a = 2.51f;
+     const float b = 0.03f;
+     const float c = 2.43f;
+     const float d = 0.59f;
+     const float e = 0.14f;
+    return saturate((x*(a*x+b))/(x*(c*x+d)+e));
+}
+
+ Filmic ALU Curve Jim Hejl and Richard Burgess-Dawson 
+ Source: http://filmicworlds.com/blog/filmic-tonemapping-operators/
+float3 TO_Filmic(float3 x)
+{   
+     x = max(0,x-0.004f);
+     return (x*(6.2f*x+.5f))/(x*(6.2f*x+1.7f)+0.06f);
+}   
+
+*/  
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.hlsl
deleted file mode 100644
index 2cbd78d1b..000000000
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/finalPassCombineP.hlsl
+++ /dev/null
@@ -1,167 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2012 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#include "core/rendering/shaders/torque.hlsl"
-#include "core/rendering/shaders/postFX/postFx.hlsl"
-#include "core/rendering/shaders/shaderModelAutoGen.hlsl"
-
-TORQUE_UNIFORM_SAMPLER2D(sceneTex, 0);
-TORQUE_UNIFORM_SAMPLER2D(luminanceTex, 1);
-TORQUE_UNIFORM_SAMPLER2D(bloomTex, 2);
-
-uniform float2 texSize0;
-uniform float2 texSize2;
-
-uniform float g_fEnableToneMapping;
-uniform float g_fMiddleGray;
-uniform float g_fWhiteCutoff;
-uniform float g_fEnableBlueShift;
-
-uniform float g_fEnableAutoExposure;
-uniform float g_fTonemapMode;
-
-uniform float3 g_fBlueShiftColor;
-uniform float g_fBloomScale;
-uniform float g_fOneOverGamma;
-uniform float Brightness;
-uniform float Contrast;
-uniform float ExposureValue;
-   
-
-float3 Reinhard(float3 x) 
-{
-    x *= 2.0;    
-    return x / (1.0 + x);
-} 
- 
- 
-float3 Filmic(float3 x)
-{   
-    x *= 0.4;   
-    x = max(0,x-0.004);
-    return (x*(6.2*x+.5))/(x*(6.2*x+1.7)+0.06);
-}   
-   
-// Uncharted 2 tonemapper see: http://filmicgames.com/archives/75
-float3 Uncharted2Tonemap(const float3 x)
-{
-   const float A = 0.15;
-   const float B = 0.50;
-   const float C = 0.10;
-   const float D = 0.20;
-   const float E = 0.02;
-   const float F = 0.30;
-   return ((x*(A*x + C*B) + D*E) / (x*(A*x + B) + D*F)) - E / F;
-}
-
-float3 ACESFilm( float3 x )
-{
-    const float a = 2.51;
-    const float b = 0.03;
-    const float c = 2.43;
-    const float d = 0.59;
-    const float e = 0.14;
-    return saturate((x*(a*x+b))/(x*(c*x+d)+e));
-}
-
-float3 tonemap(float3 color)
-{
-   if(g_fTonemapMode == 1.0)
-   {
-      color = ACESFilm(color);
-   }
-    
-   if(g_fTonemapMode == 2.0)
-   { 
-        
-      color *= 2.5; // compensate exposure to final image  
-      const float W = 11.2;
-      float ExposureBias = 2.0f;
-      
-      color = Uncharted2Tonemap(ExposureBias*color);
-      color = color * (1.0f / Uncharted2Tonemap(W));
-   } 
-    
-   if (g_fTonemapMode == 3.0)
-   {  
-       
-      color = Filmic(color);
-   } 
-       
-   else if (g_fTonemapMode == 4.0)
-   {   
-      color = Reinhard(color);
-   }
-    
-   return color;
-}
-
-float4 main( PFXVertToPix IN ) : TORQUE_TARGET0
-{
-   float4 sample = hdrDecode( TORQUE_TEX2D( sceneTex, IN.uv0 ) );
-   float adaptedLum = TORQUE_TEX2D( luminanceTex, float2( 0.5f, 0.5f ) ).r;
-   float4 bloom = TORQUE_TEX2D( bloomTex, IN.uv0 );
-
-   // For very low light conditions, the rods will dominate the perception
-   // of light, and therefore color will be desaturated and shifted
-   // towards blue.
-   if ( g_fEnableBlueShift > 0.0f )
-   {
-      const float3 LUMINANCE_VECTOR = float3(0.2125f, 0.7154f, 0.0721f);
-
-      // Define a linear blending from -1.5 to 2.6 (log scale) which
-      // determines the lerp amount for blue shift
-      float coef = 1.0f - ( adaptedLum + 1.5 ) / 4.1;
-      coef = saturate( coef * g_fEnableBlueShift );
-
-      // Lerp between current color and blue, desaturated copy
-      float3 rodColor = dot( sample.rgb, LUMINANCE_VECTOR ) * g_fBlueShiftColor;
-      sample.rgb = lerp( sample.rgb, rodColor, coef );
-	  
-      rodColor = dot( bloom.rgb, LUMINANCE_VECTOR ) * g_fBlueShiftColor;
-      bloom.rgb = lerp( bloom.rgb, rodColor, coef );
-   }
-
-   sample.rgb *= ExposureValue;
-   
-   // Add the bloom effect.
-   sample += saturate(g_fBloomScale * bloom);
-
-   // Apply contrast
-   sample.rgb = ((sample.rgb - 0.5f) * Contrast) + 0.5f;
-
-   // Apply brightness
-   //sample.rgb += Brightness;
-
-   //tonemapping - TODO fix up eye adaptation
-   if ( g_fEnableToneMapping > 0.0f )
-   {
-      float adapation = 1;
-
-      if( g_fEnableAutoExposure > 0.0f )
-         adapation = (g_fMiddleGray / (adaptedLum + 0.0001)) * hdrLuminance( sample.rgb );
-
-      sample.rgb = tonemap(sample.rgb * adapation);
-   }
-
-   return sample;
-}
diff --git a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
index 87cbec96c..23a281b6d 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
+++ b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
@@ -1,21 +1,32 @@
 $PostFX::HDRPostFX::Enabled = 1;
-$PostFX::HDRPostFX::ExposureValue = "1";
+$PostFX::HDRPostFX::exposureValue = "1.5";
+$PostFX::HDRPostFX::whitePoint = "2";
+$PostFX::HDRPostFX::logContrast = "1.25";
+$PostFX::HDRPostFX::saturationValue = "1";
+$PostFX::HDRPostFX::colorFilter = "1.0 1.0 1.0";
 $PostFX::HDRPostFX::minLuminace = "0.001";
-$PostFX::HDRPostFX::whiteCutoff = "1.0";
-$PostFX::HDRPostFX::adaptRate = "1";
+$PostFX::HDRPostFX::adaptRate = "0.85";
 $PostFX::HDRPostFX::tonemapMode = "ACES";
 $PostFX::HDRPostFX::enableBloom = "1";
-$PostFX::HDRPostFX::brightPassThreshold = "0.2";
-$PostFX::HDRPostFX::gaussMultiplier = "0.145";
-$PostFX::HDRPostFX::gaussMean = "0";
-$PostFX::HDRPostFX::gaussStdDev = "0.5";
-$PostFX::HDRPostFX::enableAutoExposure = "0";
-$PostFX::HDRPostFX::keyValue = "0.18";
-$PostFX::HDRPostFX::enableBlueShift = "0";
-$PostFX::HDRPostFX::blueShiftColor = "1.05 0.97 1.27";
-$PostFX::SharpenPostFX::Enabled = "1";
-$PostFX::SharpenPostFX::sharpness = "0.15";
+$PostFX::HDRPostFX::brightPassThreshold = "0.02";
+$PostFX::HDRPostFX::gaussMultiplier = "0.4";
+$PostFX::HDRPostFX::enableAutoExposure = "1";
+$PostFX::HDRPostFX::keyValue = "0.115";
+$PostFX::SSAOPostFx::Enabled = 1;
+$PostFX::SSAOPostFX::quality = "2";
+$PostFX::SSAOPostFX::sRadius = 0.1;
+$PostFX::SSAOPostFX::sStrength = 6;
+$PostFX::SSAOPostFX::sDepthMin = 0.1;
+$PostFX::SSAOPostFX::sDepthMax = 1;
+$PostFX::SSAOPostFX::sNormalTol = 0;
+$PostFX::SSAOPostFX::sNormalPow = 1;
+$PostFX::SSAOPostFX::lRadius = 1;
+$PostFX::SSAOPostFX::lStrength = 10;
+$PostFX::SSAOPostFX::lDepthMin = 0.2;
+$PostFX::SSAOPostFX::lDepthMax = 2;
+$PostFX::SSAOPostFX::lNormalTol = -0.5;
+$PostFX::SSAOPostFX::lNormalPow = 2;
 $PostFX::VignettePostFX::Enabled = "1";
 $PostFX::VignettePostFX::VMin = "0.25";
-$PostFX::VignettePostFX::VMax = "0.9";
+$PostFX::VignettePostFX::VMax = "0.8";
 $PostFX::VignettePostFX::Color = "0 0 0 1";

From 05409537b02b85c4ab0b477ab96b6448c589928f Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 28 Aug 2022 22:31:01 -0500
Subject: [PATCH 02/11] eroneous convertsion leftover

---
 .../core/postFX/scripts/HDR/HDR_finalPass.hlsl     | 14 --------------
 1 file changed, 14 deletions(-)

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 7f4316b10..bf5b2e174 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
@@ -51,20 +51,6 @@ uniform float logContrast;
 uniform float brightnessValue;
 uniform float saturationValue;
 uniform float3 colorFilter;
-
-vec3 ACESFitted(vec3 x, float w)
-{
-     x = tMul(ACESInputMat, x);
-
-     // Apply RRT and ODT
-     x = RRTAndODTFit(x, w);
-
-     x = tMul(ACESOutputMat, x);
-     
-     // Clamp to [0, 1]
-    return saturate(x);
-     
-}
             
 float3 Tonemap(float3 x)
 { 

From 433149a0afeba21ca8e9f1eb33eb72a02e4ea570 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 28 Aug 2022 22:58:40 -0500
Subject: [PATCH 03/11] mat3 is the other hand from matrix3x3 also vec3 from
 float3 for consistency

---
 .../core/postFX/scripts/HDR/HDR_finalPass.glsl   |  2 +-
 .../core/postFX/scripts/HDR/HDR_toneMap.glsl     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

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 db171321c..42bf7d17f 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
@@ -53,7 +53,7 @@ uniform float whitePoint;
 uniform float logContrast;
 uniform float brightnessValue;
 uniform float saturationValue;
-uniform float3 colorFilter;
+uniform vec3 colorFilter;
 
 out vec4 OUT_col;
 
diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
index 973111d02..91f6d7367 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_toneMap.glsl
@@ -24,18 +24,18 @@
 #line 24
 // sRGB => XYZ => D65_2_D60 => AP1 => RRT_SAT
 const mat3 ACESInputMat = mat3
-(
-     0.59719, 0.35458, 0.04823,
-     0.07600, 0.90834, 0.01566,
-     0.02840, 0.13383, 0.83777
+(     
+     0.59719, 0.07600, 0.02840,
+     0.35458, 0.90834, 0.13383,
+     0.04823, 0.01566, 0.83777
 ); 
 
 // ODT_SAT => XYZ => D60_2_D65 => sRGB
 const mat3 ACESOutputMat = mat3
-(
-     1.60475, -0.53108, -0.07367,
-     -0.10208,  1.10813, -0.00605,
-     -0.00327, -0.07276,  1.07602
+(     
+     1.60475, -0.10208, -0.00327,
+     -0.53108,  1.10813, -0.07276,
+     -0.07367, -0.00605,  1.07602
 );
 
 vec3 RRTAndODTFit(vec3 x, float w)

From eda7862f7da63ccb08b47a0972427d601b0aa7d5 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 28 Aug 2022 23:23:01 -0500
Subject: [PATCH 04/11] correct tag

---
 .../BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
index 726830b77..1d0b7485d 100644
--- a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
+++ b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
@@ -376,7 +376,7 @@ function HDRPostFX::populatePostFXSettings(%this)
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::whitePoint", "White Point", "float", "", $PostFX::HDRPostFX::whitePoint, " 2");
    PostEffectEditorInspector.endGroup();
     
-   PostEffectEditorInspector.startGroup("HDR - Color Correction");
+   PostEffectEditorInspector.startGroup("HDR - Image Adjustments");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::logContrast", "Contrast", "range", "", $PostFX::HDRPostFX::logContrast, "1 2 20");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::saturationValue", "Saturation", "range", "", $PostFX::HDRPostFX::saturationValue, "0 2 20");
    PostEffectEditorInspector.addField("$PostFX::HDRPostFX::colorFilter", "Color Tint", "colorF", "", $PostFX::HDRPostFX::colorFilter, "0 0 0");

From 5b1e20f28c72b82074a9461d03d38e45d2f08d7d Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Mon, 29 Aug 2022 18:04:55 +0100
Subject: [PATCH 05/11] OpenAL Mac

Cleanup print functions cos mac hates them. All these functions did was print what was capable on openal anyway end user doesn't really get any benefit from this. Will save these for the refactor.
---
 Engine/source/sfx/openal/LoadOAL.h       |   5 +-
 Engine/source/sfx/openal/aldlist.cpp     |  14 +-
 Engine/source/sfx/openal/sfxALDevice.cpp | 155 +----------------------
 3 files changed, 15 insertions(+), 159 deletions(-)

diff --git a/Engine/source/sfx/openal/LoadOAL.h b/Engine/source/sfx/openal/LoadOAL.h
index 01455797a..85493c082 100644
--- a/Engine/source/sfx/openal/LoadOAL.h
+++ b/Engine/source/sfx/openal/LoadOAL.h
@@ -28,7 +28,7 @@
 #endif
 
 #if defined(TORQUE_OS_MAC)
-//#define AL_ALEXT_PROTOTYPES true
+#undef AL_ALEXT_PROTOTYPES
 #  include <OpenAL/al.h>
 #  include <OpenAL/alc.h>
 #elif defined(TORQUE_OS_LINUX)
@@ -267,12 +267,11 @@ typedef struct
    LPALGETAUXILIARYEFFECTSLOTIV			alGetAuxiliaryEffectSlotiv;
    LPALGETAUXILIARYEFFECTSLOTF			alGetAuxiliaryEffectSlotf;
    LPALGETAUXILIARYEFFECTSLOTFV			alGetAuxiliaryEffectSlotfv;
-#endif
    LPALGENFILTERS         alGenFilters;
    LPALDELETEFILTERS      alDeleteFilters;
    LPALFILTERI            alFilteri;
-
    LPALCGETSTRINGISOFT alcGetStringiSOFT;
+#endif
 
 } OPENALFNTABLE, *LPOPENALFNTABLE;
 #endif
diff --git a/Engine/source/sfx/openal/aldlist.cpp b/Engine/source/sfx/openal/aldlist.cpp
index c9a422050..b80efd21f 100644
--- a/Engine/source/sfx/openal/aldlist.cpp
+++ b/Engine/source/sfx/openal/aldlist.cpp
@@ -83,17 +83,23 @@ ALDeviceList::ALDeviceList( const OPENALFNTABLE &oalft )
          dMemset(&ALDeviceInfo, 0, sizeof(ALDEVICEINFO));
          ALDeviceInfo.bSelected = true;
          dStrncpy(ALDeviceInfo.strInternalDeviceName, devices, sizeof(ALDeviceInfo.strInternalDeviceName));
-         char* openFind = dStrchr(devices, '(');
+         char deviceExternal[256];
+         dStrcpy(deviceExternal, devices, 256);
+         char* openFind = dStrchr(deviceExternal, '(');
          if (openFind)
          {
-            devices = openFind + 1;
-            char* closeFind = dStrchr(devices, ')');
+            char* deviceName = openFind + 1;
+            char* closeFind = dStrchr(deviceName, ')');
             if (closeFind)
                (*closeFind) = '\0';
 
-            dStrncpy(ALDeviceInfo.strDeviceName, devices, sizeof(ALDeviceInfo.strDeviceName));
+            dStrncpy(ALDeviceInfo.strDeviceName, deviceName, sizeof(ALDeviceInfo.strDeviceName));
 
          }
+         else
+         {
+            dStrncpy(ALDeviceInfo.strDeviceName, devices, sizeof(ALDeviceInfo.strDeviceName));
+         }
 
          vDeviceInfo.push_back(ALDeviceInfo);
       }
diff --git a/Engine/source/sfx/openal/sfxALDevice.cpp b/Engine/source/sfx/openal/sfxALDevice.cpp
index cab3ea99f..bd5b6f3d6 100644
--- a/Engine/source/sfx/openal/sfxALDevice.cpp
+++ b/Engine/source/sfx/openal/sfxALDevice.cpp
@@ -62,161 +62,13 @@ void SFXALDevice::printALInfo(ALCdevice* device)
   
 }
 
-void SFXALDevice::printHRTFInfo(ALCdevice* device)
-{
-   if (mOpenAL.alcIsExtensionPresent(device, "ALC_SOFT_HRTF") == AL_FALSE)
-   {
-      Con::printf("HRTF Extensions not compatible");
-      return;
-   }
-
-   ALCint numHrtfs;
-
-   mOpenAL.alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &numHrtfs);
-   if (!numHrtfs)
-      Con::printf("No HRTFs Found");
-   else
-   {
-      Con::printf("Available HRTFs");
-      for (U32 i = 0; i < numHrtfs; ++i)
-      {
-         const ALCchar* name = mOpenAL.alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
-         printf("   %s", name);
-      }
-   }
-
-   U32 err = mOpenAL.alcGetError(device);
-   if (err != ALC_NO_ERROR)
-      Con::errorf("SFXALDevice - Error Retrieving HRTF info: %s", mOpenAL.alcGetString(device, err));
-
-}
-
-void SFXALDevice::getEFXInfo(ALCdevice *device)
-{
-   static const ALint filters[] = {
-        AL_FILTER_LOWPASS, AL_FILTER_HIGHPASS, AL_FILTER_BANDPASS,
-        AL_FILTER_NULL
-   };
-
-   char filterNames[] = "Low-pass,High-pass,Band-pass,";
-   static const ALint effects[] = {
-       AL_EFFECT_EAXREVERB, AL_EFFECT_REVERB, AL_EFFECT_CHORUS,
-       AL_EFFECT_DISTORTION, AL_EFFECT_ECHO, AL_EFFECT_FLANGER,
-       AL_EFFECT_FREQUENCY_SHIFTER, AL_EFFECT_VOCAL_MORPHER,
-       AL_EFFECT_PITCH_SHIFTER, AL_EFFECT_RING_MODULATOR,
-       AL_EFFECT_AUTOWAH, AL_EFFECT_COMPRESSOR, AL_EFFECT_EQUALIZER,
-       AL_EFFECT_NULL
-   };
-   static const ALint dedeffects[] = {
-       AL_EFFECT_DEDICATED_DIALOGUE, AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT,
-       AL_EFFECT_NULL
-   };
-   char effectNames[] = "EAX Reverb,Reverb,Chorus,Distortion,Echo,Flanger,"
-      "Frequency Shifter,Vocal Morpher,Pitch Shifter,Ring Modulator,Autowah,"
-      "Compressor,Equalizer,Dedicated Dialog,Dedicated LFE,";
-
-   ALCint major, minor, sends;
-   ALuint obj;
-
-   char* current;
-   U32 i;
-
-   if (mOpenAL.alcIsExtensionPresent(device, "ALC_EXT_EFX") == AL_FALSE)
-   {
-      Con::printf("SFXALDevice - EFX Not available.");
-      return;
-   }
-
-   mOpenAL.alcGetIntegerv(device, ALC_EFX_MAJOR_VERSION, 1, &major);
-   mOpenAL.alcGetIntegerv(device, ALC_EFX_MINOR_VERSION, 1, &minor);
-   U32 err = mOpenAL.alcGetError(device);
-   if (err != ALC_NO_ERROR)
-      Con::errorf("SFXALDevice - Error Retrieving EFX Version: %s", mOpenAL.alcGetString(device, err));
-   else
-   {
-      Con::printf("| EFX Version: %d.%d", major, minor);
-   }
-
-   mOpenAL.alcGetIntegerv(device, ALC_MAX_AUXILIARY_SENDS, 1, &sends);
-   err = mOpenAL.alcGetError(device);
-   if (err != ALC_NO_ERROR)
-      Con::errorf("SFXALDevice - Error Retrieving Auxiliary Sends: %s", mOpenAL.alcGetString(device, err));
-   else
-   {
-      Con::printf("| Max Aux Sends: %d", sends);
-   }
-
-   mOpenAL.alGenFilters(1, &obj);
-   err = mOpenAL.alcGetError(device);
-   if (err != ALC_NO_ERROR)
-      Con::errorf("SFXALDevice - Error Generating filter: %s", mOpenAL.alcGetString(device, err));
-
-   current = filterNames;
-   for (i = 0; filters[i] != AL_FILTER_NULL; i++)
-   {
-      char* next = dStrchr(current, ',');
-
-      mOpenAL.alFilteri(obj, AL_FILTER_TYPE, filters[i]);
-      if (mOpenAL.alGetError() != AL_NO_ERROR)
-         dMemmove(current, next + 1, strlen(next));
-      else
-         current = next + 1;
-   }
-
-   Con::printf("| Supported Filters: %s", filterNames);
-
-   mOpenAL.alDeleteFilters(1, &obj);
-
-   mOpenAL.alGenEffects(1, &obj);
-   err = mOpenAL.alcGetError(device);
-   if (err != ALC_NO_ERROR)
-      Con::errorf("SFXALDevice - Error Generating effects: %s", mOpenAL.alcGetString(device, err));
-
-   current = effectNames;
-   for (i = 0; effects[i] != AL_EFFECT_NULL; i++)
-   {
-      char* next = dStrchr(current, ',');
-      mOpenAL.alEffecti(obj, AL_FILTER_TYPE, effects[i]);
-      if (mOpenAL.alGetError() != AL_NO_ERROR)
-         dMemmove(current, next + 1, strlen(next));
-      else
-         current = next + 1;
-   }
-
-   if (mOpenAL.alcIsExtensionPresent(device, "ALC_EXT_DEDICATED"))
-   {
-      for (i = 0; dedeffects[i] != AL_EFFECT_NULL; i++)
-      {
-         char* next = dStrchr(current, ',');
-         mOpenAL.alEffecti(obj, AL_FILTER_TYPE, dedeffects[i]);
-         if (mOpenAL.alGetError() != AL_NO_ERROR)
-            dMemmove(current, next + 1, strlen(next));
-         else
-            current = next + 1;
-      }
-   }
-   else
-   {
-      for (i = 0; dedeffects[i] != AL_EFFECT_NULL; i++)
-      {
-         char* next = dStrchr(current, ',');
-         dMemmove(current, next + 1, strlen(next));
-      }
-   }
-
-   Con::printf("| Supported Effects: %s", effectNames);
-
-   mOpenAL.alDeleteEffects(1, &obj);
-}
-
 S32 SFXALDevice::getMaxSources()
 {
-   // Clear AL Error Code
    mOpenAL.alGetError();
-
+   
    ALCint nummono;
    mOpenAL.alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &nummono);
-
+   
    return nummono;
 }
 
@@ -292,8 +144,7 @@ SFXALDevice::SFXALDevice(  SFXProvider *provider,
 #endif
 
    printALInfo(mDevice);
-   printHRTFInfo(mDevice);
-   getEFXInfo(mDevice);
+   
 
    mMaxBuffers = getMaxSources();
 

From fe4704829376662aa523993ee84081c6bef4407d Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Mon, 29 Aug 2022 20:06:29 +0100
Subject: [PATCH 06/11] Mac OpenAL 1.1

Added compatibility function to return max sources the old way.

If openal 1.2 method returns 0 it will do it the old way.
---
 Engine/source/sfx/openal/sfxALDevice.cpp | 31 ++++++++++++++++++++++++
 Engine/source/sfx/openal/sfxALDevice.h   |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/Engine/source/sfx/openal/sfxALDevice.cpp b/Engine/source/sfx/openal/sfxALDevice.cpp
index bd5b6f3d6..513fce129 100644
--- a/Engine/source/sfx/openal/sfxALDevice.cpp
+++ b/Engine/source/sfx/openal/sfxALDevice.cpp
@@ -69,9 +69,40 @@ S32 SFXALDevice::getMaxSources()
    ALCint nummono;
    mOpenAL.alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &nummono);
    
+   if(nummono == 0)
+      nummono = getMaxSourcesOld();
+   
    return nummono;
 }
 
+S32 SFXALDevice::getMaxSourcesOld()
+{
+   ALuint uiSource[256];
+   S32 sourceCount = 0;
+   
+   // clear errors.
+   mOpenAL.alGetError();
+   
+   for(sourceCount = 0; sourceCount < 256; sourceCount++)
+   {
+      mOpenAL.alGenSources(1,&uiSource[sourceCount]);
+      if(mOpenAL.alGetError() != AL_NO_ERROR)
+         break;
+   }
+   
+   mOpenAL.alDeleteSources(sourceCount, uiSource);
+   if(mOpenAL.alGetError() != AL_NO_ERROR)
+   {
+      for(U32 i = 0; i < 256; i++)
+      {
+         mOpenAL.alDeleteSources(1,&uiSource[i]);
+      }
+   }
+   
+   return sourceCount;
+   
+}
+
 //-----------------------------------------------------------------------------
 
 SFXALDevice::SFXALDevice(  SFXProvider *provider, 
diff --git a/Engine/source/sfx/openal/sfxALDevice.h b/Engine/source/sfx/openal/sfxALDevice.h
index f4d7374c6..654dca6d2 100644
--- a/Engine/source/sfx/openal/sfxALDevice.h
+++ b/Engine/source/sfx/openal/sfxALDevice.h
@@ -57,6 +57,9 @@ class SFXALDevice : public SFXDevice
       void printHRTFInfo(ALCdevice* device);
       void getEFXInfo(ALCdevice* device);
       S32 getMaxSources();
+   
+      // Compatibility with pre openal 1.2
+      S32 getMaxSourcesOld();
 
       SFXALDevice(   SFXProvider *provider,
                      const OPENALFNTABLE &openal, 

From 53b0f0530c180bfd4ae50259d7626e206597f754 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 29 Aug 2022 16:36:17 -0500
Subject: [PATCH 07/11] soundasset sourcegroup fallback ensure if there's no
 assigned sourcegroup, we at least point at "AudioChannelMaster" so overall
 sound volume can have it's say turn on button hover and click profiles by
 unremming the file assign hoverasset and buttonclick assets to
 audioChannelGUI todo: sort volume hooks for non-AudioChannelMaster long term:
 resolve the requirement that gui profiles need direct sound profiles instead
 of the capacity to take assets

---
 Engine/source/T3D/assets/SoundAsset.cpp                    | 2 ++
 Templates/BaseGame/game/data/UI/UI.tscript                 | 2 +-
 .../BaseGame/game/data/UI/sounds/buttonClick.asset.taml    | 5 ++++-
 .../BaseGame/game/data/UI/sounds/buttonHover.asset.taml    | 7 ++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Engine/source/T3D/assets/SoundAsset.cpp b/Engine/source/T3D/assets/SoundAsset.cpp
index b783b6858..d7fc3ebad 100644
--- a/Engine/source/T3D/assets/SoundAsset.cpp
+++ b/Engine/source/T3D/assets/SoundAsset.cpp
@@ -225,6 +225,8 @@ bool SoundAsset::loadSound()
       }
       else
       {// = new SFXProfile(mProfileDesc, mSoundFile, mPreload);
+         if (mProfileDesc.mSourceGroup == NULL)
+            mProfileDesc.mSourceGroup = dynamic_cast<SFXSource*>(Sim::findObject("AudioChannelMaster"));
          mSFXProfile.setDescription(&mProfileDesc);
          mSFXProfile.setSoundFileName(mSoundPath);
          mSFXProfile.setPreload(mPreload);
diff --git a/Templates/BaseGame/game/data/UI/UI.tscript b/Templates/BaseGame/game/data/UI/UI.tscript
index 9dae2fe5d..d3012a905 100644
--- a/Templates/BaseGame/game/data/UI/UI.tscript
+++ b/Templates/BaseGame/game/data/UI/UI.tscript
@@ -30,7 +30,7 @@ function UI::initClient(%this)
 {
    //Load UI stuff
    //we need to load this because some of the menu profiles use the sounds here
-   //%this.queueExec("./datablocks/guiSounds");
+   %this.queueExec("./datablocks/guiSounds");
    
    //Profiles
    %this.queueExec("./scripts/profiles");
diff --git a/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml b/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
index 99773fd2d..cd0089aab 100644
--- a/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
+++ b/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
@@ -1 +1,4 @@
-<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonClick" soundFile="@assetFile=buttonClick.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="false" minDistance="1" maxDistance="100" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/>
+<SoundAsset
+    AssetName="buttonClick"
+    soundFile="@assetFile=buttonClick.wav"
+    sourceGroup="AudioChannelGui"/>
diff --git a/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml b/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
index 00b1af405..858e11a42 100644
--- a/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
+++ b/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
@@ -1 +1,6 @@
-<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonHover" soundFile="@assetFile=buttonHover.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="true" minDistance="1" maxDistance="120" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/>
+<SoundAsset
+    AssetName="buttonHover"
+    soundFile="@assetFile=buttonHover.wav"
+    useHardware="true"
+    maxDistance="120"
+    sourceGroup="AudioChannelGui"/>

From 5d85664b4093745a9633448385d1c6331404ad9e Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Mon, 29 Aug 2022 23:40:51 +0100
Subject: [PATCH 08/11] Change GuiProfile to use Sound Asset

-Added SoundAssetInspector to bypass circular issue
-Added SoundAsset to GuiTypes
---
 Engine/source/T3D/assets/SoundAsset.cpp       |  4 +
 Engine/source/T3D/assets/SoundAsset.h         | 27 -------
 .../source/T3D/assets/SoundAssetInspectors.h  | 32 ++++++++
 .../source/gui/buttons/guiButtonBaseCtrl.cpp  | 12 +--
 Engine/source/gui/core/guiTypes.cpp           | 77 +++++--------------
 Engine/source/gui/core/guiTypes.h             | 16 ++--
 Templates/BaseGame/game/data/UI/UI.tscript    |  3 -
 .../game/data/UI/scripts/profiles.tscript     |  4 +-
 .../data/UI/sounds/buttonClick.asset.taml     | 11 ++-
 .../data/UI/sounds/buttonHover.asset.taml     | 11 ++-
 10 files changed, 91 insertions(+), 106 deletions(-)
 create mode 100644 Engine/source/T3D/assets/SoundAssetInspectors.h

diff --git a/Engine/source/T3D/assets/SoundAsset.cpp b/Engine/source/T3D/assets/SoundAsset.cpp
index b783b6858..515ecacd5 100644
--- a/Engine/source/T3D/assets/SoundAsset.cpp
+++ b/Engine/source/T3D/assets/SoundAsset.cpp
@@ -48,6 +48,8 @@
 #include "platform/profiler.h"
 #include "sfx/sfxTypes.h"
 
+#include "SoundAssetInspectors.h"
+
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_CONOBJECT(SoundAsset);
@@ -225,6 +227,8 @@ bool SoundAsset::loadSound()
       }
       else
       {// = new SFXProfile(mProfileDesc, mSoundFile, mPreload);
+         if (mProfileDesc.mSourceGroup == NULL)
+            mProfileDesc.mSourceGroup = dynamic_cast<SFXSource*>(Sim::findObject("AudioChannelMaster"));
          mSFXProfile.setDescription(&mProfileDesc);
          mSFXProfile.setSoundFileName(mSoundPath);
          mSFXProfile.setPreload(mPreload);
diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h
index 7722826d8..43e424c30 100644
--- a/Engine/source/T3D/assets/SoundAsset.h
+++ b/Engine/source/T3D/assets/SoundAsset.h
@@ -39,7 +39,6 @@
 #include "assets/assetFieldTypes.h"
 #endif
 
-#include "gui/editor/guiInspectorTypes.h"
 #ifndef _ASSET_PTR_H_
 #include "assets/assetPtr.h"
 #endif 
@@ -145,33 +144,7 @@ protected:
 
 DefineConsoleType(TypeSoundAssetPtr, SoundAsset)
 DefineConsoleType(TypeSoundAssetId, String)
-#ifdef TORQUE_TOOLS
-//-----------------------------------------------------------------------------
-// TypeAssetId GuiInspectorField Class
-//-----------------------------------------------------------------------------
-class GuiInspectorTypeSoundAssetPtr : public GuiInspectorTypeFileName
-{
-   typedef GuiInspectorTypeFileName Parent;
-public:
 
-   GuiBitmapButtonCtrl* mEditButton;
-
-   DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetPtr);
-   static void consoleInit();
-
-   virtual GuiControl* constructEditControl();
-   virtual bool updateRects();
-};
-
-class GuiInspectorTypeSoundAssetId : public GuiInspectorTypeSoundAssetPtr
-{
-   typedef GuiInspectorTypeSoundAssetPtr Parent;
-public:
-
-   DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetId);
-   static void consoleInit();
-};
-#endif
 #pragma region Singular Asset Macros
 
 //Singular assets
diff --git a/Engine/source/T3D/assets/SoundAssetInspectors.h b/Engine/source/T3D/assets/SoundAssetInspectors.h
new file mode 100644
index 000000000..23262151f
--- /dev/null
+++ b/Engine/source/T3D/assets/SoundAssetInspectors.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "Soundasset.h"
+
+#ifndef _GUI_INSPECTOR_TYPES_H_
+#include "gui/editor/guiInspectorTypes.h"
+#endif
+
+#ifdef TORQUE_TOOLS
+class GuiInspectorTypeSoundAssetPtr : public GuiInspectorTypeFileName
+{
+   typedef GuiInspectorTypeFileName Parent;
+public:
+
+   GuiBitmapButtonCtrl* mEditButton;
+
+   DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetPtr);
+   static void consoleInit();
+
+   virtual GuiControl* constructEditControl();
+   virtual bool updateRects();
+};
+
+class GuiInspectorTypeSoundAssetId : public GuiInspectorTypeSoundAssetPtr
+{
+   typedef GuiInspectorTypeSoundAssetPtr Parent;
+public:
+
+   DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetId);
+   static void consoleInit();
+};
+#endif
diff --git a/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp b/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
index b72f1b280..c4c3da811 100644
--- a/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
+++ b/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
@@ -252,8 +252,8 @@ void GuiButtonBaseCtrl::onMouseDown(const GuiEvent &event)
    if (mProfile->mCanKeyFocus)
       setFirstResponder();
 
-   if (mProfile->mSoundButtonDown)
-      SFX->playOnce(mProfile->mSoundButtonDown);
+   if (mProfile->getSoundButtonDown())
+      SFX->playOnce(mProfile->getSoundButtonDownProfile());
       
    mMouseDownPoint = event.mousePoint;
    mMouseDragged = false;
@@ -292,8 +292,8 @@ void GuiButtonBaseCtrl::onMouseEnter(const GuiEvent &event)
    }
    else
    {
-      if ( mActive && mProfile->mSoundButtonOver )
-         SFX->playOnce(mProfile->mSoundButtonOver);
+      if (mProfile->getSoundButtonOver())
+         SFX->playOnce(mProfile->getSoundButtonOverProfile());
 
       mHighlighted = true;
    }
@@ -377,8 +377,8 @@ bool GuiButtonBaseCtrl::onKeyDown(const GuiEvent &event)
    if ((event.keyCode == KEY_RETURN || event.keyCode == KEY_SPACE)
        && event.modifier == 0)
    {
-	   if ( mProfile->mSoundButtonDown )
-         SFX->playOnce( mProfile->mSoundButtonDown);
+      if (mProfile->getSoundButtonDown())
+         SFX->playOnce(mProfile->getSoundButtonDownProfile());
 
       return true;
    }
diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp
index dd5874ee9..6a99eb5bf 100644
--- a/Engine/source/gui/core/guiTypes.cpp
+++ b/Engine/source/gui/core/guiTypes.cpp
@@ -218,60 +218,6 @@ bool GuiControlProfile::protectedSetBitmap( void *object, const char *index, con
    return false;
 }
 
-const char* GuiControlProfile::protectedGetSoundButtonDown( void* object, const char* data )
-{
-   GuiControlProfile* profile = reinterpret_cast< GuiControlProfile* >( object );
-
-   SFXTrack* track = profile->mSoundButtonDown;
-   if( !track )
-      return "";
-
-   return track->getName();
-}
-
-bool GuiControlProfile::protectedSetSoundButtonDown( void* object, const char* index, const char* data )
-{
-   GuiControlProfile* profile = reinterpret_cast< GuiControlProfile* >( object );
-   
-   SFXTrack* track = NULL;
-   if( data && data[ 0] && !Sim::findObject( data, track ) )
-   {
-      Con::errorf( "GuiControlProfile::protectedSetSoundButtonDown - no SFXTrack '%s'", data );
-      return false;
-   }
-   
-   profile->mSoundButtonDown = track;
-   
-   return false;
-}
-
-const char* GuiControlProfile::protectedGetSoundButtonOver( void* object, const char* data )
-{
-   GuiControlProfile* profile = reinterpret_cast< GuiControlProfile* >( object );
-
-   SFXTrack* track = profile->mSoundButtonOver;
-   if( !track )
-      return "";
-
-   return track->getName();
-}
-
-bool GuiControlProfile::protectedSetSoundButtonOver( void* object, const char* index, const char* data )
-{
-   GuiControlProfile* profile = reinterpret_cast< GuiControlProfile* >( object );
-   
-   SFXTrack* track = NULL;
-   if( data && data[ 0] && !Sim::findObject( data, track ) )
-   {
-      Con::errorf( "GuiControlProfile::protectedSetSoundButtonOver - no SFXTrack '%s'", data );
-      return false;
-   }
-   
-   profile->mSoundButtonOver = track;
-   
-   return false;
-}
-
 GuiControlProfile::GuiControlProfile(void) :
    mFillColor(255,0,255,255),
    mFillColorHL(255,0,255,255),
@@ -293,6 +239,8 @@ GuiControlProfile::GuiControlProfile(void) :
    mTextOffset(0,0),
    mBitmapArrayRects(0)
 {
+   INIT_ASSET(SoundButtonDown);
+   INIT_ASSET(SoundButtonOver);
    mLoadCount = 0;
    mUseCount = 0;
    
@@ -367,8 +315,19 @@ GuiControlProfile::GuiControlProfile(void) :
       mTextOffset     = def->mTextOffset;
 
       // default sound
-      mSoundButtonDown = def->mSoundButtonDown;
-      mSoundButtonOver = def->mSoundButtonOver;
+      _setSoundButtonDown(def->getSoundButtonDown());
+      if (getSoundButtonDown() != StringTable->EmptyString())
+      {
+         if (!getSoundButtonDownProfile())
+            Con::errorf(ConsoleLogEntry::General, "GuiControlProfile: Can't get default button pressed sound asset.");
+      }
+
+      _setSoundButtonOver(def->getSoundButtonOver());
+      if (getSoundButtonOver() != StringTable->EmptyString())
+      {
+         if (!getSoundButtonOverProfile())
+            Con::errorf(ConsoleLogEntry::General, "GuiControlProfile: Can't get default button hover sound asset.");
+      }
 
       //used by GuiTextCtrl
       mModal         = def->mModal;
@@ -478,9 +437,9 @@ void GuiControlProfile::initPersistFields()
       addField("hasBitmapArray", TypeBool,      Offset(mUseBitmapArray, GuiControlProfile),
          "If true, 'bitmap' is an array of images." );
 
-      addProtectedField( "soundButtonDown", TypeSFXTrackName,  Offset(mSoundButtonDown, GuiControlProfile),
-         &GuiControlProfile::protectedSetSoundButtonDown, &GuiControlProfile::protectedGetSoundButtonDown,
-         "Sound to play when mouse has been pressed on control." );
+      INITPERSISTFIELD_SOUNDASSET(SoundButtonDown, GuiControlProfile, "The sound button down.");
+      INITPERSISTFIELD_SOUNDASSET(SoundButtonOver, GuiControlProfile, "The sound button down.");
+
       addProtectedField( "soundButtonOver", TypeSFXTrackName,  Offset(mSoundButtonOver, GuiControlProfile),
          &GuiControlProfile::protectedSetSoundButtonOver, &GuiControlProfile::protectedGetSoundButtonOver,
          "Sound to play when mouse is hovering over control." );
diff --git a/Engine/source/gui/core/guiTypes.h b/Engine/source/gui/core/guiTypes.h
index 37b77d57d..df3d6e9e6 100644
--- a/Engine/source/gui/core/guiTypes.h
+++ b/Engine/source/gui/core/guiTypes.h
@@ -36,6 +36,10 @@
 #include "console/dynamicTypes.h"
 #endif
 
+#ifndef SOUND_ASSET_H_
+#include "T3D/assets/SoundAsset.h"
+#endif
+
 #include "T3D/assets/ImageAsset.h"
 
 #include "gfx/gfxDevice.h"
@@ -562,9 +566,11 @@ public:
    bool mUseBitmapArray;                           ///< Flag to use the bitmap array or to fallback to non-array rendering
    Vector<RectI> mBitmapArrayRects;                ///< Used for controls which use an array of bitmaps such as checkboxes
 
-   // sound members
-   SimObjectPtr< SFXTrack > mSoundButtonDown;                   ///< Sound played when the object is "down" ie a button is pushed
-   SimObjectPtr< SFXTrack > mSoundButtonOver;                   ///< Sound played when the mouse is over the object
+   DECLARE_SOUNDASSET(GuiControlProfile, SoundButtonDown);     ///< Sound played when a button is pressed.
+   DECLARE_ASSET_SETGET(GuiControlProfile, SoundButtonDown);
+
+   DECLARE_SOUNDASSET(GuiControlProfile, SoundButtonOver);     ///< Sound played when a button is hovered.
+   DECLARE_ASSET_SETGET(GuiControlProfile, SoundButtonOver);
 
    StringTableEntry mChildrenProfileName;       ///< The name of the profile to use for the children controls
 
@@ -583,10 +589,6 @@ protected:
    GuiControlProfile* mChildrenProfile;         ///< Profile used with children controls (such as the scroll bar on a popup menu) when defined.
 
    static bool protectedSetBitmap( void *object, const char *index, const char *data );
-   static bool protectedSetSoundButtonDown( void* object, const char* index, const char* data );
-   static bool protectedSetSoundButtonOver( void* object, const char* index, const char* data );
-   static const char* protectedGetSoundButtonDown( void* object, const char* data );
-   static const char* protectedGetSoundButtonOver( void* object, const char* data );
 
 public:
    DECLARE_CONOBJECT(GuiControlProfile);
diff --git a/Templates/BaseGame/game/data/UI/UI.tscript b/Templates/BaseGame/game/data/UI/UI.tscript
index 9dae2fe5d..352cd91bd 100644
--- a/Templates/BaseGame/game/data/UI/UI.tscript
+++ b/Templates/BaseGame/game/data/UI/UI.tscript
@@ -29,9 +29,6 @@ function UI::onDestroyGameServer(%this){}
 function UI::initClient(%this)
 {
    //Load UI stuff
-   //we need to load this because some of the menu profiles use the sounds here
-   //%this.queueExec("./datablocks/guiSounds");
-   
    //Profiles
    %this.queueExec("./scripts/profiles");
    
diff --git a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
index 92a7720d1..64019e345 100644
--- a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
+++ b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
@@ -100,8 +100,8 @@ new GuiControlProfile( GuiMenuButtonProfile )
    canKeyFocus = false;
    //bitmapAsset = "UI:menu_button_image";
    hasBitmapArray = false;
-   soundButtonDown = menuButtonPressed;
-   soundButtonOver = menuButtonHover;
+   soundButtonDown = "UI:buttonClick";
+   soundButtonOver = "UI:buttonHover";
    category = "Core";
 };
 
diff --git a/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml b/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
index 99773fd2d..63079c087 100644
--- a/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
+++ b/Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
@@ -1 +1,10 @@
-<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonClick" soundFile="@assetFile=buttonClick.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="false" minDistance="1" maxDistance="100" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/>
+<SoundAsset 
+	AssetName="buttonClick" 
+	soundFile="@assetFile=buttonClick.wav" 
+	PitchAdjust="1" 
+	VolumeAdjust="1" 
+	is3D="false" 
+	minDistance="1" 
+	maxDistance="100" 
+	sourceGroup="AudioChannelGui"
+	/>
diff --git a/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml b/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
index 00b1af405..e270dda00 100644
--- a/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
+++ b/Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
@@ -1 +1,10 @@
-<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonHover" soundFile="@assetFile=buttonHover.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="true" minDistance="1" maxDistance="120" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/>
+<SoundAsset 
+	AssetName="buttonHover" 
+	soundFile="@assetFile=buttonHover.wav" 
+	PitchAdjust="1" 
+	VolumeAdjust="1" 
+	is3D="false" 
+	minDistance="1" 
+	maxDistance="100" 
+	sourceGroup="AudioChannelGui"
+	/>

From b79b1ae65eb4c8bc8d6af4e8fdc73407b0a82fdb Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 29 Aug 2022 20:39:04 -0500
Subject: [PATCH 09/11] remove leftover

---
 Engine/source/gui/core/guiTypes.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp
index 6a99eb5bf..1928f5dbc 100644
--- a/Engine/source/gui/core/guiTypes.cpp
+++ b/Engine/source/gui/core/guiTypes.cpp
@@ -440,9 +440,6 @@ void GuiControlProfile::initPersistFields()
       INITPERSISTFIELD_SOUNDASSET(SoundButtonDown, GuiControlProfile, "The sound button down.");
       INITPERSISTFIELD_SOUNDASSET(SoundButtonOver, GuiControlProfile, "The sound button down.");
 
-      addProtectedField( "soundButtonOver", TypeSFXTrackName,  Offset(mSoundButtonOver, GuiControlProfile),
-         &GuiControlProfile::protectedSetSoundButtonOver, &GuiControlProfile::protectedGetSoundButtonOver,
-         "Sound to play when mouse is hovering over control." );
       addField("profileForChildren", TypeString,      Offset(mChildrenProfileName, GuiControlProfile));
    
    endGroup( "Misc" );

From 65275a8a35646413d72d1ebda3e0d9d395435523 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 29 Aug 2022 21:18:20 -0500
Subject: [PATCH 10/11] leftover profile reference flaw

---
 Engine/source/gui/buttons/guiButtonBaseCtrl.cpp | 6 +++---
 Engine/source/gui/controls/guiSliderCtrl.cpp    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp b/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
index c4c3da811..b4232217f 100644
--- a/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
+++ b/Engine/source/gui/buttons/guiButtonBaseCtrl.cpp
@@ -252,7 +252,7 @@ void GuiButtonBaseCtrl::onMouseDown(const GuiEvent &event)
    if (mProfile->mCanKeyFocus)
       setFirstResponder();
 
-   if (mProfile->getSoundButtonDown())
+   if (mProfile->isSoundButtonDownValid())
       SFX->playOnce(mProfile->getSoundButtonDownProfile());
       
    mMouseDownPoint = event.mousePoint;
@@ -292,7 +292,7 @@ void GuiButtonBaseCtrl::onMouseEnter(const GuiEvent &event)
    }
    else
    {
-      if (mProfile->getSoundButtonOver())
+      if (mProfile->isSoundButtonOverValid())
          SFX->playOnce(mProfile->getSoundButtonOverProfile());
 
       mHighlighted = true;
@@ -377,7 +377,7 @@ bool GuiButtonBaseCtrl::onKeyDown(const GuiEvent &event)
    if ((event.keyCode == KEY_RETURN || event.keyCode == KEY_SPACE)
        && event.modifier == 0)
    {
-      if (mProfile->getSoundButtonDown())
+      if (mProfile->isSoundButtonDownValid())
          SFX->playOnce(mProfile->getSoundButtonDownProfile());
 
       return true;
diff --git a/Engine/source/gui/controls/guiSliderCtrl.cpp b/Engine/source/gui/controls/guiSliderCtrl.cpp
index 9b7354d6d..9c61aaf5e 100644
--- a/Engine/source/gui/controls/guiSliderCtrl.cpp
+++ b/Engine/source/gui/controls/guiSliderCtrl.cpp
@@ -204,6 +204,9 @@ void GuiSliderCtrl::onMouseDown(const GuiEvent &event)
    setFirstResponder();
    mDepressed = true;
 
+   if (mProfile->isSoundButtonDownValid())
+      SFX->playOnce(mProfile->getSoundButtonDownProfile());
+
    Point2I curMousePos = globalToLocalCoord( event.mousePoint );
    F32 value;
    if (getWidth() >= getHeight())
@@ -261,7 +264,8 @@ void GuiSliderCtrl::onMouseEnter(const GuiEvent &event)
       if( mActive && mProfile->mSoundButtonOver )
       {
          //F32 pan = (F32(event.mousePoint.x)/F32(getRoot()->getWidth())*2.0f-1.0f)*0.8f;
-         SFX->playOnce( mProfile->mSoundButtonOver );
+         if (mProfile->isSoundButtonOverValid())
+            SFX->playOnce(mProfile->getSoundButtonOverProfile());
       }
       
       mMouseOver = true;

From 73c1a902deffa409cfdf1c5b37123bfd145f4dda Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 29 Aug 2022 21:43:14 -0500
Subject: [PATCH 11/11] cAps fix

---
 Engine/source/T3D/assets/SoundAssetInspectors.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Engine/source/T3D/assets/SoundAssetInspectors.h b/Engine/source/T3D/assets/SoundAssetInspectors.h
index 23262151f..6fb23fdfc 100644
--- a/Engine/source/T3D/assets/SoundAssetInspectors.h
+++ b/Engine/source/T3D/assets/SoundAssetInspectors.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Soundasset.h"
+#include "SoundAsset.h"
 
 #ifndef _GUI_INSPECTOR_TYPES_H_
 #include "gui/editor/guiInspectorTypes.h"