From ddd0cc1d39fc95567bba28cea8caa6c393d3f745c586f5952a007218a536c217 Mon Sep 17 00:00:00 2001
From: copecone <controld3785@gmail.com>
Date: Thu, 28 May 2026 14:27:02 +0900
Subject: [PATCH] Improve Code Consistency Between `RenderMod` and
 `RenderManager`

---
 Component/FirstUpdateHook.cs                |   5 +-
 Component/PostRenderHook.cs                 |   5 +-
 Component/RenderManager.cs                  | 192 ++++++++++++++++---
 Patch/ClassPatch/EndscreenLanternsPatch.cs  |   3 +-
 Patch/ClassPatch/PersistencePatch.cs        |   3 +-
 Patch/ClassPatch/scnEditorPatch.cs          |   3 +-
 Patch/ClassPatch/scrControllerPatch.cs      |  12 +-
 Patch/ClassPatch/scrMistakesManagerPatch.cs |   3 +-
 Patch/ClassPatch/scrPlayerManagerPatch.cs   |   2 +-
 Patch/ClassPatch/scrShowIfDebugPatch.cs     |   2 +-
 Patch/ClassPatch/scrUIControllerPatch.cs    |   3 +-
 Patch/RenderEnvironmentPatches.cs           |  37 ++--
 Patch/ShowHitTextPatch.cs                   |   2 +-
 RenderMod.cs                                | 199 +-------------------
 UI/DebugMonitorUI.cs                        |  10 +-
 UI/EscapeHandlerUI.cs                       |   2 +-
 UI/RenderButton.cs                          |   2 +-
 Util/FrameReader.cs                         |   9 +-
 18 files changed, 225 insertions(+), 269 deletions(-)

diff --git a/Component/FirstUpdateHook.cs b/Component/FirstUpdateHook.cs
index 3fc11a4..37b9188 100644
--- a/Component/FirstUpdateHook.cs
+++ b/Component/FirstUpdateHook.cs
@@ -7,7 +7,10 @@ namespace ADOFAIRenderer.Component
     {
         private void Update()
         {
-            RenderMod.OnFirstUpdate();
+            if (RenderManager.Instance)
+            {
+                RenderManager.Instance.OnPreRenderUpdate();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Component/PostRenderHook.cs b/Component/PostRenderHook.cs
index b13aac9..6e15d8a 100644
--- a/Component/PostRenderHook.cs
+++ b/Component/PostRenderHook.cs
@@ -17,7 +17,10 @@ namespace ADOFAIRenderer.Component
         private void LateUpdate()
         {
             var val = (MeshRenderer)_camQuadMeshField!.GetValue(scrCamera.instance);
-            RenderMod.OnPostRender(val.material.mainTexture as RenderTexture);
+            if (RenderManager.Instance)
+            {
+                RenderManager.Instance.OnPostRender(val.material.mainTexture as RenderTexture);
+            }
         }
     }
 }
diff --git a/Component/RenderManager.cs b/Component/RenderManager.cs
index fa00389..7b54701 100644
--- a/Component/RenderManager.cs
+++ b/Component/RenderManager.cs
@@ -17,8 +17,10 @@ namespace ADOFAIRenderer.Component
     {
         // Singleton Accessors
         public static RenderManager Instance { get; private set; } = null!;
+        public static bool IsActive => Instance && Instance.isRendering;
+        public static bool IsCapturingActive => Instance && Instance.isCapturing;
 
-        // Core Render Configuration and Path (OOP Instance Fields)
+        // Core Render Configuration and Path
         public int countdown;
         public long frameCount;
         public bool skipPressToStart;
@@ -26,6 +28,25 @@ namespace ADOFAIRenderer.Component
         public bool isRenderCancelled;
         public RenderSettings Configuration;
 
+        // Render Sessions State (OOP Instance Fields)
+        public bool isRendering;
+        public bool isCapturing;
+        public double timeBase;
+        public double unscaledTimeBase;
+        public double dspTimeBase;
+        public int frameCountBase;
+
+        private FrameReader? _frameReader;
+        public bool renderCheck = true;
+        public int skipCount;
+
+        public long frameCountForVideo;
+        public long lastVideoFrameIndex = -1;
+        public long lastRequestedVideoFrameIndex = -1;
+        public int readbackFailureCount;
+        public int throttleCount;
+        public bool isThrottling;
+
         public struct RenderSettings
         {
             public double TargetFPS;
@@ -54,7 +75,7 @@ namespace ADOFAIRenderer.Component
             }
         }
 
-        // Thread and Queue State (OOP Instance Fields)
+        // Thread and Queue State
         public SortedList<long, byte[]> ImageQueue = new SortedList<long, byte[]>();
         public Thread? RenderThread;
         public long passCount;
@@ -100,12 +121,12 @@ namespace ADOFAIRenderer.Component
                     scrController.instance.noFailInfiniteMargin = true;
                 }
 
