Visual effects toggles now uses cvars instead of asm hooks

DarwinsParadox/dllmain.cpp

@@ -1,10 +1,5 @@
 #include "CommonHeaders.h"
-#include "UEngine.hpp"
-#include "UETools.hpp"
-#include "UEvars.hpp"
-#include "Logger.hpp"
-#include "SDK/Basic.hpp"
-#include "SDK/Engine_classes.hpp"
+#include "CommonUEHeaders.h"
 #include "SDK/DarwinParadox_classes.hpp"
 
 using namespace SDK;
@@ -25,15 +20,15 @@ static float g_AspectRatio = (float)screenWidth / screenHeight;
 // Plugin states
 static bool AOBScanDone = false;
 static bool g_Console = false;
-static bool g_fix_enabled = false;
-static bool g_fov_fix_enabled = false;
-static bool g_ultrawide_fix_enabled = false;
-static bool g_DOF_fix_enabled = false;
-static bool g_CA_fix_enabled = false;
-static bool g_Vignetting_fix_enabled = false;
-static bool g_Fog_fix_enabled = false;
-static bool g_TimeDilation_fix_enabled = false;
-static bool g_Stealth_fix_enabled = false;
+static std::atomic<bool> g_fix_enabled = false;
+static std::atomic<bool> g_fov_fix_enabled = false;
+static std::atomic<bool> g_ultrawide_fix_enabled = false;
+static std::atomic<bool> g_DOF_fix_enabled = false;
+static std::atomic<bool> g_CA_fix_enabled = false;
+static std::atomic<bool> g_Vignetting_fix_enabled = false;
+static std::atomic<bool> g_Fog_fix_enabled = false;
+static std::atomic<bool> g_TimeDilation_fix_enabled = false;
+static std::atomic<bool> g_Stealth_fix_enabled = false;
 static int g_AdditionalFOVValue = 0;
 static float g_WorldTimeDilationValue = 1.f;
 static bool user_inputs_logged = false;
@@ -44,10 +39,6 @@ static float g_CompensatedFOV = 80.f;
 static float g_FOV_Out = 80.f;
 
 // AOB Scan pointers
-static uint8_t* DOFaddress = nullptr;
-static uint8_t* CAaddress = nullptr;
-static uint8_t* Vignettingaddress = nullptr;
-static uint8_t* Fogaddress = nullptr;
 static uint8_t* CameraComponentaddress = nullptr;
 static uint8_t* WorldTimedilationaddress = nullptr;
 static uint8_t* Timedilationaddress = nullptr;
@@ -61,25 +52,19 @@ static SafetyHookMid TimeDilationHook{};
 // Prototypes
 static void FOVFixEnabled();
 static void UltraWideFixEnabled();
