feat(crimsondesert): Further improvements to aurora with more palettes, randomisation and chance based night gating, Updated EffectDistortion no-op, Added Sky scattering brightness reduction

Author: SGTForgery

src/games/crimsondesert/addon.cpp

@@ -163,6 +163,9 @@ const std::unordered_map<std::string, float> VANILLA_VALUES = {
     {"SnowFogFix", 0.f},
     {"RaytracingQuality", 0.f},
     {"AuroraBorealis", 0.f},
+    {"AuroraBrightness", 50.f},
+    {"AuroraChance", 40.f},
+    {"NightSkyAttenuation", 0.f},
 };
 
 const std::unordered_map<std::string, float> NEUTRAL_VALUES = {
@@ -1023,7 +1026,22 @@ renodx::utils::settings::Settings settings = {
         .can_reset = true,
         .label = "Dawn/Dusk Improvements (WIP)",
         .section = "Rendering",
-        .tooltip = "Directionality additions to atmospheric lighting at dawn and dusk.\n",
+        .tooltip = "Directionality additions to atmospheric lighting at dawn/dusk.\n",
+        .labels = {"Off", "On"},
+        .tint = rendering,
+        .is_visible = []() { return current_settings_mode == rendering_group; },
+    },
+    new renodx::utils::settings::Setting{
+        .key = "NightSkyAttenuation",
+        .binding = &shader_injection.custom_flags,
+        .value_type = renodx::utils::settings::SettingValueType::INTEGER,
+        .default_value = 1.f,
+        .packed_values = {0u, CUSTOM_FLAGS__NIGHT_SKY_ATTENUATION},
+        .can_reset = true,
+        .label = "Darker Nights + Darker Dawn/Dusk Scattering (WIP)",
+        .section = "Rendering",
+        .tooltip = "Reduces sky brightness at night and during dawn/dusk.\n"
+                   "Fixes the overly bright sky at 3-5am and after sunset.",
         .labels = {"Off", "On"},
         .tint = rendering,
         .is_visible = []() { return current_settings_mode == rendering_group; },
@@ -1129,7 +1147,7 @@ renodx::utils::settings::Settings settings = {
     },
     new renodx::utils::settings::Setting{
         .value_type = renodx::utils::settings::SettingValueType::TEXT,
-        .label = "WARNING: Added Aurora for nights with various colour palettes, looks cool but currently lacks region specific gating or randomised chance to not appear.\n",
+        .label = "Aurora now has randomisation for various parts, however lack per region data\n",
         .section = "Rendering",
         //.tint = rendering,
         .is_visible = []() { return current_settings_mode == rendering_group; },
@@ -1150,6 +1168,31 @@ renodx::utils::settings::Settings settings = {
         .is_enabled = []() { return RR_ENABLED; },
         .is_visible = []() { return current_settings_mode == rendering_group; },
     },
+    new renodx::utils::settings::Setting{
+        .key = "AuroraBrightness",
+        .binding = &shader_injection.aurora_brightness,
+        .default_value = 25.f,
+        .label = "Aurora Brightness",
+        .section = "Rendering",
+        .tooltip = "Controls the overall brightness of the aurora borealis effect.",
+        .tint = wiprendering,
+        .max = 100.f,
+        .is_enabled = []() { return RR_ENABLED && (CUSTOM_FLAGS_AS_UINT & CUSTOM_FLAGS__AURORA_BOREALIS) != 0u; },
+        .is_visible = []() { return current_settings_mode == rendering_group; },
+    },
+    new renodx::utils::settings::Setting{
+        .key = "AuroraChance",
+        .binding = &shader_injection.aurora_chance,
+        .default_value = 40.f,
+        .label = "Aurora Appearance Chance",
+        .section = "Rendering",
+        .tooltip = "Percentage chance for the aurora to appear each night.\n"
+                   "0 = never appears, 100 = always appears.",
+        .tint = wiprendering,
+        .max = 100.f,
+        .is_enabled = []() { return RR_ENABLED && (CUSTOM_FLAGS_AS_UINT & CUSTOM_FLAGS__AURORA_BOREALIS) != 0u; },
+        .is_visible = []() { return current_settings_mode == rendering_group; },
+    },
     new renodx::utils::settings::Setting{
         .key = "ShadowDebugMode",
         .binding = SHADOW_DEBUG_MODE,
@@ -1347,6 +1390,9 @@ void OnPresetOff() {
       {"SnowFogFix", 0.f},
       {"DisableAWB", 0.f},
       {"AuroraBorealis", 0.f},
+      {"AuroraBrightness", 50.f},
+      {"AuroraChance", 40.f},
+      {"NightSkyAttenuation", 0.f},
 
       {"ImprovedAutoExposure", 0.f},
       {"AE_PerceptualMinBrightness", 0.f},

src/games/crimsondesert/shared.h

@@ -26,6 +26,7 @@
 #define CUSTOM_FLAGS__TONEMAP_DEBUG_BIT1                0b0100000000000000000u
 #define CUSTOM_FLAGS__RR_ENABLED                        0b1000000000000000000u
 #define CUSTOM_FLAGS__AURORA_BOREALIS                   0b10000000000000000000u
+#define CUSTOM_FLAGS__NIGHT_SKY_ATTENUATION             0b100000000000000000000u
 
 #define CUSTOM_FLAGS                               shader_injection.custom_flags
 
@@ -100,7 +101,10 @@
 #define DAWN_DUSK_IMPROVEMENTS                 ((CUSTOM_FLAGS_AS_UINT & CUSTOM_FLAGS__DAWN_DUSK_IMPROVEMENTS) != 0u ? 1.f : 0.f)
 #define SNOW_FOG_FIX                           ((CUSTOM_FLAGS_AS_UINT & CUSTOM_FLAGS__SNOW_FOG_FIX) != 0u ? 1.f : 0.f)
 #define DAWN_DUSK_GI_ENERGY                    0.7f
-#define AURORA_GI_ENERGY                       0.1f
+#define AURORA_GI_ENERGY                       1.0f
+#define AURORA_BRIGHTNESS                      shader_injection.aurora_brightness
+#define AURORA_CHANCE                          shader_injection.aurora_chance
+#define NIGHT_SKY_ATTENUATION                  ((CUSTOM_FLAGS_AS_UINT & CUSTOM_FLAGS__NIGHT_SKY_ATTENUATION) != 0u ? 1.f : 0.f)
 
 // Auto exposure tuning
 //#define AE_DARK_POWER_OUTDOOR                shader_injection.ae_dark_power_outdoor
@@ -181,6 +185,8 @@ struct ShaderInjectData {
   float moon_disk_size;
   float lens_flare_strength;
   float bloom_strength;
+  float aurora_brightness;
+  float aurora_chance;
 };
 
 #ifndef __cplusplus

src/games/crimsondesert/sky-atmospheric/RenderAtmosphericScatteringOffscreenSky_0x139B0E4B.cs_6_6.hlsl

@@ -1705,6 +1705,15 @@ void main(
     _4275 *= _energyAtten;
   }
 
+  // [NIGHT_SKY_ATTENUATION] Reduce sky brightness when sun is below horizon
+  // Works for both early morning and late evening
+  {
+    float _nightSkyAtten = NightSkyAttenuation(_sunDirection.y);
+    _4273 *= _nightSkyAtten;
+    _4274 *= _nightSkyAtten;
+    _4275 *= _nightSkyAtten;
+  }
+
   __3__38__0__1__g_texSkyInscatterUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_4273, _4274, _4275, 0.0f);
   __3__38__0__1__g_texSkyExtinctionUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_4256, _4257, _4258, 1.0f);
 }

src/games/crimsondesert/sky-atmospheric/RenderAtmosphericScattering_0xF7949D28.cs_6_6.hlsl

@@ -2272,6 +2272,14 @@ void main(
   _5084 *= _inscatterBias.x;
   _5085 *= _inscatterBias.y;
   _5086 *= _inscatterBias.z;
+
+  // [NIGHT_SKY_ATTENUATION] Reduce sky brightness when sun is below horizon
+  {
+    float _nightSkyAtten = NightSkyAttenuation(_sunDirection.y);
+    _5084 *= _nightSkyAtten;
+    _5085 *= _nightSkyAtten;
+    _5086 *= _nightSkyAtten;
+  }
 
   __3__38__0__1__g_texSkyInscatterUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_5084, _5085, _5086, _61.x);
   __3__38__0__1__g_texSkyExtinctionUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_5081, _5082, _5083, 0.0f);

src/games/crimsondesert/sky-atmospheric/SkyMaterial_0xB143E0FF.cs_6_6.hlsl

@@ -1241,7 +1241,7 @@ void main(
     if (AURORA_BOREALIS_ENABLED) {
       float nightGate = ComputeNightGate(_sunDirection.y);
       float3 aurora = ComputeAurora(
-        float3(_133, _134, _135), _time.w, _frameNumber.x,
+        float3(_133, _134, _135), _time.w, _time.x, _frameNumber.x,
         uint2(_52, _54)
       );
       aurora *= nightGate * _801;

src/games/crimsondesert/sky-atmospheric/SkyMaterial_0xCED1900A.cs_6_6.hlsl

@@ -247,7 +247,7 @@ void main(
     if (AURORA_BOREALIS_ENABLED) {
       float nightGate = ComputeNightGate(_sunDirection.y);
       float3 aurora = ComputeAurora(
-        float3(_111, _112, _113), _time.w, _frameNumber.x,
+        float3(_111, _112, _113), _time.w, _time.x, _frameNumber.x,
         uint2(SV_DispatchThreadID.x, SV_DispatchThreadID.y)
       );
       float transmittance = ChapmanTransmittance(0.f, _113, _rayleighScaledHeight, _earthRadius);

src/games/crimsondesert/sky-atmospheric/SkyRenderAtmosphericScattering_0xFC0DDA7B.cs_6_6.hlsl

@@ -1939,6 +1939,14 @@ void main(
     }
   }
 
+  // [NIGHT_SKY_ATTENUATION] Reduce sky brightness when sun is below horizon
+  {
+    float _nightSkyAtten = NightSkyAttenuation(_sunDirection.y);
+    _4347 *= _nightSkyAtten;
+    _4348 *= _nightSkyAtten;
+    _4349 *= _nightSkyAtten;
+  }
+
   __3__38__0__1__g_texSkyInscatterUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_4347, _4348, _4349, _61.x);
   __3__38__0__1__g_texSkyExtinctionUAV[int2((int)(SV_DispatchThreadID.x), (int)(SV_DispatchThreadID.y))] = float4(_4344, _4345, _4346, 0.0f);
 }