-                RenderMod.TimeBase = Time.timeAsDouble;
-                RenderMod.UnscaledTimeBase = Time.unscaledTimeAsDouble;
-                RenderMod.DspTimeBase = AudioSettings.dspTime;
-                RenderMod.FrameCountBase = Time.frameCount;
+                timeBase = Time.timeAsDouble;
+                unscaledTimeBase = Time.unscaledTimeAsDouble;
+                dspTimeBase = AudioSettings.dspTime;
+                frameCountBase = Time.frameCount;
 
-                RenderMod.IsRendering = true;
+                isRendering = true;
                 countdown = 3; 
                 wonFrame = -1;
 
@@ -120,10 +141,10 @@ namespace ADOFAIRenderer.Component
                 scrController.instance!.StartCoroutine(SetupPlay());
             }
 
-            if (!RenderMod.IsRendering) return;
+            if (!isRendering) return;
             if (!scrController.instance || scrController.instance.state == States.Fail || scrController.instance.state == States.Fail2)
             {
-                RenderMod.IsRendering = RenderMod.IsCapturing = false;
+                isRendering = isCapturing = false;
                 StopFFmpeg(false);
                 EndRender();
             }
@@ -137,11 +158,131 @@ namespace ADOFAIRenderer.Component
                 var extraFrames = (long)Math.Ceiling(Configuration.EndWaitTime * Configuration.TargetFPS);
                 
                 if (frameCount - wonFrame < extraFrames) return;
-                RenderMod.IsRendering = RenderMod.IsCapturing = false;
+                isRendering = isCapturing = false;
                 StopFFmpeg(true);
             }
         }
 
+        public void OnPreRenderUpdate()
+        {
+            if (!isRendering) return;
+
+            // [렉으로 인한 프레임 렌더링 스킵 시 재시도 로직 (원본 모드 이식)]
+            if (renderCheck && isCapturing)
+            {
+                if (skipCount < 60)
+                {
+                    Melon<RenderMod>.Logger.Warning($"[Render Skipped] Frame {frameCount} rendering missed. Retrying... (Attempt {skipCount + 1}/60)");
+                    skipCount++;
+                    Time.timeScale = 0f; // 진행 시간 멈추기 (재시도)
+                    return; // 업데이트 진행하지 않고 대기
+                }
+
+                // 60회 초과 시 최후의 블랙 프레임 삽입하여 전체 파이프라인 마비 방지
+                Melon<RenderMod>.Logger.Error($"[Render Skipped] Frame {frameCount} rendering failed after 60 retries. Supplying black frame.");
+                
+                var currentFrame = frameCountForVideo++;
+                var targetFps = Configuration.TargetFPS;
+                var videoFps = Configuration.VideoFPS;
+                var effectiveVideoFps = Math.Min(videoFps, targetFps);
+                var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
+
+                if (videoFrameIndex > lastVideoFrameIndex)
+                {
+                    lastVideoFrameIndex = videoFrameIndex;
+                    lastRequestedVideoFrameIndex = videoFrameIndex;
+
+                    var byteSize = Configuration.RenderWidth * Configuration.RenderHeight * 4;
+                    var blackFrame = System.Buffers.ArrayPool<byte>.Shared.Rent(byteSize);
+                    Array.Clear(blackFrame, 0, byteSize);
+                    
+                    lock (ImageQueue)
+                    {
+                        ImageQueue[videoFrameIndex] = blackFrame;
+                    }
+                }
+                
+                renderCheck = false; // 진행 허용
+            }
+
+            skipCount = 0;
+            renderCheck = true; // 다음 프레임 검사용으로 초기화
+            frameCount++;
+        }
+
+        // ReSharper disable once Unity.IncorrectMethodSignature
+        public void OnPostRender(RenderTexture? texture)
+        {
+            if (!isCapturing || !texture) return;
+
+            renderCheck = false; // 이번 프레임 정상 렌더링 완료
+
+            // [Backpressure Throttling (2번 작업)]
+            const int maxQueuedFrames = 60;
+            isThrottling = false;
+            
+            while (isCapturing && isRendering)
+            {
+                int count;
+                lock (ImageQueue)
+                {
+                    count = ImageQueue.Count;
+                }
+
+                if (count <= maxQueuedFrames) break;
+
+                if (!isThrottling)
+                {
+                    isThrottling = true;
+                    throttleCount++;
+                }
+                Thread.Sleep(1);
+            }
+            isThrottling = false;
+
+            var currentFrame = frameCountForVideo++;
+            
+            var targetFps = Configuration.TargetFPS;
+            var videoFps = Configuration.VideoFPS;
+            var effectiveVideoFps = Math.Min(videoFps, targetFps);
+            
+            var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
+
+            if (videoFrameIndex > lastVideoFrameIndex)
+            {
+                lastVideoFrameIndex = videoFrameIndex;
+                lastRequestedVideoFrameIndex = videoFrameIndex;
+                _frameReader?.RequestFrameCapture(texture, videoFrameIndex);
+            }
+        }
+
+        public static void StartRender()
+        {
+            var targetMethod = typeof(scnEditor).GetMethod("TryApplicationQuit",
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
+
+            if (targetMethod == null || scnEditor.instance == null) return;
+            if (ADOBase.levelPath.IsNullOrEmpty())
+            {
+                scnEditor.instance.TryQuitToMenu();
+                return;
+            }
+            
+            if (Instance != null)
+            {
+                Instance.levelPath = ADOBase.levelPath;
+            }
+            
+            scnEditor.instance.CheckUnsavedChanges(() =>
+            {
+                var quitDelegate =
+                    (Func<bool>)Delegate.CreateDelegate(typeof(Func<bool>), scnEditor.instance, targetMethod);
+                
+                Application.wantsToQuit -= quitDelegate;
+                ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "Assets/Scenes/RenderSettingsScene.unity");
+            });
+        }
+
         public void SetupCaptureDirectory()
         {
             var renderDir = Path.Combine(MelonEnvironment.GameRootDirectory, "Render");
@@ -173,11 +314,11 @@ namespace ADOFAIRenderer.Component
             
             frameCount = 0;
             
-            RenderMod.FrameReader?.Dispose();
-            RenderMod.FrameReader = new FrameReader();
+            _frameReader?.Dispose();
+            _frameReader = new FrameReader();
             StartFFmpegThread();
 
-            RenderMod.IsCapturing = true;
+            isCapturing = true;
             scrController.instance.paused = scrController.instance.audioPaused = false;
             scrController.instance.levelWasSkipped = true;
 
@@ -226,12 +367,11 @@ namespace ADOFAIRenderer.Component
             }
             passCount = 0;
             isRenderCancelled = false;
