Add basic Depth of Field.

.gitignore

@@ -11,6 +11,7 @@
 *.sln.docstates
 *.lnk
 .obsidian/*
+mgs2_live_dump.bin
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -362,4 +363,4 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd

ConfigTool/tab_data.cpp

@@ -224,6 +224,12 @@ std::nullopt, false, Field::Int, 100, 1, 100},
         { ConfigKeys::FixOpticalCamo_Section, ConfigKeys::FixOpticalCamo_Setting, ConfigKeys::FixOpticalCamo_Help, ConfigKeys::FixOpticalCamo_Tooltip,
           std::nullopt, false, Field::Bool, true },
 
+        { ConfigKeys::FixMGS2DepthOfField_Section, ConfigKeys::FixMGS2DepthOfField_Setting, ConfigKeys::FixMGS2DepthOfField_Help, ConfigKeys::FixMGS2DepthOfField_Tooltip,
+          std::nullopt, false, Field::Bool, true },
+
+        { ConfigKeys::MGS2DepthOfFieldBlurUvMultiplier_Section, ConfigKeys::MGS2DepthOfFieldBlurUvMultiplier_Setting, ConfigKeys::MGS2DepthOfFieldBlurUvMultiplier_Help, ConfigKeys::MGS2DepthOfFieldBlurUvMultiplier_Tooltip,
+          std::make_pair(ConfigKeys::FixMGS2DepthOfField_Section, ConfigKeys::FixMGS2DepthOfField_Setting), false, Field::Float, 0, 0, 0, "", {}, 6.0, 0.0, 20.0 },
+
         { ConfigKeys::RestoreDogtagNames_Section, ConfigKeys::RestoreDogtagNames_Setting, ConfigKeys::RestoreDogtagNames_Help, ConfigKeys::RestoreDogtagNames_Tooltip,
           std::nullopt, false, Field::Bool, true },
 

src/dllmain.cpp

@@ -501,14 +501,14 @@ static void InitializeSubsystems()
     INITIALIZE(MGS2_Kirari_Sun2Fix::ApplyFix());
     INITIALIZE(MGS2_RestoreDogtagViewer::Restore());
     INITIALIZE(MGS3FixCameraOffset::Activate());
+    INITIALIZE(g_DepthOfFieldFixes.Initialize());
 
 
 #if !defined(RELEASE_BUILD) //todo category
 
     INITIALIZE(CutscenePausing::Setup());
 
     //todo: Make ultrawide & 4:3 reposition HUD elements correctly instead of stretching them
-    //INITIALIZE(g_DepthOfFieldFixes.Initialize());
     //INITIALIZE(MGS2ColorFilterFix::Initialize());
     //INITIALIZE(GammaCorrection::Initialize());
     //INITIALIZE(MGS3FixHolster::Initialize());

src/features/custom_resolution_and_borderless.cpp

@@ -1030,19 +1030,14 @@ namespace CustomResolutionAndBorderless
                 spdlog::error("MGS 2: Codec Portraits: Pattern scan failed.");
             }
 
-            // MGS 2: Disable motion blur. 
-            uint8_t* MGS2_MotionBlurScanResult = Memory::PatternScanSilent(baseModule, "F3 48 ?? ?? ?? ?? 48 ?? ?? ?? 48 ?? ?? ?? F3 0F ?? ?? ?? ?? ?? ?? 0F ?? ??");
-            if (MGS2_MotionBlurScanResult)
+            if (fAspectRatio > fNativeAspect)
             {
-                spdlog::info("MGS 2: Motion Blur: Address is {:s}+{:X}", sExeName.c_str(), (uintptr_t)MGS2_MotionBlurScanResult - (uintptr_t)baseModule);
-
-                Memory::PatchBytes((uintptr_t)MGS2_MotionBlurScanResult, "\x48\x31\xDB\x90\x90\x90", 6);
-                spdlog::info("MGS 2: Motion Blur: Patched instruction.");
-            }
-            else if (!MGS2_MotionBlurScanResult)
-            {
-                spdlog::error("MGS 2: Motion Blur: Pattern scan failed.");
+                if (uint8_t* MGS2_MotionBlurScanResult = Memory::PatternScanSilent(baseModule, "F3 48 ?? ?? ?? ?? 48 ?? ?? ?? 48 ?? ?? ?? F3 0F ?? ?? ?? ?? ?? ?? 0F ?? ??"))
+                {
+                    Memory::PatchBytes((uintptr_t)MGS2_MotionBlurScanResult, "\x48\x31\xDB\x90\x90\x90", 6);
+                }
             }
+
         }
         else if (eGameType & MGS3 && bHUDFix || eGameType & MG && fAspectRatio != fNativeAspect)
         {