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

Patch/ClassPatch/scrPlayerManagerPatch.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
{
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;
}
}
Patch/ClassPatch/scrPressToStartPatch.cs
+2 -2
View File
@@ -11,9 +11,9 @@ namespace ADOFAIRenderer.Patch.ClassPatch
[HarmonyPatch("ShowText")]
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;
}
}
Patch/ClassPatch/scrShowIfDebugPatch.cs
+10 -7
View File
@@ -18,14 +18,17 @@ namespace ADOFAIRenderer.Patch.ClassPatch
if (!RenderMod.IsRendering) return;
___txt.text = "Render";
if (RenderManager.Countdown > 0) ___txt.text = $"Render in {RenderManager.Countdown}s..";
if (RenderManager.WonFrame != -1)
if (RenderManager.Instance)
{
var elapsedFrames = RenderManager.FrameCount - RenderManager.WonFrame;
var remainingTime = RenderManager.Configuration.EndWaitTime - elapsedFrames / RenderManager.Configuration.TargetFPS;
if (remainingTime < 0) remainingTime = 0;
___txt.text += $"\nWaiting for {remainingTime:F1}s..";
if (RenderManager.Instance.countdown > 0) ___txt.text = $"Render in {RenderManager.Instance.countdown}s..";
if (RenderManager.Instance.wonFrame != -1)
{
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;
Patch/RenderEnvironmentPatches.cs
+20 -20
View File
@@ -15,8 +15,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = (float)(RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.TimeBase);
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase);
return false;
}
}
@@ -27,8 +27,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.TimeBase;
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase;
return false;
}
}
@@ -39,8 +39,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = (float)(RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.UnscaledTimeBase);
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase);
return false;
}
}
@@ -51,8 +51,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.UnscaledTimeBase;
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase;
return false;
}
}
@@ -63,8 +63,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = RenderManager.FrameCount / RenderManager.Configuration.TargetFPS + RenderMod.DspTimeBase;
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.DspTimeBase;
return false;
}
@@ -86,8 +86,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = (int)(RenderManager.FrameCount + RenderMod.FrameCountBase);
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (int)(RenderManager.Instance.frameCount + RenderMod.FrameCountBase);
return false;
}
}
@@ -98,8 +98,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = (float)(1 / RenderManager.Configuration.TargetFPS);
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
return false;
}
}
@@ -110,8 +110,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch) return true;
__result = (float)(1 / RenderManager.Configuration.TargetFPS);
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
return false;
}
}
@@ -122,8 +122,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsRendering || !RenderPatch) return true;
__result = RenderManager.Configuration.RenderWidth;
if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.Configuration.RenderWidth;
return false;
}
}
@@ -134,8 +134,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsRendering || !RenderPatch) return true;
__result = RenderManager.Configuration.RenderHeight;
if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.Configuration.RenderHeight;
return false;
}
}
Patch/ShowHitTextPatch.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace ADOFAIRenderer.Patch
{
public static bool Prefix()
{
return !RenderMod.IsRendering || RenderManager.Configuration.ShowHitText;
return !RenderMod.IsRendering || (RenderManager.Instance && RenderManager.Instance.Configuration.ShowHitText);
}
}
}