-            RenderMod.IsRenderCancelled = false;
-            RenderMod.FrameCountForVideo = 0;
-            RenderMod.LastVideoFrameIndex = -1;
-            RenderMod.LastRequestedVideoFrameIndex = -1;
-            RenderMod.RenderCheck = true;
-            RenderMod.SkipCount = 0;
+            frameCountForVideo = 0;
+            lastVideoFrameIndex = -1;
+            lastRequestedVideoFrameIndex = -1;
+            renderCheck = true;
+            skipCount = 0;
             endRequested = false;
             endSuccessful = false;
 
@@ -280,7 +420,7 @@ namespace ADOFAIRenderer.Component
                             {
                                 var firstKey = ImageQueue.Keys[0];
                                 
-                                if (firstKey > passCount && !RenderMod.IsCapturing)
+                                if (firstKey > passCount && !isCapturing)
                                 {
                                     passCount = firstKey;
                                 }
@@ -305,14 +445,14 @@ namespace ADOFAIRenderer.Component
                             continue;
                         }
 
-                        if (isRenderCancelled || RenderMod.IsRenderCancelled)
+                        if (isRenderCancelled)
                         {
                             break;
                         }
 
                         if (endRequested)
                         {
-                            if (passCount > RenderMod.LastRequestedVideoFrameIndex)
+                            if (passCount > lastRequestedVideoFrameIndex)
                             {
                                 break;
                             }
@@ -335,9 +475,8 @@ namespace ADOFAIRenderer.Component
 
         public void CancelRender()
         {
-            RenderMod.IsRendering = RenderMod.IsCapturing = false;
+            isRendering = isCapturing = false;
             isRenderCancelled = true;
-            RenderMod.IsRenderCancelled = true;
             
             StopFFmpeg(false);
             EndRender();
@@ -349,7 +488,6 @@ namespace ADOFAIRenderer.Component
             if (!success)
             {
                 isRenderCancelled = true;
-                RenderMod.IsRenderCancelled = true;
             }
             skipPressToStart = false;
             _renderSetup = false;
@@ -379,7 +517,7 @@ namespace ADOFAIRenderer.Component
                     ImageQueue.Clear();
                 }
                 
-                RenderMod.FrameReader?.Dispose();
+                _frameReader?.Dispose();
 
                 // 디버그 모니터 UI 정리
                 if (_debugMonitorObj)
@@ -450,7 +588,7 @@ namespace ADOFAIRenderer.Component
             GCS.customLevelPaths = null;
             GCS.customLevelId = null;
             
-            RenderMod.FrameReader?.Dispose();
+            _frameReader?.Dispose();
             ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "scnEditor");
         }
     }
