revert(batmanak): revert to luminance film grain

This reverts commit 9601949.
clshortfuse · Feb 4, 2025 · f20ecfd · f20ecfd
1 parent 8d89b0e
commit f20ecfd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/games/batmanak/tonemapper00_0x978BFB09.cs_5_0.hlsl b/src/games/batmanak/tonemapper00_0x978BFB09.cs_5_0.hlsl
@@ -218,10 +218,10 @@ void main(uint3 vThreadGroupID: SV_GroupID, uint3 vThreadID: SV_DispatchThreadID
           grainedColor = grainEffect * grainInputColor;
           grainedColor = renodx::color::gamma::DecodeSafe(grainedColor, 2.2f);
         } else {
-          grainedColor = renodx::effects::ApplyFilmGrainColored(
+          grainedColor = renodx::effects::ApplyFilmGrain(
               outputColor,
               screenXY.xy,
-              randomnessFactor,
+              frac(r3.x),
               cb0[11].z ? CUSTOM_FILM_GRAIN_STRENGTH * 0.03f : 0,
               1.f);
         }

diff --git a/src/games/batmanak/tonemapper01_0xB6B56605.cs_5_0.hlsl b/src/games/batmanak/tonemapper01_0xB6B56605.cs_5_0.hlsl
@@ -144,14 +144,24 @@ cbuffer cb0 : register(b0) {
           float3 invertedColor = 1.f - saturate(grainInputColor);
           float3 clampedColor = min(1.f, invertedColor * invertedColor);
           float3 modulatedStrength = clampedColor * cb0[11].zzz * CUSTOM_FILM_GRAIN_STRENGTH;
+
+          r1.z = dot(r2.wyz, float3(
+                                 renodx::random::GELFOND_CONSTANT,
+                                 renodx::random::GELFOND_SCHNEIDER_CONSTANT,
+                                 9.19949627));
+          r1.z = cos(r1.z);
+          r2.xyz = r1.zzz * r2.xyz;
+          float3 randomnessFactor = frac(r2.xyz);
+
           float3 grainEffect = mad(modulatedStrength, (randomnessFactor - 0.334f), 1.f);
+
           grainedColor = grainEffect * grainInputColor;
           grainedColor = renodx::color::gamma::DecodeSafe(grainedColor, 2.2f);
         } else {
-          grainedColor = renodx::effects::ApplyFilmGrainColored(
+          grainedColor = renodx::effects::ApplyFilmGrain(
               outputColor,
               screenXY,
-              randomnessFactor,
+              frac(r3.x),
               cb0[11].z ? CUSTOM_FILM_GRAIN_STRENGTH * 0.03f : 0,
               1.f);
         }

diff --git a/src/games/batmanak/tonemapper02_0xF01CCC7E.cs_5_0.hlsl b/src/games/batmanak/tonemapper02_0xF01CCC7E.cs_5_0.hlsl
@@ -205,10 +205,10 @@ cbuffer cb0 : register(b0) {
           grainedColor = grainEffect * grainInputColor;
           grainedColor = renodx::color::gamma::DecodeSafe(grainedColor, 2.2f);
         } else {
-          grainedColor = renodx::effects::ApplyFilmGrainColored(
+          grainedColor = renodx::effects::ApplyFilmGrain(
               outputColor,
               screenXY,
-              randomnessFactor,
+              frac(r3.x),
               cb0[11].z ? CUSTOM_FILM_GRAIN_STRENGTH * 0.03f : 0,
               1.f);
         }

diff --git a/src/games/batmanak/tonemapper03_0x3A4E0B90.cs_5_0.hlsl b/src/games/batmanak/tonemapper03_0x3A4E0B90.cs_5_0.hlsl
@@ -144,16 +144,23 @@ cbuffer cb0 : register(b0) {
           float3 clampedColor = min(1.f, invertedColor * invertedColor);
           float3 modulatedStrength = clampedColor * cb0[11].zzz * CUSTOM_FILM_GRAIN_STRENGTH;
 
+          r1.z = dot(r2.wyz, float3(
+                                 renodx::random::GELFOND_CONSTANT,
+                                 renodx::random::GELFOND_SCHNEIDER_CONSTANT,
+                                 9.19949627));
+          r1.z = cos(r1.z);
+          r2.xyz = r1.zzz * r2.xyz;
+          float3 randomnessFactor = frac(r2.xyz);
 
           float3 grainEffect = mad(modulatedStrength, (randomnessFactor - 0.334f), 1.f);  //  r1.xyz = r1.xyz * (r3.xyz - 0.334f) + 1.f;
 
           grainedColor = grainEffect * grainInputColor;  //  r0.xyz = r1.xyz * r0.xyz;
           grainedColor = renodx::color::gamma::DecodeSafe(grainedColor, 2.2f);
         } else {
-          grainedColor = renodx::effects::ApplyFilmGrainColored(
+          grainedColor = renodx::effects::ApplyFilmGrain(
               outputColor,
               screenXY,
-              randomnessFactor,
+              frac(r3.x),
               cb0[11].z ? CUSTOM_FILM_GRAIN_STRENGTH * 0.03f : 0,
               1.f);
         }