From 12564d687c7b9b492d05ab1a3555e617b3f2647e Mon Sep 17 00:00:00 2001 From: Emmanuel AYME Date: Sat, 4 Apr 2026 17:58:37 +0200 Subject: [PATCH] Visual effects toggles now uses cvars instead of asm hooks --- ClairObscur/dllmain.cpp | 90 ++++++----------- DarwinsParadox/dllmain.cpp | 113 +++++++-------------- Reanimal/dllmain.cpp | 141 ++++++++------------------ StyxBladesOfGreed/dllmain.cpp | 184 +++++++++++----------------------- 4 files changed, 169 insertions(+), 359 deletions(-) diff --git a/ClairObscur/dllmain.cpp b/ClairObscur/dllmain.cpp index 58ad060..67ab936 100644 --- a/ClairObscur/dllmain.cpp +++ b/ClairObscur/dllmain.cpp @@ -1,9 +1,5 @@ #include "CommonHeaders.h" -#include "UEngine.hpp" -#include "UETools.hpp" -#include "UEWidgets.hpp" -#include "UEvars.hpp" -#include "Logger.hpp" +#include "CommonUEHeaders.h" #include "SDK.h" using namespace SDK; @@ -64,9 +60,6 @@ static uint8_t* CameraComponentaddress = nullptr; static uint8_t* Cameraaddress = nullptr; static uint8_t* CutscenesFPSaddress1 = nullptr; static uint8_t* CutscenesFPSaddress2 = nullptr; -static uint8_t* CAaddress = nullptr; -static uint8_t* DOFaddress = nullptr; -static uint8_t* Fogaddress = nullptr; static uint8_t* WorldTimedilationaddress = nullptr; static uint8_t* Timedilationaddress = nullptr; static uint8_t* CameraStructaddress = nullptr; @@ -86,15 +79,16 @@ static void UltraWideFixEnabled(GameFixes fix); static void CameraFixEnabled(); static void CutscenesFPSFixEnabled(); static void HUDUpdate(bool writeLog); -static void DOFFixEnabled(); -static void CAFixEnabled(); -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 (init) { + logger = InitializeLogger("Clair Obscur: Expedition 33", 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"); @@ -119,17 +113,14 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { Make(&CutscenesFPSaddress2, CutscenesFPS2StringObfuscated, "FPS unlock"), Make(&CameraStructaddress, CameraStruct1StringObfuscated, "Camera struct"), Make(&Cameraaddress, CameraStringObfuscated, "Camera"), - Make(&CAaddress, CAStringObfuscated, "Chromatic aberrations"), - Make(&DOFaddress, DOFStringObfuscated, "DOF"), - Make(&Fogaddress, FogStringObfuscated, "Fog"), Make(&WorldTimedilationaddress, WorldTimeDilationStringObfuscated, "World time dilation"), Make(&Timedilationaddress, TimeDilationStringObfuscated, "AI time dilation"), }; // Scan all signature in a batch Memory::AOBScanBatch(signatures, logger); - if (FOVaddress && DOFaddress && Fogaddress && WorldTimedilationaddress && Timedilationaddress && - CutscenesFPSaddress1 && CutscenesFPSaddress1 && CAaddress && CameraComponentaddress && CameraStructaddress && Cameraaddress) + if (FOVaddress && WorldTimedilationaddress && Timedilationaddress && CutscenesFPSaddress1 && + CutscenesFPSaddress2 && CameraComponentaddress && CameraStructaddress && Cameraaddress) logger->info("All AOB signatures found. Ready to patch..."); if (!GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -155,19 +146,22 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { AOBScanDone = true; } - if (!init && FOVaddress) FOVFixEnabled(); - if (!init && CameraStructaddress) UltraWideFixEnabled(GameFixes::UltraWide); - if (!init && CutscenesFPSaddress1) CutscenesFPSFixEnabled(); - if (!init && Cameraaddress) CameraFixEnabled(); - if (!init) HUDUpdate(true); - if (!init && DOFaddress) DOFFixEnabled(); - if (!init && CAaddress) CAFixEnabled(); - if (!init && Fogaddress) FogFixEnabled(); ProcessEvent(); + if (init) return; + FOVFixEnabled(); + UltraWideFixEnabled(GameFixes::UltraWide); + CutscenesFPSFixEnabled(); + CameraFixEnabled(); + HUDUpdate(true); + gPendingDOF = true; + gPendingCA = 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::SkipIntro) { g_SkipIntros_enabled = enabled; } if (fix == GameFixes::FOV) { g_fov_fix_enabled = enabled; FOVFixEnabled(); } @@ -175,9 +169,9 @@ extern "C" __declspec(dllexport) void SetFixesEnabled(GameFixes fix, bool enable if (fix == GameFixes::UltraWide) { g_ultrawide_fix_enabled = enabled; UltraWideFixEnabled(GameFixes::UltraWide); } if (fix == GameFixes::Camera) { g_camera_fix_enabled = enabled; CameraFixEnabled(); } if (fix == GameFixes::HUD) { g_HUD_fix_enabled = enabled; HUDUpdate(true); } - if (fix == GameFixes::DOF) { g_DOF_fix_enabled = enabled; DOFFixEnabled(); } - if (fix == GameFixes::ChromaticAberrations) { g_CA_fix_enabled = enabled; CAFixEnabled(); } - 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::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::GodMode) { g_GodMode_fix_enabled = enabled; EnableCheats(Cheat::GodMode); } if (fix == GameFixes::Stealth) { g_Stealth_fix_enabled= enabled; EnableCheats(Cheat::Stealth); } @@ -396,6 +390,14 @@ 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 (Timedilationaddress && !TimeDilationHook) { TimeDilationHook = safetyhook::create_mid(Timedilationaddress, @@ -439,34 +441,6 @@ static void EnableCheats(Cheat cheat) { if (cheat == Cheat::Other) logger->info("Camera distance {}", g_fix_enabled && g_camera_fix_enabled ? "enabled" : "disabled"); } -// Memory patch fixes -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" : "true"); -} - -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 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 {}", g_fix_enabled && g_Fog_fix_enabled ? "enabled" : "disabled"); -} // UE Console creation static void EnableConsole() { if (g_Console_Enabled || !g_Console || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -482,11 +456,7 @@ static void EnableConsole() { } // Standard dll entry BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID) { - if (reason == DLL_PROCESS_ATTACH) { - logger = InitializeLogger("Clair Obscur: Expedition 33", PLUGIN_LOG); - logger->info("Plugin {} loaded.", PLUGIN_NAME); - } - else if (reason == DLL_PROCESS_DETACH) { + if (reason == DLL_PROCESS_DETACH) { logger->info("Plugin {} unloaded.", PLUGIN_NAME); spdlog::drop_all(); } diff --git a/DarwinsParadox/dllmain.cpp b/DarwinsParadox/dllmain.cpp index f37dc8e..6143a99 100644 --- a/DarwinsParadox/dllmain.cpp +++ b/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 g_fix_enabled = false; +static std::atomic g_fov_fix_enabled = false; +static std::atomic g_ultrawide_fix_enabled = false; +static std::atomic g_DOF_fix_enabled = false; +static std::atomic g_CA_fix_enabled = false; +static std::atomic g_Vignetting_fix_enabled = false; +static std::atomic g_Fog_fix_enabled = false; +static std::atomic g_TimeDilation_fix_enabled = false; +static std::atomic 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 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(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 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) { diff --git a/Reanimal/dllmain.cpp b/Reanimal/dllmain.cpp index 04fcc89..1084787 100644 --- a/Reanimal/dllmain.cpp +++ b/Reanimal/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" using namespace SDK; @@ -24,16 +19,16 @@ float baseAspect = 1.777778f; // 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_HUD_fix_enabled = false; -static bool g_Camera_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 std::atomic g_fix_enabled = false; +static std::atomic g_fov_fix_enabled = false; +static std::atomic g_ultrawide_fix_enabled = false; +static std::atomic g_HUD_fix_enabled = false; +static std::atomic g_Camera_fix_enabled = false; +static std::atomic g_DOF_fix_enabled = false; +static std::atomic g_CA_fix_enabled = false; +static std::atomic g_Vignetting_fix_enabled = false; +static std::atomic g_Fog_fix_enabled = false; +static std::atomic g_TimeDilation_fix_enabled = false; static int g_AdditionalFOVValue = 0; static float g_WorldTimeDilationValue = 1.f; static bool user_inputs_logged = false; @@ -45,13 +40,6 @@ static float g_FOV_Out = 80.f; // AOB Scan pointers static uint8_t* FOVaddress = nullptr; -static uint8_t* Cameraaddress = nullptr; -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* ConstrainAspectRatioaddress = nullptr; static uint8_t* WorldTimedilationaddress = nullptr; static uint8_t* CameraStruct1address = nullptr; @@ -64,23 +52,19 @@ static SafetyHookMid CameraStruct1Hook{}; // Prototypes static void FOVFixEnabled(); static void UltraWideFixEnabled(GameFixes fix); -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 (init) { + logger = InitializeLogger("Reanimal", PLUGIN_LOG); + logger->info("Plugin {} loaded.", PLUGIN_NAME); + } if (!AOBScanDone) { // Unreal Engine 5.4.4 logger->info("--------------- AOB scan started ---------------"); constexpr auto FOVStringObfuscated = make_obfuscated<0xF3>("77 ?? 48 ?? ?? FF 90 ?? ?? ?? ?? F3 0F ?? ?? ?? 48 83 ?? ?? C3"); - 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 CameraStruct1StringObfuscated = make_obfuscated<0x48>("48 89 ?? ?? ?? 57 48 83 ?? ?? 0F ?? ?? 48 8B FA 48 ?? ?? 0F ?? ?? F2 0F 10"); @@ -90,17 +74,12 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { std::vector signatures = { Make(&FOVaddress, FOVStringObfuscated, "FOV"), Make(&CameraStruct1address, CameraStruct1StringObfuscated, "Camera"), - Make(&DOFaddress, DOFStringObfuscated, "DOF"), - Make(&CAaddress, CAStringObfuscated, "Chromatic aberrations"), - Make(&Vignettingaddress, VignettingStringObfuscated, "Vignetting"), - Make(&Fogaddress, FogStringObfuscated, "Fog"), Make(&WorldTimedilationaddress, WorldTimeDilationStringObfuscated, "World time dilation") }; // Scan all signature in a batch Memory::AOBScanBatch(signatures, logger); - if (FOVaddress && DOFaddress && CAaddress && Vignettingaddress && - Fogaddress && WorldTimedilationaddress && CameraStruct1address) + if (FOVaddress && WorldTimedilationaddress && CameraStruct1address) logger->info("All AOB signatures found. Ready to patch..."); if (!GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -108,12 +87,14 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { uint8_t* baseModule = reinterpret_cast(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 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) }; @@ -124,27 +105,27 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { AOBScanDone = true; } - if (!init && FOVaddress) FOVFixEnabled(); - if (!init && CameraStruct1address) UltraWideFixEnabled(GameFixes::UltraWide); - if (!init && DOFaddress) DOFFixEnabled(); - if (!init && CAaddress) CAFixEnabled(); - if (!init && Vignettingaddress) VignettingFixEnabled(); - if (!init && Fogaddress) FogFixEnabled(); - if (!init && WorldTimedilationaddress) { - EnableCheats(Cheat::TimeDilation); - } ProcessEvent(); + if (init) return; + FOVFixEnabled(); + UltraWideFixEnabled(GameFixes::UltraWide); + 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(GameFixes::UltraWide); } - 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); } } @@ -231,55 +212,21 @@ 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 (cheat == Cheat::TimeDilation) logger->info("Time dilation cheat {}", g_TimeDilation_fix_enabled ? "enabled" : "disabled"); } -// Memory patch fixes -static void DOFFixEnabled() { - if (g_fix_enabled && g_DOF_fix_enabled && DOFaddress) { - Memory::PatchBytes(DOFaddress, "\x31\xFF\x90", 3); // xor edi,edi r.DepthOfFieldQuality = 0 - logger->info("Depth of field fix enabled"); - } - if (!(g_fix_enabled && g_DOF_fix_enabled) && DOFaddress) { - Memory::RestoreBytes(DOFaddress); - logger->info("Depth of field fix disabled"); - } -} - -static void CAFixEnabled() { - if (g_fix_enabled && g_CA_fix_enabled && CAaddress) { - Memory::PatchBytes(CAaddress, "\x90\x90", 2); // NOP x 2 r.SceneColorFringeQuality = 0 - logger->info("Chromatics aberrations fix enabled"); - } - if (!(g_fix_enabled && g_CA_fix_enabled) && CAaddress) { - Memory::RestoreBytes(CAaddress); - logger->info("Chromatics aberrations fix disabled"); - } -} - -static void VignettingFixEnabled() { - if (g_fix_enabled && g_Vignetting_fix_enabled && Vignettingaddress) { - Memory::PatchBytes(Vignettingaddress, "\x31\xC9", 2); // xor ecx,ecx r.Tonemapper.Quality=0 - logger->info("Vignetting fix enabled"); - } - if (!(g_fix_enabled && g_Vignetting_fix_enabled) && Vignettingaddress) { - Memory::RestoreBytes(Vignettingaddress); - logger->info("Vignetting fix disabled"); - } -} - -static void FogFixEnabled() { - if (g_fix_enabled && g_Fog_fix_enabled && Fogaddress) { - Memory::PatchBytes(Fogaddress, "\xEB", 1); // jmp -> r.Fog 0 - logger->info("Fog fix enabled"); - } - if (!(g_fix_enabled && g_Fog_fix_enabled) && Fogaddress) { - Memory::RestoreBytes(Fogaddress); - logger->info("Fog fix disabled"); - } -} // UE Console creation static void EnableConsole() { if (g_Console_Enabled || !g_Console || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -295,11 +242,7 @@ static void EnableConsole() { } // Standard dll entry BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID) { - if (reason == DLL_PROCESS_ATTACH) { - logger = InitializeLogger("Reanimal", PLUGIN_LOG); - logger->info("Plugin {} loaded.", PLUGIN_NAME); - } - else if (reason == DLL_PROCESS_DETACH) { + if (reason == DLL_PROCESS_DETACH) { logger->info("Plugin {} unloaded.", PLUGIN_NAME); spdlog::drop_all(); } diff --git a/StyxBladesOfGreed/dllmain.cpp b/StyxBladesOfGreed/dllmain.cpp index 4e35359..da46286 100644 --- a/StyxBladesOfGreed/dllmain.cpp +++ b/StyxBladesOfGreed/dllmain.cpp @@ -1,13 +1,5 @@ -#include -#include "CommonHeaders.h" -#include "UEngine.hpp" -#include "UETools.hpp" -#include "UEWidgets.hpp" -#include "UEvars.hpp" -#include "UEMath.hpp" -#include "Logger.hpp" -#include "SDK/Basic.hpp" -#include "SDK/Engine_classes.hpp" +#include "CommonHeaders.h" +#include "CommonUEHeaders.h" #include "SDK/UI_Settings_classes.hpp" #include "SDK/UI_Profile_classes.hpp" #include "SDK/UI_MainMenu_classes.hpp" @@ -66,13 +58,8 @@ static float g_FOV_Out = 60.f; static float g_CameraIn = 200.f; static float g_CameraOut = 200.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* CameraDistanceaddress = nullptr; -static uint8_t* ConstrainAspectRatioaddress = nullptr; static uint8_t* WorldTimedilationaddress = nullptr; static uint8_t* Timedilationaddress = nullptr; // Hooking @@ -88,10 +75,6 @@ static void FOVFixEnabled(); static void UltraWideFixEnabled(); static void CameraDistanceFixEnabled(); static void HUDUpdate(bool writeLog); -static void DOFFixEnabled(); -static void CAFixEnabled(); -static void VignettingFixEnabled(); -static void FogFixEnabled(); static void EnableConsole(); static void EnableCheats(Cheat cheat); static void ProcessEvent(); @@ -118,14 +101,15 @@ static AStyx3PlayerCharacter* g_Player = nullptr; extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { g_fix_enabled = enabled; + if (init) { + logger = InitializeLogger("Styx: Blades Of Green", PLUGIN_LOG); + logger->info("Plugin {} loaded.", PLUGIN_NAME); + } + if (!AOBScanDone) { // Unreal Engine 5.6 logger->info("--------------- AOB scan started ---------------"); constexpr auto CameraComponentStringObfuscated = make_obfuscated<0xF3>("EB ?? F3 0F ?? ?? ?? ?? ?? ?? F3 0F ?? ?? ?? 8B 83 ?? ?? ?? ?? 89"); constexpr auto CameraDistanceStringObfuscated = make_obfuscated<0x66>("0F ?? ?? F3 0F ?? ?? 0F ?? ?? 0F 11 ?? ?? ?? 0F 10 ?? ?? ?? 66 0F ?? ?? F2 0F"); - constexpr auto DOFStringObfuscated = make_obfuscated<0xC1>("8B ?? ?? 48 ?? ?? E8 ?? ?? ?? ?? 0F ?? ?? 48 8D ?? ?? ?? ?? ?? 48 C1"); - 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"); constexpr auto WorldTimeDilationStringObfuscated = make_obfuscated<0xF6>("F6 81 ?? ?? ?? ?? ?? 74 ?? F3 0F ?? ?? ?? ?? ?? ?? F3 0F ?? ?? ?? ?? ?? ?? F3 0F ?? ?? ?? ?? ?? ?? C3"); constexpr auto TimeDilationStringObfuscated = make_obfuscated<0x44>("F3 0F ?? ?? ?? EB ?? F3 0F ?? ?? ?? ?? ?? ?? 48 8B ?? ?? 4C ?? ?? F3 0F ?? ?? 44"); @@ -135,19 +119,13 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { std::vector signatures = { Make(&CameraComponentaddress, CameraComponentStringObfuscated, "FOV"), Make(&CameraDistanceaddress, CameraDistanceStringObfuscated, "Camera distance"), - 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); - ConstrainAspectRatioaddress = CameraComponentaddress + 0x18; - if (CameraComponentaddress && CameraDistanceaddress && DOFaddress && CAaddress && Vignettingaddress && - Fogaddress && ConstrainAspectRatioaddress && WorldTimedilationaddress && Timedilationaddress /*&& Stealthaddress*/) + if (CameraComponentaddress && CameraDistanceaddress && WorldTimedilationaddress && Timedilationaddress) logger->info("All AOB signatures found. Ready to patch..."); if (!GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -173,32 +151,30 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { AOBScanDone = true; } - if (!init && CameraComponentaddress) FOVFixEnabled(); - if (!init && ConstrainAspectRatioaddress) UltraWideFixEnabled(); - if (!init && CameraDistanceaddress) CameraDistanceFixEnabled(); - if (!init) HUDUpdate(true); - if (!init && DOFaddress) DOFFixEnabled(); - if (!init && CAaddress) CAFixEnabled(); - if (!init && Vignettingaddress) VignettingFixEnabled(); - if (!init && Fogaddress) FogFixEnabled(); - if (!init && WorldTimedilationaddress) { - EnableCheats(Cheat::TimeDilation); - EnableCheats(Cheat::GodMode); - EnableCheats(Cheat::Mana); - EnableCheats(Cheat::Stealth); - } ProcessEvent(); + if (init) return; + FOVFixEnabled(); + UltraWideFixEnabled(); + CameraDistanceFixEnabled(); + HUDUpdate(true); + 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::Camera) { g_Camera_fix_enabled = enabled; CameraDistanceFixEnabled(); } - 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::HUD) { g_HUD_fix_enabled = enabled; HUDUpdate(true); } if (fix == GameFixes::TimeDilation) { g_TimeDilation_fix_enabled = enabled; EnableCheats(Cheat::TimeDilation); } if (fix == GameFixes::GodMode) { g_GodMode_fix_enabled = enabled; EnableCheats(Cheat::GodMode); } @@ -394,25 +370,25 @@ static void HUDUpdate(bool writeLog) { } static void FOVFixEnabled() { - if (CameraComponentaddress) { - if (!FOVHook) { // Hook only once - FOVHook = safetyhook::create_mid(CameraComponentaddress + 0xa, - [](SafetyHookContext& ctx) { - g_FOV_In = ctx.xmm0.f32[0]; - if (g_fix_enabled && g_ultrawide_fix_enabled) - ctx.xmm0.f32[0] = Maths::CompensateHorizontalFOV(g_FOV_In, g_BaseAspectRatio, g_AspectRatio); - g_CompensatedFOV = ctx.xmm0.f32[0]; - ctx.xmm0.f32[0] += g_fix_enabled && g_fov_fix_enabled ? g_AdditionalFOVValue : 0.f; - g_FOV_Out = ctx.xmm0.f32[0]; - }); - } + if (!CameraComponentaddress) return; + if (!FOVHook) { // Hook only once + FOVHook = safetyhook::create_mid(CameraComponentaddress + 0xa, + [](SafetyHookContext& ctx) { + g_FOV_In = ctx.xmm0.f32[0]; + if (g_fix_enabled && g_ultrawide_fix_enabled) + ctx.xmm0.f32[0] = Maths::CompensateHorizontalFOV(g_FOV_In, g_BaseAspectRatio, g_AspectRatio); + g_CompensatedFOV = ctx.xmm0.f32[0]; + ctx.xmm0.f32[0] += g_fix_enabled && g_fov_fix_enabled ? g_AdditionalFOVValue : 0.f; + g_FOV_Out = ctx.xmm0.f32[0]; + }); } - if (CameraComponentaddress) - logger->info("FOV fix {}", g_fix_enabled && g_fov_fix_enabled ? "enabled" : "disabled"); + + logger->info("FOV fix {}", g_fix_enabled && g_fov_fix_enabled ? "enabled" : "disabled"); } static void UltraWideFixEnabled() { - if (g_fix_enabled && g_ultrawide_fix_enabled && CameraComponentaddress) { + if (!CameraComponentaddress) return; + if (g_fix_enabled && g_ultrawide_fix_enabled) { if (!UltraWideHook1) { // Hook only once UltraWideHook1 = safetyhook::create_mid(CameraComponentaddress + 0x15, [](SafetyHookContext& ctx) { @@ -428,17 +404,18 @@ static void UltraWideFixEnabled() { }); } else UltraWideHook2.enable(); - logger->info("Ultrawide fix enabled"); } - if (!(g_fix_enabled && g_ultrawide_fix_enabled) && CameraComponentaddress) { + else { if (UltraWideHook1) UltraWideHook1.disable(); if (UltraWideHook2) UltraWideHook2.disable(); - logger->info("Ultrawide fix disabled"); } + + logger->info("Ultrawide fix {}", g_fix_enabled && g_ultrawide_fix_enabled ? "enabled" : "disabled"); } static void CameraDistanceFixEnabled() { - if (g_fix_enabled && g_Camera_fix_enabled && CameraDistanceaddress) { + if (!CameraDistanceaddress) return; + if (g_fix_enabled && g_Camera_fix_enabled) { if (!CameraHook) { // Hook only once CameraHook = safetyhook::create_mid(CameraDistanceaddress, [](SafetyHookContext& ctx) { @@ -448,19 +425,28 @@ static void CameraDistanceFixEnabled() { }); } else CameraHook.enable(); - logger->info("Camera distance fix enabled"); - } - if (!(g_fix_enabled && g_Camera_fix_enabled) && CameraDistanceaddress) { - if (CameraHook) CameraHook.disable(); - logger->info("Camera distance fix disabled"); } + else if (CameraHook) CameraHook.disable(); + + logger->info("Camera distance fix {}", g_fix_enabled && g_Camera_fix_enabled ? "enabled" : "disabled"); } + // -- Cheats -- static void EnableCheats(Cheat cheat) { if (WorldTimedilationaddress && !WorldTimeDilationHook) { WorldTimeDilationHook = safetyhook::create_mid(WorldTimedilationaddress + 0x19, - [](SafetyHookContext& ctx) { // From AWorldSettings retrieved from world->K2_GetWorldSettings() + [](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); }); } // Enemies time dilation @@ -496,51 +482,6 @@ static void EnableCheats(Cheat cheat) { if (cheat == Cheat::Stealth) logger->info("Stealth cheat {}", g_Stealth_fix_enabled ? "enabled" : "disabled"); } -// Memory patch fixes -static void DOFFixEnabled() { - if (g_fix_enabled && g_DOF_fix_enabled && DOFaddress) { - Memory::PatchBytes(DOFaddress, "\x31\xFF\x90", 3); // xor edi,edi r.DepthOfFieldQuality = 0 - logger->info("Depth of field fix enabled"); - } - if (!(g_fix_enabled && g_DOF_fix_enabled) && DOFaddress) { - Memory::RestoreBytes(DOFaddress); - logger->info("Depth of field fix disabled"); - } -} - -static void CAFixEnabled() { - if (g_fix_enabled && g_CA_fix_enabled && CAaddress) { - Memory::PatchBytes(CAaddress, "\x90\x90", 2); // NOP x 2 r.SceneColorFringeQuality = 0 - logger->info("Chromatics aberrations fix enabled"); - } - if (!(g_fix_enabled && g_CA_fix_enabled) && CAaddress) { - Memory::RestoreBytes(CAaddress); - logger->info("Chromatics aberrations fix disabled"); - } -} - -static void VignettingFixEnabled() { - if (g_fix_enabled && g_Vignetting_fix_enabled && Vignettingaddress) { - Memory::PatchBytes(Vignettingaddress, "\x31\xC9", 2); // xor ecx,ecx r.Tonemapper.Quality=0 - logger->info("Vignetting fix enabled"); - } - if (!(g_fix_enabled && g_Vignetting_fix_enabled) && Vignettingaddress) { - Memory::RestoreBytes(Vignettingaddress); - logger->info("Vignetting fix disabled"); - } -} - -static void FogFixEnabled() { - if (g_fix_enabled && g_Fog_fix_enabled && Fogaddress) - Memory::PatchBytes(Fogaddress + 0xd, "\xEB", 1); // jmp -> r.Fog 0 - if (!(g_fix_enabled && g_Fog_fix_enabled) && Fogaddress) - Memory::RestoreBytes(Fogaddress + 0xd); - - if (Fogaddress) { - if (g_fix_enabled && g_Fog_fix_enabled) logger->info("Fog fix enabled"); - else logger->info("Fog fix disabled"); - } -} // UE Console creation static void EnableConsole() { if (g_Console_Enabled || !g_Console || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -554,13 +495,10 @@ static void EnableConsole() { logger->info("-------------- Console re-enabling --------------"); ReactivateDevConsole(logger); } + // Standard dll entry BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID) { - if (reason == DLL_PROCESS_ATTACH) { - logger = InitializeLogger("Styx: Blades Of Green", PLUGIN_LOG); - logger->info("Plugin {} loaded.", PLUGIN_NAME); - } - else if (reason == DLL_PROCESS_DETACH) { + if (reason == DLL_PROCESS_DETACH) { logger->info("Plugin {} unloaded.", PLUGIN_NAME); spdlog::drop_all(); }