SHA256
Cleanup 2
This commit is contained in:
1 parent
19e9bb68af
commit
f6e32e6e1f
2 files changed
+8
-23
No files matched your search
+6
-22
@@ -321,9 +321,7 @@ namespace ADOFAIRenderer.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (Instance != null)
|
if (Instance != null)
|
||||||
{
|
|
||||||
Instance.levelPath = ADOBase.levelPath;
|
Instance.levelPath = ADOBase.levelPath;
|
||||||
}
|
|
||||||
|
|
||||||
scnEditor.instance.CheckUnsavedChanges(() =>
|
scnEditor.instance.CheckUnsavedChanges(() =>
|
||||||
{
|
{
|
||||||
@@ -504,30 +502,18 @@ namespace ADOFAIRenderer.Core
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isRenderCancelled)
|
if (isRenderCancelled) break;
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (endRequested)
|
if (endRequested)
|
||||||
{
|
{
|
||||||
if (passCount > lastRequestedVideoFrameIndex)
|
if (passCount > lastRequestedVideoFrameIndex) break;
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Thread.Sleep(1);
|
Thread.Sleep(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isRenderCancelled)
|
if (isRenderCancelled) videoFFmpeg.Kill();
|
||||||
{
|
else videoFFmpeg.Close();
|
||||||
videoFFmpeg.Kill();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
videoFFmpeg.Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
lock (_allVideoFFmpegInstances)
|
lock (_allVideoFFmpegInstances)
|
||||||
{
|
{
|
||||||
@@ -582,10 +568,8 @@ namespace ADOFAIRenderer.Core
|
|||||||
Destroy(_escapeHandlerObj);
|
Destroy(_escapeHandlerObj);
|
||||||
_escapeHandlerObj = null;
|
_escapeHandlerObj = null;
|
||||||
}
|
}
|
||||||
if (success)
|
|
||||||
{
|
if (success) StartCoroutine(StopRenderCoroutine());
|
||||||
StartCoroutine(StopRenderCoroutine());
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Melon<RenderMod>.Logger.Error("렌더링이 실패했거나 취소되었습니다. 상태 및 리소스를 안전하게 청소합니다.");
|
Melon<RenderMod>.Logger.Error("렌더링이 실패했거나 취소되었습니다. 상태 및 리소스를 안전하게 청소합니다.");
|
||||||
|
|||||||
+2
-1
@@ -5,7 +5,7 @@ using MelonLoader;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
|
|
||||||
[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.0.6-BETA", "ADOFAI Editor Forum")]
|
[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.1.0-BETA", "ADOFAI Editor Forum")]
|
||||||
[assembly: MelonGame("7th Beat Games", "A Dance of Fire and Ice")]
|
[assembly: MelonGame("7th Beat Games", "A Dance of Fire and Ice")]
|
||||||
|
|
||||||
namespace ADOFAIRenderer
|
namespace ADOFAIRenderer
|
||||||
@@ -13,6 +13,7 @@ namespace ADOFAIRenderer
|
|||||||
public class RenderMod : MelonMod
|
public class RenderMod : MelonMod
|
||||||
{
|
{
|
||||||
public static AssetBundle FontBundle = null!;
|
public static AssetBundle FontBundle = null!;
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
public static AssetBundle SceneBundle = null!;
|
public static AssetBundle SceneBundle = null!;
|
||||||
public static string[] ModScenes = {};
|
public static string[] ModScenes = {};
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user