diff --git a/Patch/ClassPatch/EndscreenLanternsPatch.cs b/Patch/ClassPatch/EndscreenLanternsPatch.cs
index d8a286b..2e463d6 100644
--- a/Patch/ClassPatch/EndscreenLanternsPatch.cs
+++ b/Patch/ClassPatch/EndscreenLanternsPatch.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using ADOFAIRenderer.Component;
 using HarmonyLib;
 
 namespace ADOFAIRenderer.Patch.ClassPatch
@@ -12,7 +13,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         public static bool PrefixShow(EndscreenLanterns __instance, ref int __result)
         {
-            if (!RenderMod.IsRendering) return true;
+            if (!RenderManager.IsActive) return true;
             if (__instance != null)
             {
                 __instance.Hide();
diff --git a/Patch/ClassPatch/PersistencePatch.cs b/Patch/ClassPatch/PersistencePatch.cs
index 3fca96c..c6062d6 100644
--- a/Patch/ClassPatch/PersistencePatch.cs
+++ b/Patch/ClassPatch/PersistencePatch.cs
@@ -1,3 +1,4 @@
+using ADOFAIRenderer.Component;
 using HarmonyLib;
 
 namespace ADOFAIRenderer.Patch.ClassPatch
@@ -8,7 +9,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         // ReSharper disable once InconsistentNaming
         public static void Postfix(ref SkipIntroBehavior __result)
         {
-            if (RenderMod.IsRendering && 
+            if (RenderManager.IsActive && 
                 scrConductor.instance != null && 
                 !scrConductor.instance.hasSongStarted)
             {
diff --git a/Patch/ClassPatch/scnEditorPatch.cs b/Patch/ClassPatch/scnEditorPatch.cs
index 7924506..e331043 100644
--- a/Patch/ClassPatch/scnEditorPatch.cs
+++ b/Patch/ClassPatch/scnEditorPatch.cs
@@ -1,3 +1,4 @@
+using ADOFAIRenderer.Component;
 using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
@@ -22,7 +23,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
             var button = buttonObj.GetComponent<Button>()!;
             // Clear persistent and non-persistent listeners from the original button
             button.onClick = new Button.ButtonClickedEvent();
-            button.onClick.AddListener(RenderMod.StartRender);
+            button.onClick.AddListener(RenderManager.StartRender);
             
             // The button root has an Image component for the background (rounded box).
             // We want to change the icon sprite, which is on a child GameObject.
diff --git a/Patch/ClassPatch/scrControllerPatch.cs b/Patch/ClassPatch/scrControllerPatch.cs
index 3d22a48..3648946 100644
--- a/Patch/ClassPatch/scrControllerPatch.cs
+++ b/Patch/ClassPatch/scrControllerPatch.cs
@@ -1,5 +1,5 @@
+using ADOFAIRenderer.Component;
 using HarmonyLib;
-using MelonLoader;
 
 namespace ADOFAIRenderer.Patch.ClassPatch
 {
@@ -11,35 +11,35 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         [HarmonyPatch("TogglePauseGame")]
         public static bool PreventPause()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
 
         [HarmonyPrefix]
         [HarmonyPatch("PortalTravelAction")]
         public static bool PreventPortalTravel()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
 
         [HarmonyPrefix]
         [HarmonyPatch("FailAction")]
         public static bool PreventFailAction()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
 
         [HarmonyPrefix]
         [HarmonyPatch("Fail2Action")]
         public static bool PreventFail2Action()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
 
         [HarmonyPrefix]
         [HarmonyPatch("OnPlayerDied")]
         public static bool PreventPlayerDied()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
     }
 }
\ No newline at end of file
diff --git a/Patch/ClassPatch/scrMistakesManagerPatch.cs b/Patch/ClassPatch/scrMistakesManagerPatch.cs
index c55bbaa..59c5ca8 100644
--- a/Patch/ClassPatch/scrMistakesManagerPatch.cs
+++ b/Patch/ClassPatch/scrMistakesManagerPatch.cs
@@ -1,3 +1,4 @@
+using ADOFAIRenderer.Component;
 using HarmonyLib;
 
 namespace ADOFAIRenderer.Patch.ClassPatch
@@ -10,7 +11,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         [HarmonyPatch("SaveCustom")]
         public static bool PreventSaveCustom()
         {
-            return !RenderMod.IsRendering;
+            return !RenderManager.IsActive;
         }
     }
 }
diff --git a/Patch/ClassPatch/scrPlayerManagerPatch.cs b/Patch/ClassPatch/scrPlayerManagerPatch.cs
index 6eaba79..6980948 100644
--- a/Patch/ClassPatch/scrPlayerManagerPatch.cs
+++ b/Patch/ClassPatch/scrPlayerManagerPatch.cs
@@ -12,7 +12,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         // ReSharper disable once InconsistentNaming
         private static bool IgnoreInput(ref bool __result)
         {
-            if (!RenderMod.IsRendering) return true;
+            if (!RenderManager.IsActive) return true;
 
             __result = RenderManager.Instance && RenderManager.Instance.frameCount == 0 && RenderManager.Instance.countdown == 0;
             return false;
diff --git a/Patch/ClassPatch/scrShowIfDebugPatch.cs b/Patch/ClassPatch/scrShowIfDebugPatch.cs
index 9916f7a..ea9e15f 100644
--- a/Patch/ClassPatch/scrShowIfDebugPatch.cs
+++ b/Patch/ClassPatch/scrShowIfDebugPatch.cs
@@ -15,7 +15,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         private static void IgnoreInput(Text ___txt, Color ___defaultColor)
         {
-            if (!RenderMod.IsRendering) return;
+            if (!RenderManager.IsActive) return;
 
             ___txt.text = "Render";
             if (RenderManager.Instance)
diff --git a/Patch/ClassPatch/scrUIControllerPatch.cs b/Patch/ClassPatch/scrUIControllerPatch.cs
index 8e17fb9..54de3c3 100644
--- a/Patch/ClassPatch/scrUIControllerPatch.cs
+++ b/Patch/ClassPatch/scrUIControllerPatch.cs
@@ -1,3 +1,4 @@
+using ADOFAIRenderer.Component;
 using HarmonyLib;
 
 namespace ADOFAIRenderer.Patch.ClassPatch
@@ -11,7 +12,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
         // ReSharper disable once InconsistentNaming
         public static void PreventEndscreenLanternsPostfix(scrUIController __instance)
         {
-            if (RenderMod.IsRendering && __instance != null)
+            if (RenderManager.IsActive && __instance != null)
             {
                 __instance.HideEndscreenLanterns();
             }
diff --git a/Patch/RenderEnvironmentPatches.cs b/Patch/RenderEnvironmentPatches.cs
index 0664485..c185d24 100644
--- a/Patch/RenderEnvironmentPatches.cs
+++ b/Patch/RenderEnvironmentPatches.cs
@@ -15,8 +15,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref float __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase);
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.timeBase);
                 return false;
             }
         }
@@ -27,8 +27,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref double __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase;
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.timeBase;
                 return false;
             }
         }
