disable near focus in d12t3 during angle 2

Author: ShizCalev

README.md

@@ -54,10 +54,9 @@ This is a fix that adds custom resolutions, ultrawide support and much more to t
 - Option to force Real Time Clock based hostage Easter Egg.
 - Option to restore grenade cooking (having detonation timer start while the grenade is still held.)
 - Option to swap X/O (OK / CANCEL inputs) in Menus.
-- Option to swap thermal goggle color palettes in realtime (Substance/vanilla, red hot / Sons of Liberty, Splinter Cell Blacklist, black hot, white hot.)
+- Option to swap thermal goggle color palettes in realtime (Substance/vanilla, red hot / Sons of Liberty, Splinter Cell Blacklist, black hot, white hot.) [Examples](https://imgur.com/a/ThRpIbj)
 - Option to enable cut Metal Gear 2: Solid Snake Colonel sprites during some late-game Codec calls. [PR #234](https://github.com/ShizCalev/MGSHDFix/pull/234)
-- Option to restore original 2001 Sons of Liberty radar rotation.
-
+- Option to restore original 2001 Sons of Liberty radar rotation. [Example](https://imgur.com/a/QNDTgrO)
 - BP_Asset / Manifest file modloader support. [PR #251](https://github.com/ShizCalev/MGSHDFix/pull/251)
 
 
@@ -80,15 +79,16 @@ This is a fix that adds custom resolutions, ultrawide support and much more to t
 
 
 #### MGS2 Specific Bug Fixes:
-- Restores contrast / color filter post processing effects in numerous cutscenes, which have been broken/missing since the 2011 HD Collection.
+- Restores contrast / color filter post processing effects in numerous cutscenes, which have been broken/missing since the 2011 HD Collection. [Examples (SPOILER WARNING)](https://imgur.com/a/pJAc8H1)
 - Restore broken heat haze post processing effect on roof of Strut A.
 - Restore underwater UI swimming post processing effect. [PR #245](https://github.com/ShizCalev/MGSHDFix/pull/245)
 - Restores numerous particle and visual effects to proper PS2 timing, fixing effects that ran at double speed and ended too early in the HD Collection and Master Collection versions.
 - Restores dogtag viewer information.
 - Restores color swapping Red / Blue "2" on the title screen after game completions. (Requires MGS2 Community Bugfix Compilation)
+- Fixes in-game timer not pausing during loading times. (This was a HD Collection regression. IGT behavior now matches with Substance.)
 - Fixes Depth of Field / blur post processing effects not scaling with resolution. [PR #248](https://github.com/ShizCalev/MGSHDFix/pull/248)
 - Fixes shadow resolution not scaling with game resolution. (It was hard-coded to 256x256 / PS2 resolution.)
-- Fixes incorrectly positioning "Metal Gear Solid 2" title card during the start of Tanker when playing in Letterbox mode.
+- Fixes incorrectly positioning "Metal Gear Solid 2" title card during the start of Tanker when playing in Letterbox mode. [Example](https://imgur.com/a/bGkGwJ9)
 - Fixes crashes, audio desync, timer delays, and broken loading zones bugs caused by alt-tabbing the game. (For speedrunners who utilize this bug to skip forced codec calls, this bugfix can be forced off in the ini.)
 - Fixes the Steam Cloud related ["DAMAGED SAVE" / "CORRUPT SAVE"](https://www.pcgamingwiki.com/wiki/Metal_Gear_Solid_2:_Sons_of_Liberty_-_Master_Collection_Version#Save_File_Appears_as_DAMAGED_FILE) issue. 
 - Fixes bug where your character would stop aiming their gun while holding L1 when you fully tilt your joystick.

src/fixes/depth_of_field.cpp

@@ -3,7 +3,11 @@
 
 #include "common.hpp"
 #include "custom_resolution_and_borderless.hpp"
+#include "gamevars.hpp"
 #include "helper.hpp"
+#ifndef RELEASE_BUILD
+#include "input_handler.hpp"
+#endif 
 #include "logging.hpp"
 
 namespace
@@ -40,6 +44,11 @@ namespace
     using DmapackRenderCallbackFn = void(__fastcall*)(void*);
     using SetDepthFuncFn = void(__fastcall*)(void*, uint64_t);
 
+    bool bCutsceneNeedsSpecialHandling = false; //for per-cutscene effect skip handling.
+    bool bIsD12T3 = false;
+    int iNearEffectCount = 0;
+
+
     struct FocusSourcePacket
     {
         int maxPlane;
@@ -611,6 +620,18 @@ namespace
         {
             return false;
         }
+    //    if (bCutsceneNeedsSpecialHandling)
+        {
+            if (bIsD12T3)
+            {
+                iNearEffectCount++;
+                if (iNearEffectCount >= 80 && iNearEffectCount < 440)
+                {
+                    spdlog::info("MGS 2: Depth of Field: skipping near focus packet {:d} for cutscene special handling.", iNearEffectCount);
+                    return false;
+                }
+            }
+        }
 
         if (!PrepareFocusSource(source))
         {
@@ -956,6 +977,16 @@ namespace
     }
 }
 
+void DepthOfFieldFixes::HandleLevelTransition()
+{
+    if (!bEnabled)
+    {
+        return;
+    }
+    iNearEffectCount = 0;
+    bIsD12T3 = g_GameVars.IsStage(MGS2Stages::D12T3);
+}
+
 void DepthOfFieldFixes::Initialize()
 {
     if (!(eGameType & MGS2))
@@ -971,6 +1002,7 @@ void DepthOfFieldFixes::Initialize()
 
     if (IsUltrawide())
     {
+        bEnabled = false;
         spdlog::info("MGS 2: Depth of Field: disabled for ultrawide aspect ratio.");
         return;
     }
@@ -991,4 +1023,20 @@ void DepthOfFieldFixes::Initialize()
         spdlog::warn("MGS 2: Depth of Field: failed to resolve necessary functions for near focus fixes; near focus adjustments disabled.");
     }
     InstallBlurUvScaleHook();
+
+#ifndef RELEASE_BUILD
+    g_InputHandler.RegisterHotkey(VK_ADD, "print", []
+                                  {
+                                      spdlog::info("iNearEffectCount = {}, bIsD12T3 = {}", iNearEffectCount, bIsD12T3);
+                                  });
+
+    /*
+    MAKE_HOOK_MID(baseModule, "48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC ?? 41 8B F9 41 8B F0 45 33 C9 8B EA 44 8B F1 BA ?? ?? ?? ?? 41 B8 ?? ?? ?? ?? 41 8D 49 ?? E8 A4 1C B2 FF", "NewNearFocusEffect -> Focal Points", {
+    spdlog::info("ctx.r8 = {}, ctx.r9 = {}", ctx.r8, ctx.r9);
+    ctx.r9 = 0;
+    ctx.r8 = 4000;
+    //r8 = var_near
+    //r9 = var_far
+    })*/
+#endif
 }

src/fixes/depth_of_field.hpp

@@ -7,6 +7,7 @@ class DepthOfFieldFixes final
     float fBlurUvMultiplier = 3.0f;
 
     void Initialize();
+    void HandleLevelTransition();
 };
 
 inline DepthOfFieldFixes g_DepthOfFieldFixes;

src/resources/gamevars.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "common.hpp"
 #include "gamevars.hpp"
+
+#include "depth_of_field.hpp"
 #include "effect_speeds.hpp"
 #include "game_funcs.hpp"
 #include "keep_aiming_after_firing.hpp"
@@ -188,6 +190,7 @@ void GameVars::OnLevelTransition()
         MGS2_First_Person_View::HandleLevelTransition();
         MGS2_ThirdPersonFreecam::HandleLevelTransition();
         MGS2Sunglasses::CheckOnTransition();
+        g_DepthOfFieldFixes.HandleLevelTransition();
     }
 }