Metallic Tex Hotfix

Fixed Metallic Textures
Added AgX Tonemapper

Author: Pjbomb2

TrueTrace.unitypackage

@@ -1174,6 +1174,7 @@ public void CreateGUI() {
             TonemapSettings.Add("Uchimura");
             TonemapSettings.Add("Reinhard");
             TonemapSettings.Add("Uncharted 2");
+            TonemapSettings.Add("AgX");
             PopupField<string> ToneMapField = new PopupField<string>("Tonemapper");
             ToneMapField.choices = TonemapSettings;
             ToneMapField.index = RayMaster.ToneMapper;

TrueTrace/Editor/PathTracerSettings.cs

@@ -241,7 +241,7 @@ private void PackAndCompact(Dictionary<int, TexObj> DictTex, ref RenderTexture A
                     case 3:
                     case 4:
                     case 7:
-                        CopyShader.SetInt("OutputRead", ((TexChannelIndex == null) ? ReadIndex : SelectedTex.ReadIndex));
+                        CopyShader.SetInt("OutputRead", SelectedTex.ReadIndex);
                         CopyShader.SetTexture(2, "AdditionTex", SelectedTex.Tex);
                         CopyShader.SetTexture(2, "ResultSingle", Atlas);
                         CopyShader.Dispatch(2, (int)Mathf.CeilToInt(TempRect.Width * Scale.x / 32.0f), (int)Mathf.CeilToInt(TempRect.Height * Scale.y / 32.0f), 1);

TrueTrace/Resources/AssetManager.cs

@@ -112,6 +112,50 @@ float3 HejlBurgess(float3 texColor) {
    return retColor;
 }
 
+struct ParamsLogC
+{
+    float cut;
+    float a, b, c, d, e, f;
+};
+
+static const ParamsLogC LogC =
+{
+    0.011361, // cut
+    5.555556, // a
+    0.047996, // b
+    0.244161, // c
+    0.386036, // d
+    5.301883, // e
+    0.092819  // f
+};
+
+float LinearToLogC_Precise(half x)
+{
+    float o;
+    if (x > LogC.cut)
+        o = LogC.c * log10(LogC.a * x + LogC.b) + LogC.d;
+    else
+        o = LogC.e * x + LogC.f;
+    return o;
+}
+
+inline float3 AgX(float3 stimulus) {
+    // Apply a non-linear transform that the LUT is encoded with.
+    const float3 encoded = stimulus;// / (stimulus + 1.0);
+
+    // Align the encoded range to texel centers.
+    float3 uv = encoded;// * ((LUT_DIMS - 1.0) / LUT_DIMS) + 0.5 / LUT_DIMS;
+
+    // Note: for OpenGL, do `uv.y = 1.0 - uv.y`
+    uv = float3(
+        LinearToLogC_Precise(uv.x),
+        LinearToLogC_Precise(uv.y),
+        LinearToLogC_Precise(uv.z)
+    );
+
+    return LUT.SampleLevel(sampler_linear_clamp, uv, 0);
+}
+
 [numthreads(16,16,1)]
 void CSMain (uint3 id : SV_DispatchThreadID)
 {
@@ -133,6 +177,9 @@ void CSMain (uint3 id : SV_DispatchThreadID)
         case 4:
             result = Uncharted2ToneMapping(result);
         break;
+        case 5:
+            result = AgX(result);
+        break;
     };
     Result[id.xy] = float4(result, 1.0);
 }

TrueTrace/Resources/PostProcess/Compute/ToneMap.compute

@@ -506,7 +506,7 @@ public void ExecuteUpsample(ref RenderTexture Input, ref RenderTexture Output, i
         }
 
 
-        public void ExecuteToneMap(ref RenderTexture Output, CommandBuffer cmd, ref Texture3D LUT, int ToneMapSelection)
+        public void ExecuteToneMap(ref RenderTexture Output, CommandBuffer cmd, ref Texture3D LUT, ref Texture3D LUT2, int ToneMapSelection)
         {//need to fix this so it doesnt create new textures every time
             cmd.BeginSample("ToneMap");
             cmd.SetComputeIntParam(ToneMapper,"ToneMapSelection", ToneMapSelection);
@@ -515,7 +515,7 @@ public void ExecuteToneMap(ref RenderTexture Output, CommandBuffer cmd, ref Text
             cmd.SetComputeIntParam(ToneMapper,"ScreenWidth", Output.width);
             cmd.SetComputeIntParam(ToneMapper,"ScreenHeight", Output.height);
             cmd.SetComputeTextureParam(ToneMapper, 0, "Result", Output);
-            cmd.SetComputeTextureParam(ToneMapper, 0, "LUT", LUT);
+            cmd.SetComputeTextureParam(ToneMapper, 0, "LUT", ToneMapSelection == 5 ? LUT2 : LUT);
             cmd.DispatchCompute(ToneMapper, 0, threadGroupsX2, threadGroupsY2, 1);
             cmd.EndSample("ToneMap");
         }

TrueTrace/Resources/PostProcess/Denoiser.cs

@@ -80,6 +80,7 @@ public class RayTracingMaster : MonoBehaviour
         #endif
 
         private Texture3D ToneMapTex;
+        private Texture3D ToneMapTex2;
         private Material _addMaterial;
         private Material _FireFlyMaterial;
         private int _currentSample = 0;
@@ -195,6 +196,7 @@ unsafe public void Start2()
             ReCurDen = new ReCurDenoiser();
             ReSTIRASVGFCode = new ReSTIRASVGF();
             ToneMapTex = Resources.Load<Texture3D>("Utility/ToneMapTex");
+            ToneMapTex2 = Resources.Load<Texture3D>("Utility/AgXBC");
             if (ShadingShader == null) {ShadingShader = Resources.Load<ComputeShader>("MainCompute/RayTracingShader"); }
             if (IntersectionShader == null) {IntersectionShader = Resources.Load<ComputeShader>("MainCompute/IntersectionKernels"); }
             if (GenerateShader == null) {GenerateShader = Resources.Load<ComputeShader>("MainCompute/RayGenKernels"); }
@@ -983,7 +985,7 @@ private void Render(RenderTexture destination, CommandBuffer cmd)
                 Denoisers.ExecuteAutoExpose(ref _FinalTex, Exposure, cmd, DoExposureAuto);
             }
             if (AllowBloom) Denoisers.ExecuteBloom(ref _FinalTex, BloomStrength, cmd);
-            if(AllowToneMap) Denoisers.ExecuteToneMap(ref _FinalTex, cmd, ref ToneMapTex, ToneMapper);
+            if(AllowToneMap) Denoisers.ExecuteToneMap(ref _FinalTex, cmd, ref ToneMapTex, ref ToneMapTex2, ToneMapper);
             if (AllowTAA) Denoisers.ExecuteTAA(ref _FinalTex, _currentSample, cmd);
 
             cmd.Blit(_FinalTex, destination);