@@ -39,8 +39,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref float __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase);
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.unscaledTimeBase);
                 return false;
             }
         }
@@ -51,8 +51,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref double __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase;
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.unscaledTimeBase;
                 return false;
             }
         }
@@ -63,10 +63,9 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref double __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.DspTimeBase;
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.dspTimeBase;
                 return false;
-
             }
         }
         
@@ -76,7 +75,7 @@ namespace ADOFAIRenderer.Patch
             // ReSharper disable once InconsistentNaming
             public static bool Prefix(AudioSource __instance, double time)
             {
-                return !RenderMod.IsRendering || !RenderPatch;
+                return !RenderManager.IsActive || !RenderPatch;
             }
         }
 
@@ -86,8 +85,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref int __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = (int)(RenderManager.Instance.frameCount + RenderMod.FrameCountBase);
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
+                __result = (int)(RenderManager.Instance.frameCount + RenderManager.Instance.frameCountBase);
                 return false;
             }
         }
@@ -98,8 +97,8 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref float __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
-                __result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
+                if (RenderManager.Instance && (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance)) return true;
+                __result = (float)(1 / RenderManager.Instance!.Configuration.TargetFPS);
                 return false;
             }
         }
@@ -110,7 +109,7 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref float __result)
             {
-                if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
+                if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
                 __result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
                 return false;
             }
@@ -122,7 +121,7 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref int __result)
             {
-                if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
+                if (!RenderManager.IsActive || !RenderPatch || !RenderManager.Instance) return true;
                 __result = RenderManager.Instance.Configuration.RenderWidth;
                 return false;
             }
@@ -134,7 +133,7 @@ namespace ADOFAIRenderer.Patch
             [SuppressMessage("ReSharper", "InconsistentNaming")]
             public static bool Prefix(ref int __result)
             {
-                if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
+                if (!RenderManager.IsActive || !RenderPatch || !RenderManager.Instance) return true;
                 __result = RenderManager.Instance.Configuration.RenderHeight;
                 return false;
             }