-static void DOFFixEnabled();
-static void CAFixEnabled();
-static void VignettingFixEnabled();
-static void FogFixEnabled();
 static void EnableConsole();
 static void EnableCheats(Cheat cheat);
 static void ProcessEvent();
 
 extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) {
     g_fix_enabled = enabled;
-    if (!AOBScanDone) { // Unreal Engine 5.4.4
+    if (init) {
         logger = InitializeLogger("Darwin's Paradox", PLUGIN_LOG);
         logger->info("Plugin {} loaded.", PLUGIN_NAME);
+    }
+    if (!AOBScanDone) { // Unreal Engine 5.4.4
         logger->info("--------------- AOB scan started ---------------");
         constexpr auto CameraComponentStringObfuscated = make_obfuscated<0xF3>("EB ?? F3 0F ?? ?? ?? ?? ?? ?? F3 0F ?? ?? ?? 8B 83");
-        constexpr auto DOFStringObfuscated = make_obfuscated<0xC1>("8B ?? ?? 48 ?? ?? E8 ?? ?? ?? ?? 0F ?? ?? 48 6B ?? ?? 48 8D");
-        constexpr auto CAStringObfuscated = make_obfuscated<0x39>("7F ?? 44 89 ?? ?? ?? ?? ?? 43 8B ?? ?? 39 05 ?? ?? ?? ?? 0F 8F");
-        constexpr auto VignettingStringObfuscated = make_obfuscated<0xEB>("8B ?? 83 ?? ?? 7D ?? 44 89 ?? ?? ?? ?? ?? EB");
-        constexpr auto FogStringObfuscated = make_obfuscated<0x75>("74 ?? 48 8B ?? ?? ?? ?? ?? 83 ?? ?? ?? 75 ?? 40 ?? ?? EB ?? 40 ?? ?? 48 8B");
         constexpr auto WorldTimeDilationStringObfuscated = make_obfuscated<0x59>("F3 0F 10 ?? ?? ?? ?? ?? F3 0F 59 ?? ?? ?? ?? ?? F3 0F 59 ?? ?? ?? ?? ?? C3");
         constexpr auto TimeDilationStringObfuscated = make_obfuscated<0x44>("F3 0F ?? ?? ?? EB ?? F3 0F ?? ?? ?? ?? ?? ?? 48 8B ?? ?? 4C ?? ?? F3 0F ?? ?? 44");
 
@@ -88,18 +73,13 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) {
         // Prepare all data for scanning
         std::vector<AOBScanEntry> signatures = {
             Make(&CameraComponentaddress, CameraComponentStringObfuscated, "Camera component"),
-            Make(&DOFaddress, DOFStringObfuscated, "DOF"),
-            Make(&CAaddress, CAStringObfuscated, "Chromatic aberrations"),
-            Make(&Vignettingaddress, VignettingStringObfuscated, "Vignetting"),
-            Make(&Fogaddress, FogStringObfuscated, "Fog"),
             Make(&WorldTimedilationaddress, WorldTimeDilationStringObfuscated, "World time dilation"),
             Make(&Timedilationaddress, TimeDilationStringObfuscated, "Actor time dilation"),
         };
         // Scan all signature in a batch
         Memory::AOBScanBatch(signatures, logger);
 
-        if (CameraComponentaddress && DOFaddress && CAaddress && Vignettingaddress &&
-            Fogaddress && WorldTimedilationaddress && Timedilationaddress)
+        if (CameraComponentaddress && WorldTimedilationaddress && Timedilationaddress)
             logger->info("All AOB signatures found. Ready to patch...");
 
         if (!GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) {
@@ -107,12 +87,14 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) {
             uint8_t* baseModule = reinterpret_cast<uint8_t*>(GetModuleHandleA(nullptr)); // Get game base address
 
             constexpr auto GObjetcsStringObfuscated = make_obfuscated<0x8D>("48 8B ?? ?? ?? ?? ?? 48 8B ?? ?? 48 8D ?? ?? EB ?? 33");
+            constexpr auto GWorldStringObfuscated = make_obfuscated<0x8D>("48 8B 05 ?? ?? ?? ?? 48 ?? ?? 75 ?? 48 83 ?? ?? 5B C3");
             constexpr auto AppendStringStringObfuscated = make_obfuscated<0x80>("48 89 ?? ?? ?? 48 89 ?? ?? ?? 57 48 83 ?? ?? 80 3D ?? ?? ?? ?? ?? 48 ?? F2 8B ?? 48 ?? ?? 74 ?? 4C 8D ?? ?? ?? ?? ?? EB ?? 48 8D ?? ?? ?? ?? ?? E8 ?? ?? ?? ?? 4C");
             constexpr auto ProcessEventStringObfuscated = make_obfuscated<0x56>("40 ?? 56 57 41 ?? 41 ?? 41 ?? 41 ?? 48 81 ?? ?? ?? ?? ?? 48 8D ?? ?? ?? 48 89 ?? ?? ?? ?? ?? 48 8B ?? ?? ?? ?? ?? 48 ?? ?? 48 89 ?? ?? ?? ?? ?? 4D");
 
             // Prepare all data for scanning
             std::vector<OffsetScanEntry> UEoffsetsScans = {
                 Make(&GObjectsaddress, GObjetcsStringObfuscated, "GObjects", OffsetCalcType::GetOffsetFromOpcode, &Offsets::GObjects, 0x3),
+                Make(&GWorldaddress, GWorldStringObfuscated, "Gworld", OffsetCalcType::GetOffsetFromOpcode, &Offsets::GWorld, 0x3),
                 Make(&AppendStringaddress, AppendStringStringObfuscated, "AppendString", OffsetCalcType::UE_CalculateOffset, &Offsets::AppendString),
                 Make(&ProcessEventaddress, ProcessEventStringObfuscated, "ProcessEvent", OffsetCalcType::UE_CalculateOffset, &Offsets::ProcessEvent)
             };
@@ -127,21 +109,23 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) {
     if (init) return;
     FOVFixEnabled();
     UltraWideFixEnabled();
-    DOFFixEnabled();
-    CAFixEnabled();
-    VignettingFixEnabled();
-    FogFixEnabled();
+    gPendingDOF = true;
+    gPendingCA = true;
+    gPendingVignetting = true;
+    gPendingFog = true;
+    LogFixToggle(GameFixes::None, g_fix_enabled);
 }
 
 // Setters for Reshade addon call
 extern "C" __declspec(dllexport) void SetFixesEnabled(GameFixes fix, bool enabled) { // Set each fix individually
+    bool bVisual = g_fix_enabled && enabled;
     if (fix == GameFixes::DevConsole)           { g_Console = enabled; EnableConsole(); }
     if (fix == GameFixes::FOV)                  { g_fov_fix_enabled = enabled; FOVFixEnabled(); }
     if (fix == GameFixes::UltraWide)            { g_ultrawide_fix_enabled = enabled; UltraWideFixEnabled(); }
-    if (fix == GameFixes::DOF)                  { g_DOF_fix_enabled = enabled; DOFFixEnabled(); }
-    if (fix == GameFixes::ChromaticAberrations) { g_CA_fix_enabled = enabled; CAFixEnabled(); }
-    if (fix == GameFixes::Vignetting)           { g_Vignetting_fix_enabled = enabled; VignettingFixEnabled(); }
-    if (fix == GameFixes::Fog)                  { g_Fog_fix_enabled = enabled; FogFixEnabled(); }
+    if (fix == GameFixes::DOF)                  { g_DOF_fix_enabled = enabled; gPendingDOF = true; LogFixToggle(fix, bVisual); }
+    if (fix == GameFixes::ChromaticAberrations) { g_CA_fix_enabled = enabled; gPendingCA = true; LogFixToggle(fix, bVisual); }
+    if (fix == GameFixes::Vignetting)           { g_Vignetting_fix_enabled = enabled; gPendingVignetting = true; LogFixToggle(fix, bVisual); }
+    if (fix == GameFixes::Fog)                  { g_Fog_fix_enabled = enabled; gPendingFog = true; LogFixToggle(fix, bVisual); }
     if (fix == GameFixes::TimeDilation)         { g_TimeDilation_fix_enabled = enabled; EnableCheats(Cheat::TimeDilation); }
     if (fix == GameFixes::Stealth)              { g_Stealth_fix_enabled = enabled; EnableCheats(Cheat::Stealth); }
 }
@@ -212,6 +196,16 @@ static void EnableCheats(Cheat cheat) {
             [](SafetyHookContext& ctx) {
                 // From AWorldSettings retrieved from world->K2_GetWorldSettings()
                 ctx.xmm0.f32[0] *= g_TimeDilation_fix_enabled ? g_WorldTimeDilationValue : 1.f;
+                // Apply visual effects only in hook main thread to ensure they will be applied correctly
+                if (!g_Console_Enabled) return; // It relies on dev console being reactivated
+                if (gPendingFog.exchange(false))
+                    ApplyVisualEffect(GameFixes::Fog, g_fix_enabled && g_Fog_fix_enabled);
+                if (gPendingDOF.exchange(false))
+                    ApplyVisualEffect(GameFixes::DOF, g_fix_enabled && g_DOF_fix_enabled);
+                if (gPendingCA.exchange(false))
+                    ApplyVisualEffect(GameFixes::ChromaticAberrations, g_fix_enabled && g_CA_fix_enabled);
+                if (gPendingVignetting.exchange(false))
+                    ApplyVisualEffect(GameFixes::Vignetting, g_fix_enabled && g_Vignetting_fix_enabled);
             });
     }
     if (Timedilationaddress && !TimeDilationHook) {
@@ -248,41 +242,6 @@ static void UltraWideFixEnabled() {
     logger->info("Ultrawide fix {}", g_fix_enabled && g_ultrawide_fix_enabled ? "enabled" : "disabled");
 }
 
-static void DOFFixEnabled() {
-	if (!DOFaddress) return;
-    if (g_fix_enabled && g_DOF_fix_enabled)
-        Memory::PatchBytes(DOFaddress, "\x31\xFF\x90", 3); // xor edi,edi r.DepthOfFieldQuality = 0
-    else Memory::RestoreBytes(DOFaddress);
-
-    logger->info("Depth of field fix {}", g_fix_enabled && g_DOF_fix_enabled ? "enabled" : "disabled");
-}
-
-static void CAFixEnabled() {
-	if (!CAaddress) return;
-    if (g_fix_enabled && g_CA_fix_enabled)
-        Memory::PatchBytes(CAaddress, "\x90\x90", 2); // NOP x 2 r.SceneColorFringeQuality = 0
-    else Memory::RestoreBytes(CAaddress);
-
-    logger->info("Chromatics aberrations fix {}", g_fix_enabled && g_CA_fix_enabled ? "enabled" : "disabled");
-}
-
-static void VignettingFixEnabled() {
-	if (!Vignettingaddress) return;
-    if (g_fix_enabled && g_Vignetting_fix_enabled)
-        Memory::PatchBytes(Vignettingaddress, "\x31\xC9", 2); // xor ecx,ecx r.Tonemapper.Quality=0
-    else Memory::RestoreBytes(Vignettingaddress);
-
-    logger->info("Vignetting fix disabled", g_fix_enabled && g_CA_fix_enabled ? "enabled" : "disabled");
-}
-
-static void FogFixEnabled() {
-	if (!Fogaddress) return;
-    if (g_fix_enabled && g_Fog_fix_enabled)
-        Memory::PatchBytes(Fogaddress, "\xEB", 1); // jmp -> r.Fog 0
-    else Memory::RestoreBytes(Fogaddress);
-
-    logger->info("Fog fix disabled", g_fix_enabled && g_Fog_fix_enabled ? "enabled" : "disabled");
-}
 // UE Console creation
 static void EnableConsole() {
     if (g_Console_Enabled || !g_Console || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) {