ADOFAIEditorForum/ADOFAIRenderer
SHA256
2
2 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Improve RenderManager Object Structure

Browse Source
This commit is contained in:
copecone committed 2026-05-28 13:12:42 +09:00
1 parent 0a798de45c
commit d4b9e4b89c
10 files changed
+130 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Component/RenderManager.cs
+52 -46
View File
@@ -9,23 +9,22 @@ using ADOFAIRenderer.Util.FFmpeg;
using MelonLoader; using MelonLoader;
using MelonLoader.Utils; using MelonLoader.Utils;
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization;
namespace ADOFAIRenderer.Component namespace ADOFAIRenderer.Component
{ {
public class RenderManager : MonoBehaviour public class RenderManager : MonoBehaviour
{ {
public static int Countdown; // Singleton Accessors
public static long FrameCount; public static RenderManager Instance { get; private set; } = null!;
public static bool SkipPressToStart;
public static string LevelPath = "";
public static RenderManager Instance = null!;
private static int _originalInputOffset;
private static GameObject? _debugMonitorObj;
private static GameObject? _escapeHandlerObj;
private static string? _currentOutPath;
public static bool IsRenderCancelled = false; // Core Render Configuration and Path (OOP Instance Fields)
public static RenderSettings Configuration; public int countdown;
public long frameCount;
public bool skipPressToStart;
public string levelPath = "";
public bool isRenderCancelled;
public RenderSettings Configuration;
public struct RenderSettings public struct RenderSettings
{ {
@@ -55,14 +54,20 @@ namespace ADOFAIRenderer.Component
} }
} }
public static SortedList<long, byte[]> ImageQueue = new SortedList<long, byte[]>(); // Thread and Queue State (OOP Instance Fields)
public static Thread? RenderThread; public SortedList<long, byte[]> ImageQueue = new SortedList<long, byte[]>();
public static long PassCount; public Thread? RenderThread;
public static bool EndRequested; public long passCount;
public static bool EndSuccessful; public bool endRequested;
public static long WonFrame = -1; public bool endSuccessful;
public long wonFrame = -1;
private static bool _renderSetup; // Private Instance Fields
private int _originalInputOffset;
private GameObject? _debugMonitorObj;
private GameObject? _escapeHandlerObj;
private string? _currentOutPath;
private bool _renderSetup;
private void Awake() private void Awake()
{ {
@@ -101,7 +106,8 @@ namespace ADOFAIRenderer.Component
RenderMod.FrameCountBase = Time.frameCount; RenderMod.FrameCountBase = Time.frameCount;
RenderMod.IsRendering = true; RenderMod.IsRendering = true;
Countdown = 3; WonFrame = -1; countdown = 3;
wonFrame = -1;
if (!_escapeHandlerObj) if (!_escapeHandlerObj)
{ {
@@ -123,14 +129,14 @@ namespace ADOFAIRenderer.Component
} }
else if (scrController.instance.state == States.Won) else if (scrController.instance.state == States.Won)
{ {
if (WonFrame == -1) if (wonFrame == -1)
{ {
WonFrame = FrameCount; wonFrame = frameCount;
} }
var extraFrames = (long)Math.Ceiling(Configuration.EndWaitTime * Configuration.TargetFPS); var extraFrames = (long)Math.Ceiling(Configuration.EndWaitTime * Configuration.TargetFPS);
if (FrameCount - WonFrame < extraFrames) return; if (frameCount - wonFrame < extraFrames) return;
RenderMod.IsRendering = RenderMod.IsCapturing = false; RenderMod.IsRendering = RenderMod.IsCapturing = false;
StopFFmpeg(true); StopFFmpeg(true);
} }
@@ -147,25 +153,25 @@ namespace ADOFAIRenderer.Component
public void SetupGameScene() public void SetupGameScene()
{ {
GCS.customLevelPaths = new[] { LevelPath }; GCS.customLevelPaths = new[] { levelPath };
GCS.checkpointNum = 0; GCS.checkpointNum = 0;
GCS.customLevelId = ""; GCS.customLevelId = "";
GCS.nextSpeedRun = 1; GCS.nextSpeedRun = 1;
GCS.customLevelIndex = 0; GCS.customLevelIndex = 0;
ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "scnGame"); ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "scnGame");
SkipPressToStart = true; skipPressToStart = true;
_renderSetup = true; _renderSetup = true;
} }
private IEnumerator SetupPlay() private IEnumerator SetupPlay()
{ {
for (; Countdown > 0; Countdown--) for (; countdown > 0; countdown--)
{ {
yield return new WaitForSecondsRealtime(1); yield return new WaitForSecondsRealtime(1);
} }
FrameCount = 0; frameCount = 0;
RenderMod.FrameReader?.Dispose(); RenderMod.FrameReader?.Dispose();
RenderMod.FrameReader = new FrameReader(); RenderMod.FrameReader = new FrameReader();
@@ -179,7 +185,7 @@ namespace ADOFAIRenderer.Component
scrConductor.instance.song.time = -1000; scrConductor.instance.song.time = -1000;
} }
private static string FindFFmpegPath() private string FindFFmpegPath()
{ {
var isWindows = Application.platform == RuntimePlatform.WindowsPlayer; var isWindows = Application.platform == RuntimePlatform.WindowsPlayer;
var ffmpegName = isWindows ? "ffmpeg.exe" : "ffmpeg"; var ffmpegName = isWindows ? "ffmpeg.exe" : "ffmpeg";
@@ -218,16 +224,16 @@ namespace ADOFAIRenderer.Component
{ {
ImageQueue.Clear(); ImageQueue.Clear();
} }
PassCount = 0; passCount = 0;
IsRenderCancelled = false; isRenderCancelled = false;
RenderMod.IsRenderCancelled = false; RenderMod.IsRenderCancelled = false;
RenderMod.FrameCountForVideo = 0; RenderMod.FrameCountForVideo = 0;
RenderMod.LastVideoFrameIndex = -1; RenderMod.LastVideoFrameIndex = -1;
RenderMod.LastRequestedVideoFrameIndex = -1; RenderMod.LastRequestedVideoFrameIndex = -1;
RenderMod.RenderCheck = true; RenderMod.RenderCheck = true;
RenderMod.SkipCount = 0; RenderMod.SkipCount = 0;
EndRequested = false; endRequested = false;
EndSuccessful = false; endSuccessful = false;
var targetFps = Configuration.TargetFPS; var targetFps = Configuration.TargetFPS;
var videoFps = Configuration.VideoFPS; var videoFps = Configuration.VideoFPS;
@@ -274,16 +280,16 @@ namespace ADOFAIRenderer.Component
{ {
var firstKey = ImageQueue.Keys[0]; var firstKey = ImageQueue.Keys[0];
if (firstKey > PassCount && !RenderMod.IsCapturing) if (firstKey > passCount && !RenderMod.IsCapturing)
{ {
PassCount = firstKey; passCount = firstKey;
} }
if (firstKey == PassCount) if (firstKey == passCount)
{ {
buffer = ImageQueue[firstKey]; buffer = ImageQueue[firstKey];
ImageQueue.RemoveAt(0); ImageQueue.RemoveAt(0);
PassCount++; passCount++;
} }
} }
} }
@@ -299,14 +305,14 @@ namespace ADOFAIRenderer.Component
continue; continue;
} }
if (IsRenderCancelled || RenderMod.IsRenderCancelled) if (isRenderCancelled || RenderMod.IsRenderCancelled)
{ {
break; break;
} }
if (EndRequested) if (endRequested)
{ {
if (PassCount > RenderMod.LastRequestedVideoFrameIndex) if (passCount > RenderMod.LastRequestedVideoFrameIndex)
{ {
break; break;
} }
@@ -316,7 +322,7 @@ namespace ADOFAIRenderer.Component
} }
videoFFmpeg.Close(); videoFFmpeg.Close();
EndSuccessful = true; endSuccessful = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -330,7 +336,7 @@ namespace ADOFAIRenderer.Component
public void CancelRender() public void CancelRender()
{ {
RenderMod.IsRendering = RenderMod.IsCapturing = false; RenderMod.IsRendering = RenderMod.IsCapturing = false;
IsRenderCancelled = true; isRenderCancelled = true;
RenderMod.IsRenderCancelled = true; RenderMod.IsRenderCancelled = true;
StopFFmpeg(false); StopFFmpeg(false);
@@ -339,13 +345,13 @@ namespace ADOFAIRenderer.Component
private void StopFFmpeg(bool success) private void StopFFmpeg(bool success)
{ {
EndRequested = true; endRequested = true;
if (!success) if (!success)
{ {
IsRenderCancelled = true; isRenderCancelled = true;
RenderMod.IsRenderCancelled = true; RenderMod.IsRenderCancelled = true;
} }
SkipPressToStart = false; skipPressToStart = false;
_renderSetup = false; _renderSetup = false;
if (_escapeHandlerObj) if (_escapeHandlerObj)
{ {
@@ -422,13 +428,13 @@ namespace ADOFAIRenderer.Component
} }
} }
private static IEnumerator StopRenderCoroutine() private IEnumerator StopRenderCoroutine()
{ {
yield return new WaitUntil(() => EndSuccessful); yield return new WaitUntil(() => endSuccessful);
EndRender(); EndRender();
} }
private static void EndRender() private void EndRender()
{ {
Time.timeScale = 1f; Time.timeScale = 1f;
Time.captureDeltaTime = 0f; Time.captureDeltaTime = 0f;
Patch/ClassPatch/scrPlayerManagerPatch.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
{ {
if (!RenderMod.IsRendering) return true; if (!RenderMod.IsRendering) return true;
__result = RenderManager.FrameCount == 0 && RenderManager.Countdown == 0; __result = RenderManager.Instance && RenderManager.Instance.frameCount == 0 && RenderManager.Instance.countdown == 0;
return false; return false;
} }
} }
Patch/ClassPatch/scrPressToStartPatch.cs
+2 -2
View File
@@ -11,9 +11,9 @@ namespace ADOFAIRenderer.Patch.ClassPatch
[HarmonyPatch("ShowText")] [HarmonyPatch("ShowText")]
private static bool PreventShowText() private static bool PreventShowText()
{ {
if (!RenderManager.SkipPressToStart) return true; if (!RenderManager.Instance || !RenderManager.Instance.skipPressToStart) return true;
RenderManager.SkipPressToStart = false; RenderManager.Instance.skipPressToStart = false;
return false; return false;
} }
} }
Patch/ClassPatch/scrShowIfDebugPatch.cs
+10 -7
View File
@@ -18,14 +18,17 @@ namespace ADOFAIRenderer.Patch.ClassPatch
if (!RenderMod.IsRendering) return; if (!RenderMod.IsRendering) return;
___txt.text = "Render"; ___txt.text = "Render";
if (RenderManager.Countdown > 0) ___txt.text = $"Render in {RenderManager.Countdown}s.."; if (RenderManager.Instance)
if (RenderManager.WonFrame != -1)
{ {
var elapsedFrames = RenderManager.FrameCount - RenderManager.WonFrame; if (RenderManager.Instance.countdown > 0) ___txt.text = $"Render in {RenderManager.Instance.countdown}s..";
var remainingTime = RenderManager.Configuration.EndWaitTime - elapsedFrames / RenderManager.Configuration.TargetFPS;
if (remainingTime < 0) remainingTime = 0; if (RenderManager.Instance.wonFrame != -1)
___txt.text += $"\nWaiting for {remainingTime:F1}s.."; {
var elapsedFrames = RenderManager.Instance.frameCount - RenderManager.Instance.wonFrame;
var remainingTime = RenderManager.Instance.Configuration.EndWaitTime - elapsedFrames / RenderManager.Instance.Configuration.TargetFPS;
if (remainingTime < 0) remainingTime = 0;
___txt.text += $"\nWaiting for {remainingTime:F1}s..";
}
} }
___txt.color = ___defaultColor; ___txt.color = ___defaultColor;
Patch/RenderEnvironmentPatches.cs
+20 -20
View File
@@ -15,8 +15,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result) public static bool Prefix(ref float __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.TimeBase); __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase);
return false; return false;
} }
} }
@@ -27,8 +27,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result) public static bool Prefix(ref double __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.TimeBase; __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase;
return false; return false;
} }
} }
@@ -39,8 +39,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result) public static bool Prefix(ref float __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.UnscaledTimeBase); __result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase);
return false; return false;
} }
} }
@@ -51,8 +51,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result) public static bool Prefix(ref double __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.UnscaledTimeBase; __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase;
return false; return false;
} }
} }
@@ -63,8 +63,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result) public static bool Prefix(ref double __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.DspTimeBase; __result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.DspTimeBase;
return false; return false;
} }
@@ -86,8 +86,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result) public static bool Prefix(ref int __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (int)(RenderManager.FrameCount + RenderMod.FrameCountBase); __result = (int)(RenderManager.Instance.frameCount + RenderMod.FrameCountBase);
return false; return false;
} }
} }
@@ -98,8 +98,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result) public static bool Prefix(ref float __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Configuration.TargetFPS); __result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
return false; return false;
} }
} }
@@ -110,8 +110,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result) public static bool Prefix(ref float __result)
{ {
if (!RenderMod.IsCapturing || !RenderPatch) return true; if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Configuration.TargetFPS); __result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
return false; return false;
} }
} }
@@ -122,8 +122,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result) public static bool Prefix(ref int __result)
{ {
if (!RenderMod.IsRendering || !RenderPatch) return true; if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Configuration.RenderWidth; __result = RenderManager.Instance.Configuration.RenderWidth;
return false; return false;
} }
} }
@@ -134,8 +134,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result) public static bool Prefix(ref int __result)
{ {
if (!RenderMod.IsRendering || !RenderPatch) return true; if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Configuration.RenderHeight; __result = RenderManager.Instance.Configuration.RenderHeight;
return false; return false;
} }
} }
Patch/ShowHitTextPatch.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace ADOFAIRenderer.Patch
{ {
public static bool Prefix() public static bool Prefix()
{ {
return !RenderMod.IsRendering || RenderManager.Configuration.ShowHitText; return !RenderMod.IsRendering || (RenderManager.Instance && RenderManager.Instance.Configuration.ShowHitText);
} }
} }
} }
RenderMod.cs
+16 -13
View File
@@ -86,18 +86,18 @@ namespace ADOFAIRenderer
{ {
if (SkipCount < 60) if (SkipCount < 60)
{ {
Melon<RenderMod>.Logger.Warning($"[Render Skipped] Frame {RenderManager.FrameCount} rendering missed. Retrying... (Attempt {SkipCount + 1}/60)"); Melon<RenderMod>.Logger.Warning($"[Render Skipped] Frame {RenderManager.Instance.frameCount} rendering missed. Retrying... (Attempt {SkipCount + 1}/60)");
SkipCount++; SkipCount++;
Time.timeScale = 0f; // 진행 시간 멈추기 (재시도) Time.timeScale = 0f; // 진행 시간 멈추기 (재시도)
return; // 업데이트 진행하지 않고 대기 return; // 업데이트 진행하지 않고 대기
} }
// 60회 초과 시 최후의 블랙 프레임 삽입하여 전체 파이프라인 마비 방지 // 60회 초과 시 최후의 블랙 프레임 삽입하여 전체 파이프라인 마비 방지
Melon<RenderMod>.Logger.Error($"[Render Skipped] Frame {RenderManager.FrameCount} rendering failed after 60 retries. Supplying black frame."); Melon<RenderMod>.Logger.Error($"[Render Skipped] Frame {RenderManager.Instance.frameCount} rendering failed after 60 retries. Supplying black frame.");
var currentFrame = FrameCountForVideo++; var currentFrame = FrameCountForVideo++;
var targetFps = RenderManager.Configuration.TargetFPS; var targetFps = RenderManager.Instance.Configuration.TargetFPS;
var videoFps = RenderManager.Configuration.VideoFPS; var videoFps = RenderManager.Instance.Configuration.VideoFPS;
var effectiveVideoFps = Math.Min(videoFps, targetFps); var effectiveVideoFps = Math.Min(videoFps, targetFps);
var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps); var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
@@ -106,13 +106,13 @@ namespace ADOFAIRenderer
LastVideoFrameIndex = videoFrameIndex; LastVideoFrameIndex = videoFrameIndex;
LastRequestedVideoFrameIndex = videoFrameIndex; LastRequestedVideoFrameIndex = videoFrameIndex;
var byteSize = RenderManager.Configuration.RenderWidth * RenderManager.Configuration.RenderHeight * 4; var byteSize = RenderManager.Instance.Configuration.RenderWidth * RenderManager.Instance.Configuration.RenderHeight * 4;
var blackFrame = System.Buffers.ArrayPool<byte>.Shared.Rent(byteSize); var blackFrame = System.Buffers.ArrayPool<byte>.Shared.Rent(byteSize);
Array.Clear(blackFrame, 0, byteSize); Array.Clear(blackFrame, 0, byteSize);
lock (RenderManager.ImageQueue) lock (RenderManager.Instance.ImageQueue)
{ {
RenderManager.ImageQueue[videoFrameIndex] = blackFrame; RenderManager.Instance.ImageQueue[videoFrameIndex] = blackFrame;
} }
} }
@@ -121,7 +121,7 @@ namespace ADOFAIRenderer
SkipCount = 0; SkipCount = 0;
RenderCheck = true; // 다음 프레임 검사용으로 초기화 RenderCheck = true; // 다음 프레임 검사용으로 초기화
RenderManager.FrameCount++; RenderManager.Instance.frameCount++;
if (realDeltaTime > 0) if (realDeltaTime > 0)
{ {
@@ -150,9 +150,9 @@ namespace ADOFAIRenderer
while (IsCapturing && IsRendering) while (IsCapturing && IsRendering)
{ {
int count; int count;
lock (RenderManager.ImageQueue) lock (RenderManager.Instance.ImageQueue)
{ {
count = RenderManager.ImageQueue.Count; count = RenderManager.Instance.ImageQueue.Count;
} }
if (count <= maxQueuedFrames) break; if (count <= maxQueuedFrames) break;
@@ -168,8 +168,8 @@ namespace ADOFAIRenderer
var currentFrame = FrameCountForVideo++; var currentFrame = FrameCountForVideo++;
var targetFps = RenderManager.Configuration.TargetFPS; var targetFps = RenderManager.Instance.Configuration.TargetFPS;
var videoFps = RenderManager.Configuration.VideoFPS; var videoFps = RenderManager.Instance.Configuration.VideoFPS;
var effectiveVideoFps = Math.Min(videoFps, targetFps); var effectiveVideoFps = Math.Min(videoFps, targetFps);
var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps); var videoFrameIndex = (long)(currentFrame * effectiveVideoFps / targetFps);
@@ -227,7 +227,10 @@ namespace ADOFAIRenderer
return; return;
} }
RenderManager.LevelPath = ADOBase.levelPath; if (RenderManager.Instance)
{
RenderManager.Instance.levelPath = ADOBase.levelPath;
}
scnEditor.instance.CheckUnsavedChanges(() => scnEditor.instance.CheckUnsavedChanges(() =>
{ {
UI/DebugMonitorUI.cs
+7 -4
View File
@@ -187,12 +187,15 @@ namespace ADOFAIRenderer.UI
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine("<b><color=#00ccff>ADOFAI Renderer Realtime Monitor</color></b>"); sb.AppendLine("<b><color=#00ccff>ADOFAI Renderer Realtime Monitor</color></b>");
sb.AppendLine(); sb.AppendLine();
sb.AppendLine($"• Rendered Progress: <b>{RenderManager.FrameCount}</b> frames"); sb.AppendLine($"• Rendered Progress: <b>{(RenderManager.Instance ? RenderManager.Instance.frameCount : 0)}</b> frames");
int queueCount; var queueCount = 0;
lock (RenderManager.ImageQueue) if (RenderManager.Instance)
{ {
queueCount = RenderManager.ImageQueue.Count; lock (RenderManager.Instance.ImageQueue)
{
queueCount = RenderManager.Instance.ImageQueue.Count;
}
} }
sb.AppendLine($"• Queued Buffers: <b>{queueCount}</b> / 60 frames"); sb.AppendLine($"• Queued Buffers: <b>{queueCount}</b> / 60 frames");
UI/RenderButton.cs
+18 -12
View File
@@ -84,26 +84,32 @@ namespace ADOFAIRenderer.UI
return; return;
} }
Melon<RenderMod>.Logger.Msg($"레벨 로드: {RenderManager.LevelPath}"); if (RenderManager.Instance)
{
Melon<RenderMod>.Logger.Msg($"레벨 로드: {RenderManager.Instance.levelPath}");
}
var selectedCodecIndex = codecDropdown.value; var selectedCodecIndex = codecDropdown.value;
var selectedCodecName = codecDropdown.options[selectedCodecIndex].text; var selectedCodecName = codecDropdown.options[selectedCodecIndex].text;
var showHitText = showHitTextToggle != null && showHitTextToggle.isOn; var showHitText = showHitTextToggle != null && showHitTextToggle.isOn;
RenderManager.Configuration = new RenderManager.RenderSettings if (RenderManager.Instance)
{ {
TargetFPS = targetFPS, RenderManager.Instance.Configuration = new RenderManager.RenderSettings
VideoFPS = videoFPS, {
RenderWidth = renderWidth, TargetFPS = targetFPS,
RenderHeight = renderHeight, VideoFPS = videoFPS,
Bitrate = bitrate, RenderWidth = renderWidth,
Codec = selectedCodecName, RenderHeight = renderHeight,
EndWaitTime = waitAfterEnd, Bitrate = bitrate,
ShowHitText = showHitText Codec = selectedCodecName,
}; EndWaitTime = waitAfterEnd,
ShowHitText = showHitText
};
}
RenderManager.Instance.SetupCaptureDirectory(); RenderManager.Instance!.SetupCaptureDirectory();
RenderManager.Instance.SetupGameScene(); RenderManager.Instance.SetupGameScene();
} }
Util/FrameReader.cs
+3 -2
View File
@@ -126,9 +126,10 @@ namespace ADOFAIRenderer.Util
private static void PushToQueue(long frame, byte[] rawBytes) private static void PushToQueue(long frame, byte[] rawBytes)
{ {
lock (RenderManager.ImageQueue) if (!RenderManager.Instance) return;
lock (RenderManager.Instance.ImageQueue)
{ {
RenderManager.ImageQueue[frame] = rawBytes; RenderManager.Instance.ImageQueue[frame] = rawBytes;
} }
} }