diff --git a/Patch/ShowHitTextPatch.cs b/Patch/ShowHitTextPatch.cs
index 46f2859..68ee370 100644
--- a/Patch/ShowHitTextPatch.cs
+++ b/Patch/ShowHitTextPatch.cs
@@ -8,7 +8,7 @@ namespace ADOFAIRenderer.Patch
     {
         public static bool Prefix()
         {
-            return !RenderMod.IsRendering || (RenderManager.Instance && RenderManager.Instance.Configuration.ShowHitText);
+            return !RenderManager.IsActive || RenderManager.Instance is { Configuration: { ShowHitText: true } };
         }
     }
 }
\ No newline at end of file
diff --git a/RenderMod.cs b/RenderMod.cs
index dc16404..14760bd 100644
--- a/RenderMod.cs
+++ b/RenderMod.cs
@@ -1,52 +1,27 @@
-using System;
-using System.Reflection;
 using ADOFAIRenderer;
 using ADOFAIRenderer.Component;
 using ADOFAIRenderer.Util;
 using MelonLoader;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using Object = UnityEngine.Object;
 
 [assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.0.5-BETA", "ADOFAI Editor Forum")]
 [assembly: MelonGame("7th Beat Games", "A Dance of Fire and Ice")]
 
 namespace ADOFAIRenderer
 {
-
     public class RenderMod : MelonMod
     {
-        static RenderMod()
-        {
-            ThrottleCount = 0;
-        }
-
         public static AssetBundle FontBundle = null!;
-        // ReSharper disable once MemberCanBePrivate.Global
         public static AssetBundle SceneBundle = null!;
         public static string[] ModScenes = {};
 
-        private static double _beforeTime;
-
-        public static bool IsRendering = false;
-        public static bool IsCapturing = false;
-
-        public static double TimeBase;
-        public static double UnscaledTimeBase;
-        public static double DspTimeBase;
-        public static int FrameCountBase;
-
-        public static FrameReader? FrameReader;
-
-        public static bool RenderCheck = true;
-        public static int SkipCount;
-
         public override void OnInitializeMelon()
         {
             var renderManagerObj = new GameObject("Render Manager");
             var updateHookerObj = new GameObject("Update Hooker");
-            Object.DontDestroyOnLoad( renderManagerObj );
-            Object.DontDestroyOnLoad( updateHookerObj );
+            UnityEngine.Object.DontDestroyOnLoad(renderManagerObj);
+            UnityEngine.Object.DontDestroyOnLoad(updateHookerObj);
             
             renderManagerObj.AddComponent<RenderManager>();
             updateHookerObj.AddComponent<FirstUpdateHook>();
@@ -71,175 +46,5 @@ namespace ADOFAIRenderer
             var newModule = EventSystem.current.gameObject.AddComponent<StandaloneInputModule>();
             newModule.enabled = true;
         }
-
-        public static void OnFirstUpdate()
-        {
-            if (_beforeTime == 0) _beforeTime = Time.realtimeSinceStartupAsDouble;
-            
-            var realDeltaTime = Time.realtimeSinceStartupAsDouble - _beforeTime;
-            _beforeTime = Time.realtimeSinceStartupAsDouble;
-            
-            if (!IsRendering) return;
-
-            // [렉으로 인한 프레임 렌더링 스킵 시 재시도 로직 (원본 모드 이식)]
-            if (RenderCheck && IsCapturing)
-            {
-                if (SkipCount < 60)
-                {
-                    Melon<RenderMod>.Logger.Warning($"[Render Skipped] Frame {RenderManager.Instance.frameCount} rendering missed. Retrying... (Attempt {SkipCount + 1}/60)");
-                    SkipCount++;
-                    Time.timeScale = 0f; // 진행 시간 멈추기 (재시도)
-                    return; // 업데이트 진행하지 않고 대기
-                }
-
-                // 60회 초과 시 최후의 블랙 프레임 삽입하여 전체 파이프라인 마비 방지
-                Melon<RenderMod>.Logger.Error($"[Render Skipped] Frame {RenderManager.Instance.frameCount} rendering failed after 60 retries. Supplying black frame.");
-                
-                var currentFrame = FrameCountForVideo++;
-                var targetFps = RenderManager.Instance.Configuration.TargetFPS;
-                var videoFps = RenderManager.Instance.Configuration.VideoFPS;
-                var effectiveVideoFps = Math.Min(videoFps, targetFps);
-                var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
-
-                if (videoFrameIndex > LastVideoFrameIndex)
-                {
-                    LastVideoFrameIndex = videoFrameIndex;
-                    LastRequestedVideoFrameIndex = videoFrameIndex;
-
-                    var byteSize = RenderManager.Instance.Configuration.RenderWidth * RenderManager.Instance.Configuration.RenderHeight * 4;
-                    var blackFrame = System.Buffers.ArrayPool<byte>.Shared.Rent(byteSize);
-                    Array.Clear(blackFrame, 0, byteSize);
-                    
-                    lock (RenderManager.Instance.ImageQueue)
-                    {
-                        RenderManager.Instance.ImageQueue[videoFrameIndex] = blackFrame;
-                    }
-                }
-                
-                RenderCheck = false; // 진행 허용
-            }
-
-            SkipCount = 0;
-            RenderCheck = true; // 다음 프레임 검사용으로 초기화
-            RenderManager.Instance.frameCount++;
-
-            if (realDeltaTime > 0)
-            {
-                // Time.timeScale = (float)(1 / RenderManager.Configuration.TargetFPS / realDeltaTime);
-            }
-        }
-
-        public static long FrameCountForVideo;
-        public static long LastVideoFrameIndex = -1;
-        public static long LastRequestedVideoFrameIndex = -1;
-        public static bool IsRenderCancelled = false;
-        public static int ReadbackFailureCount;
-        public static int ThrottleCount;
-        public static bool IsThrottling;
-
-        public static void OnPostRender(RenderTexture? texture)
-        {
-            if (!IsCapturing || !texture) return;
-
-            RenderCheck = false; // 이번 프레임 정상 렌더링 완료
-
-            // [Backpressure Throttling (2번 작업)]
-            const int maxQueuedFrames = 60;
-            IsThrottling = false;
-            
-            while (IsCapturing && IsRendering)
-            {
-                int count;
-                lock (RenderManager.Instance.ImageQueue)
-                {
-                    count = RenderManager.Instance.ImageQueue.Count;
-                }
-
-                if (count <= maxQueuedFrames) break;
-
-                if (!IsThrottling)
-                {
-                    IsThrottling = true;
-                    ThrottleCount++;
-                }
-                System.Threading.Thread.Sleep(1);
-            }
-            IsThrottling = false;
-
-            var currentFrame = FrameCountForVideo++;
-            
-            var targetFps = RenderManager.Instance.Configuration.TargetFPS;
-            var videoFps = RenderManager.Instance.Configuration.VideoFPS;
-            var effectiveVideoFps = Math.Min(videoFps, targetFps);
-            
-            var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
-
-            if (videoFrameIndex > LastVideoFrameIndex)
-            {
-                LastVideoFrameIndex = videoFrameIndex;
-                LastRequestedVideoFrameIndex = videoFrameIndex;
-                FrameReader?.RequestFrameCapture(texture, videoFrameIndex);
-            }
-
-            /*
-            AsyncGPUReadback.Request(texture, 0, delegate(AsyncGPUReadbackRequest req)
-            {
-                if (!IsCapturing) return;
-
-                byte[] rawBytes;
-                if (req.hasError)
-                {
-                    ReadbackFailureCount++;
-                    Melon<RenderMod>.Logger.Warning($"[OOM Prevent] GPU Readback failed for frame {currentFrame}. Queue deadlock prevented by sending an empty frame.");
-                    rawBytes = Array.Empty<byte>(); // 1번 작업: 빈 배열로 대체하여 정체 방지
-                }
-                else
-                {
-                    try
-                    {
-                        var data = req.GetData<byte>();
-                        rawBytes = FFmpegProcess.RentRawBytes(data); // 3번 작업: ArrayPool에서 대여
-                    }
-                    catch (Exception ex)
-                    {
-                        ReadbackFailureCount++;
-                        Melon<RenderMod>.Logger.Error($"[OOM Prevent] Native conversion failed for frame {currentFrame}: {ex}");
-                        rawBytes = Array.Empty<byte>();
-                    }
-                }
-                
-                lock (RenderManager.ImageQueue)
-                {
-                    RenderManager.ImageQueue[currentFrame] = rawBytes;
-                }
-            });*/
-        }
-
-        public static void StartRender()
-        {
-            var targetMethod = typeof(scnEditor).GetMethod("TryApplicationQuit",
-                BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public);
-
-            if (targetMethod == null || scnEditor.instance == null) return;
-            if (ADOBase.levelPath.IsNullOrEmpty())
-            {
-                scnEditor.instance.TryQuitToMenu();
-                return;
-            }
-            
-            if (RenderManager.Instance)
-            {
-                RenderManager.Instance.levelPath = ADOBase.levelPath;
-            }
-            
-            scnEditor.instance.CheckUnsavedChanges(() =>
-            {
-                var quitDelegate =
-                    (Func<bool>)Delegate.CreateDelegate(typeof(Func<bool>), scnEditor.instance, targetMethod);
-                
-                Application.wantsToQuit -= quitDelegate;
-                ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "Assets/Scenes/RenderSettingsScene.unity");
-            });
-        }
     }
 }
\ No newline at end of file
diff --git a/UI/DebugMonitorUI.cs b/UI/DebugMonitorUI.cs
index 727b674..336445e 100644
--- a/UI/DebugMonitorUI.cs
+++ b/UI/DebugMonitorUI.cs
@@ -187,7 +187,7 @@ namespace ADOFAIRenderer.UI
             var sb = new StringBuilder();
             sb.AppendLine("<b><color=#00ccff>ADOFAI Renderer Realtime Monitor</color></b>");
             sb.AppendLine();
-            sb.AppendLine($"• Rendered Progress: <b>{(RenderManager.Instance ? RenderManager.Instance.frameCount : 0)}</b> frames");
+            sb.AppendLine($"• Rendered Progress: <b>{(RenderManager.Instance != null ? RenderManager.Instance.frameCount : 0)}</b> frames");
 
             var queueCount = 0;
             if (RenderManager.Instance)
@@ -199,13 +199,13 @@ namespace ADOFAIRenderer.UI
             }
             sb.AppendLine($"• Queued Buffers: <b>{queueCount}</b> / 60 frames");
 
-            sb.AppendLine(RenderMod.IsThrottling
+            sb.AppendLine((RenderManager.Instance && RenderManager.Instance.isThrottling)
                 ? "• Status: <b><color=yellow>THROTTLING (Safe Mode)</color></b>"
                 : "• Status: <b><color=green>NORMAL (Encoding)</color></b>");
             sb.AppendLine();
-            sb.AppendLine($"• Throttling Controls: {RenderMod.ThrottleCount} times");
-            sb.AppendLine($"• Readback Hard Failures: <color=#ff3333>{RenderMod.ReadbackFailureCount}</color> times");
-            sb.AppendLine($"• Render Skip-Retry: {RenderMod.SkipCount} / 60");
+            sb.AppendLine($"• Throttling Controls: {(RenderManager.Instance ? RenderManager.Instance.throttleCount : 0)} times");
+            sb.AppendLine($"• Readback Hard Failures: <color=#ff3333>{(RenderManager.Instance ? RenderManager.Instance.readbackFailureCount : 0)}</color> times");
+            sb.AppendLine($"• Render Skip-Retry: {(RenderManager.Instance ? RenderManager.Instance.skipCount : 0)} / 60");
 
             var memoryMb = GC.GetTotalMemory(false) / (1024.0 * 1024.0);
             sb.AppendLine($"• Mono Heap Memory: {memoryMb:F2} MB");
diff --git a/UI/EscapeHandlerUI.cs b/UI/EscapeHandlerUI.cs
index 2feef43..56f0bb0 100644
--- a/UI/EscapeHandlerUI.cs
+++ b/UI/EscapeHandlerUI.cs
@@ -75,7 +75,7 @@ namespace ADOFAIRenderer.UI
         private void Update()
         {
             // 렌더링이 더 이상 활성화되어 있지 않으면 자가 파괴
-            if (!RenderMod.IsRendering)
+            if (!RenderManager.IsActive)
             {
                 Destroy(gameObject);
                 return;
diff --git a/UI/RenderButton.cs b/UI/RenderButton.cs
index 3d1eb8b..1a02247 100644
--- a/UI/RenderButton.cs
+++ b/UI/RenderButton.cs
@@ -51,7 +51,7 @@ namespace ADOFAIRenderer.UI
         public void OnClick()
         {
             if (IsAnyFieldEmpty()) return;
-            if (RenderMod.IsRendering) return;
+            if (RenderManager.IsActive) return;
 
             if (!double.TryParse(targetFPSInput.text, out var targetFPS) || targetFPS <= 0)
             {
diff --git a/Util/FrameReader.cs b/Util/FrameReader.cs
index b4a094e..4a598ab 100644
--- a/Util/FrameReader.cs
+++ b/Util/FrameReader.cs
@@ -42,7 +42,7 @@ namespace ADOFAIRenderer.Util
 
         public void RequestFrameCapture(Texture texture, long currentFrame)
         {
-            if (!RenderMod.IsCapturing) return;
+            if (!RenderManager.IsCapturingActive) return;
             ReadbackRequestState state;
 
             lock (_poolLock)
@@ -74,7 +74,7 @@ namespace ADOFAIRenderer.Util
                 }
             }
 
-            if (RenderMod.IsRenderCancelled)
+            if (RenderManager.Instance && RenderManager.Instance.isRenderCancelled)
             {
                 RecycleState(state);
                 return;
@@ -82,7 +82,10 @@ namespace ADOFAIRenderer.Util
 
             if (request.hasError)
             {
-                RenderMod.ReadbackFailureCount++;
+                if (RenderManager.Instance)
+                {
+                    RenderManager.Instance.readbackFailureCount++;
+                }
                 Melon<RenderMod>.Logger.Warning($"[OOM Prevent] GPU Readback failed for frame {frame}. Queue deadlock prevented by sending a black frame.");
 
                 var byteSize = state.NativeBuffer.Length;