Simplify Singleton in RendererUIManager

ADOFAIRenderer.csproj

@@ -82,6 +82,9 @@
       <Reference Include="Newtonsoft.Json">
         <HintPath>$(ADOFAI_PATH)\A Dance of Fire and Ice_Data\Managed\Newtonsoft.Json.dll</HintPath>
       </Reference>
+      <Reference Include="UniTask">
+        <HintPath>$(ADOFAI_PATH)\A Dance of Fire and Ice_Data\Managed\UniTask.dll</HintPath>
+      </Reference>
     </ItemGroup>
 
     <ItemGroup>

Core/Data/GlobalSettings.cs

@@ -4,7 +4,7 @@ using MelonLoader;
 using MelonLoader.Utils;
 using Newtonsoft.Json;
 
-namespace ADOFAIRenderer.Data;
+namespace ADOFAIRenderer.Core.Data;
 
 public class GlobalConfig
 {

Core/PostRenderHook.cs

@@ -1,5 +1,5 @@
-using System.Collections;
 using System.Reflection;
+using Cysharp.Threading.Tasks;
 using HarmonyLib;
 using UnityEngine;
 
@@ -9,6 +9,7 @@ namespace ADOFAIRenderer.Core;
 internal class PostRenderHook : MonoBehaviour
 {
     private FieldInfo? _camQuadMeshField;
+    private MeshRenderer? _camQuadMeshRenderer;
 
     private void Awake()
     {
@@ -20,15 +21,17 @@ internal class PostRenderHook : MonoBehaviour
         if (RenderManager.Instance)
             RenderManager.Instance.OnLastUpdate();
             
-        StartCoroutine(PostFrameCoroutine());
+        PostFrameAsync().Forget();
     }
 
-    private IEnumerator PostFrameCoroutine()
+    private async UniTaskVoid PostFrameAsync()
     {
-        yield return new WaitForEndOfFrame();
+        await UniTask.WaitForEndOfFrame(this, destroyCancellationToken);
             
-        var val = (MeshRenderer)_camQuadMeshField!.GetValue(scrCamera.instance);
-        if (RenderManager.Instance)
-            RenderManager.Instance.OnPostFrame(val.sharedMaterial.mainTexture as RenderTexture);
+        if (!_camQuadMeshRenderer && scrCamera.instance)
+            _camQuadMeshRenderer = _camQuadMeshField?.GetValue(scrCamera.instance) as MeshRenderer;
+
+        if (RenderManager.Instance && _camQuadMeshRenderer)
+            RenderManager.Instance.OnPostFrame(_camQuadMeshRenderer.sharedMaterial.mainTexture as RenderTexture);
     }
 }

Core/RenderManager.cs

@@ -7,6 +7,7 @@ using System.Buffers;
 using System.Diagnostics;
 using System.Linq;
 using ADOFAIRenderer.API;
+using ADOFAIRenderer.Core.Data;
 using ADOFAIRenderer.Data;
 using ADOFAIRenderer.UI;
 using ADOFAIRenderer.UI.Window;

Data/Codec.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using FFmpeg.AutoGen;
+
+namespace ADOFAIRenderer.Data;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public enum Codec
+{
+    H264, H265, VP9, AV1, VVC
+}
+
+internal static class CodecUtil
+{
+    public static readonly Dictionary<Codec, AVCodecID> AudioCodecMatch = new()
+    {
+        [Codec.H264] = AVCodecID.AV_CODEC_ID_AAC,
+        [Codec.H265] = AVCodecID.AV_CODEC_ID_AAC,
+        [Codec.VP9] = AVCodecID.AV_CODEC_ID_OPUS,
+        [Codec.AV1] = AVCodecID.AV_CODEC_ID_OPUS,
+        [Codec.VVC] = AVCodecID.AV_CODEC_ID_OPUS
+    };
+
+    public static readonly Dictionary<AVCodecID, List<int>> AvailableSampleRate = new()
+    {
+        [AVCodecID.AV_CODEC_ID_AAC] = new List<int> { 44100, 48000, 96000 },
+        [AVCodecID.AV_CODEC_ID_OPUS] = new List<int> { 48000 }
+    };
+}

Data/RateControlMode.cs

@@ -0,0 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace ADOFAIRenderer.Data;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public enum RateControlMode
+{
+    CBR,
+    VBR,
+    CQP
+}

Data/RenderConfig.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using ADOFAIRenderer.Util.FFmpeg;
 using UnityEngine;
 
 namespace ADOFAIRenderer.Data;

LICENSE-EXCEPTION.md

@@ -0,0 +1,36 @@
+# ADOFAIRenderer API & Data Linking Exception
+
+> **Additional Permission under GNU General Public License version 3 section 7**
+
+---
+
+## 1. Legal Terms (Official)
+
+Linking this Program statically or dynamically with other modules is making a combined work based on this Program. Thus, the terms and conditions of the GNU General Public License cover the whole combination.
+
+As a special exception, the copyright holders of this Program give you permission to combine this Program with independent modules that interact with or reference this Program solely through the public application programming interfaces (APIs), types, and data structures declared within the following namespaces:
+
+- `ADOFAIRenderer.API`
+- `ADOFAIRenderer.Data`
+
+and to copy, convey, and distribute the resulting combined work under terms of your choice, without requiring such combined work or independent modules to be covered under the GNU General Public License version 3, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.
+
+An **"independent module"** is a separate and distinct software module that is not derived from or based on this Program, other than referencing or communicating with the interfaces and types declared within the designated namespaces above.
+
+This exception does not grant any permission to modify the source code of this Program itself outside the terms of the GNU General Public License version 3.
+
+In accordance with section 7 of the GNU GPL version 3, if you modify this Program, you may extend this exception to your version of the Program, but you are not obligated to do so. If you do not wish to provide this exception in your derivative work, you may remove this exception statement from your version.
+
+---
+
+## 2. 조항 해설 (Korean Guide)
+
+본 문서는 GNU General Public License 버전 3 (GPLv3) 제7조(추가적인 허가, Additional Permissions)에 따라 제공되는 공식 예외 조항입니다.
+
+### 핵심 요약
+
+- **외부 모드의 라이선스 자유**:
+  - 제3자 모드 또는 외부 프로그램이 `ADOFAIRenderer.API` 및 `ADOFAIRenderer.Data` 네임스페이스의 공개 API, 클래스, 데이터 구조를 참조·호출하여 연동하는 경우, 해당 모드는 **GPLv3의 카피레프트(전염성) 의무를 적용받지 않습니다.**
+  - 외부 모드 개발자는 자신의 모드를 MIT, Apache-2.0, 독점/상용 라이선스 등 원하는 라이선스로 자유롭게 배포할 수 있습니다.
+- **ADOFAIRenderer 코어 보호**:
+  - ADOFAIRenderer 자체의 소스 코드(렌더링 파이프라인, 코어 패치, 내부 유틸리티 등)를 수정하거나 재배포하는 경우에는 본 예외 조항이 적용되지 않으며, 순수 GPLv3 라이선스 조건이 그대로 적용됩니다.

Patch/Game/EndscreenLanternsPatch.cs

@@ -40,7 +40,6 @@ public static class EndscreenLanternsPatch
             for (var i = 0; i < lampSequencesArray.Length; i++)
             {
                 var item = lampSequencesArray.GetValue(i);
-                if (item == null) continue;
                 try
                 {
                     var killMethod = item.GetType().GetMethod("Kill", new[] { typeof(bool) });

Patch/Game/scnGamePatch.cs

@@ -78,10 +78,8 @@ public static class scnGamePatch
         {
             // Remove FFmpeg player if it was attached previously
             var oldPlayer = __instance.videoBG.gameObject.GetComponent<FFmpegVideoBGPlayer>();
-            if (oldPlayer != null)
-            {
-                Object.Destroy(oldPlayer);
-            }
+            if (oldPlayer) Object.Destroy(oldPlayer);
+            
             // Re-enable native player component
             __instance.videoBG.enabled = true;
             return true; // Execute original
@@ -125,8 +123,7 @@ public static class scnGamePatch
         __instance.videoBG.enabled = false;
 
         // Add or retrieve our custom FFmpeg video background player
-        var player = __instance.videoBG.gameObject.GetComponent<FFmpegVideoBGPlayer>();
-        if (player == null)
+        if (!__instance.videoBG.gameObject.TryGetComponent<FFmpegVideoBGPlayer>(out var player))
         {
             player = __instance.videoBG.gameObject.AddComponent<FFmpegVideoBGPlayer>();
         }

README.md

@@ -90,4 +90,6 @@ The compiled mod will be output to `bin/Release/netstandard2.1/ADOFAIRenderer.dl
 
 ## 📄 License
 
-This project is licensed under the GNU General Public License v3.0 (GPLv3). See `LICENSE` for details.
+This project is licensed under the **GNU General Public License v3.0 with API & Data Linking Exception (GPLv3 with Exception)**.
+- Third-party mods and external tools that reference or link to ADOFAIRenderer solely via the `ADOFAIRenderer.API` and `ADOFAIRenderer.Data` namespaces are exempt from GPLv3 copyleft requirements and may be distributed under terms of their author's choice.
+- For full license terms and exception details, see [LICENSE](LICENSE) and [LICENSE-EXCEPTION.md](LICENSE-EXCEPTION.md).

RenderMod.cs

@@ -1,6 +1,7 @@
 using System;
 using ADOFAIRenderer;
 using ADOFAIRenderer.Core;
+using ADOFAIRenderer.Core.Data;
 using ADOFAIRenderer.Data;
 using ADOFAIRenderer.UI;
 using FFmpeg.AutoGen;

UI/FFmpegDownloadUI.cs

@@ -85,46 +85,6 @@ internal class FFmpegDownloadUI : MonoBehaviour
         }
     }
 
-    private static TMP_FontAsset GetNanumSquareNeoBdFontAsset()
-    {
-        TMP_FontAsset? font = null;
-        if (ModAssets.FontBundle)
-        {
-            try
-            {
-                font = ModAssets.FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
-            }
-            catch
-            {
-                // Loading failed
-            }
-        }
-
-        // Fallback processing
-        if (font == null)
-        {
-            try
-            {
-                font = RDString.fontData.fontTMP;
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-        if (font == null)
-        {
-            // ReSharper disable once Unity.UnknownResource
-            font = Resources.Load<TMP_FontAsset>("Fonts & Materials/LiberationSans SDF");
-        }
-
-        if (font) return font;
-        var fonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
-        if (fonts.Length > 0) font = fonts[0];
-
-        return font!;
-    }
-
     private void Start()
     {
         // Set UI layer (5)
@@ -159,7 +119,7 @@ internal class FFmpegDownloadUI : MonoBehaviour
         bgRect.offsetMin = Vector2.zero;
         bgRect.offsetMax = Vector2.zero;
             
-        var font = GetNanumSquareNeoBdFontAsset();
+        var font = ModAssets.NanumSquareNeoNormal;
             
         // 2. Create modal container
         var modalContainerObj = new GameObject("ModalContainer");

UI/RendererUIManager.cs

@@ -50,20 +50,7 @@ internal sealed class RendererFontProvider : IFontProvider
 
 internal class RendererUIManager : MonoBehaviour
 {
-    private static RendererUIManager? _instance;
-    public static RendererUIManager Instance
-    {
-        get
-        {
-            if (_instance != null) return _instance;
-            
-            var go = new GameObject("RendererUIManager");
-            DontDestroyOnLoad(go);
-            
-            _instance = go.AddComponent<RendererUIManager>();
-            return _instance;
-        }
-    }
+    public static RendererUIManager Instance = null!;
 
     public static O5Context Context => Instance._context;
     public O5WindowManager WindowManager => _windowManager;
@@ -72,7 +59,7 @@ internal class RendererUIManager : MonoBehaviour
     private O5WindowManager _windowManager = null!;
 
     private void Awake() {
-        _instance = this;
+        Instance = this;
         
         _context = new O5Context(
             config: new O5Config {
@@ -89,7 +76,7 @@ internal class RendererUIManager : MonoBehaviour
                 ObjectBG = new Color(0f, 0f, 0f, 1f),
                 ObjectButton = new Color(0f, 0f, 0f, 1f),
                 ObjectActive = new Color(1.000f, 0.294f, 0.079f, 1f),
-                ObjectActiveBright = new Color(0.812f, 0.827f, 1.000f, 1f),
+                ObjectActiveBright = new Color(1.000f, 0.294f, 0.079f, 1f),
                 ControlOutlineIdle = new Color(1f, 1f, 1f, 0.4f),
                 ButtonHover = new Color(0.133f, 0.133f, 0.133f, 1.0f),
                 ControlOutlineHover = new Color(1f, 1f, 1f, 0.4f),
@@ -118,7 +105,5 @@ internal class RendererUIManager : MonoBehaviour
     private void OnDestroy() {
         _windowManager.Dispose();
         _context.Dispose();
-        
-        if (_instance == this) _instance = null;
     }
 }

UI/Window/RenderConfigWindow.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using ADOFAIRenderer.API;
 using ADOFAIRenderer.Core;
+using ADOFAIRenderer.Core.Data;
 using ADOFAIRenderer.Data;
 using ADOFAIRenderer.Localization;
 using ADOFAIRenderer.Util;
@@ -58,9 +59,7 @@ internal static class RenderConfigWindow
             {
                 Id = "RendererMod_RenderConfig",
                 Title = LocalizationManager.Get("ui.render_config.window_title"),
-                Size = new Vector2(580f, 480f),
-                Draggable = true,
-                Resizable = true,
+                Size = new Vector2(900, 600), Draggable = true, Resizable = true,
                 ShowCloseButton = true
             });
 
@@ -125,7 +124,7 @@ internal static class RenderConfigWindow
             defaultValue: 60, min: 0.01, max: 3000, value: 60,
             format: "F3", clampMode: ClampMode.All,
 
-            sliderFilter: value => renderFpsSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            sliderFilter: value => Snap(renderFpsSnap, value),
             inputFilter: null, onComplete: null, onChanged: val => { config.RenderFPS = val; },
             text: LocalizationManager.Get("ui.render_config.render_fps"),
             id: "slider_render_fps", showFill: true
@@ -136,7 +135,7 @@ internal static class RenderConfigWindow
             defaultValue: 60, min: 0.01, max: 600, value: 60,
             format: "F3", clampMode: ClampMode.All,
             
-            sliderFilter: value => videoFpsSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            sliderFilter: value => Snap(videoFpsSnap, value),
             inputFilter: null, onComplete: null, onChanged: val => { config.VideoFPS = val; },
             text: LocalizationManager.Get("ui.render_config.video_fps"),
             id: "slider_video_fps", showFill: true
@@ -147,7 +146,7 @@ internal static class RenderConfigWindow
             defaultValue: 2560, min: 0, max: 15360, value: 2560,
             format: "F0", clampMode: ClampMode.All,
             
-            sliderFilter: value => renderWidthSnap.OrderBy(n => Math.Abs(n - value)).First(), inputFilter: value => Math.Max(value, 2), 
+            sliderFilter: value => Snap(renderWidthSnap, value), inputFilter: value => Math.Max(value, 2), 
             onComplete: null, onChanged: val => { config.RenderWidth = (int)Math.Round(val); },
             text: LocalizationManager.Get("ui.render_config.render_width"),
             id: "slider_render_width", showFill: true
@@ -158,8 +157,8 @@ internal static class RenderConfigWindow
             defaultValue: 1440, min: 0, max: 8640, value: 1440,
             format: "F0", clampMode: ClampMode.All,
             
-            sliderFilter: value => renderHeightSnap.OrderBy(n => Math.Abs(n - value)).First(), inputFilter: value => Math.Max(value, 2), 
-            onComplete: null, onChanged: val => { config.RenderWidth = (int)Math.Round(val); },
+            sliderFilter: value => Snap(renderHeightSnap, value), inputFilter: value => Math.Max(value, 2), 
+            onComplete: null, onChanged: val => { config.RenderHeight = (int)Math.Round(val); },
             text: LocalizationManager.Get("ui.render_config.render_height"),
             id: "slider_render_height", showFill: true
         );
@@ -292,7 +291,7 @@ internal static class RenderConfigWindow
             defaultValue: 256, min: 64, max: 384, value: 256,
             format: "F0", clampMode: ClampMode.All,
 
-            sliderFilter: value => audioBitrateSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            sliderFilter: value => Snap(audioBitrateSnap, value),
             inputFilter: null, onComplete: null, onChanged: val => { config.AudioConfig.AudioBitrate = (int)Math.Round(val) * 1000; },
             text: LocalizationManager.Get("ui.render_config.audio_bitrate"),
             id: "slider_audio_bitrate", showFill: true
@@ -464,6 +463,9 @@ internal static class RenderConfigWindow
 
         return;
 
+        double Snap(double[] array, double value) =>
+            array.OrderBy(n => Math.Abs(n - value)).First();
+
         void UpdateVideoCodec(Codec codec)
         {
             _sampleRateDropdown?.SetValues(CodecUtil.AvailableSampleRate[CodecUtil.AudioCodecMatch[codec]]);

Util/FFmpeg/Codec.cs

@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using FFmpeg.AutoGen;
-
-namespace ADOFAIRenderer.Util.FFmpeg
-{
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Codec
-    {
-        H264, H265, VP9, AV1, VVC
-    }
-
-    internal static class CodecUtil
-    {
-        public static readonly Dictionary<Codec, AVCodecID> AudioCodecMatch = new()
-        {
-            [Codec.H264] = AVCodecID.AV_CODEC_ID_AAC,
-            [Codec.H265] = AVCodecID.AV_CODEC_ID_AAC,
-            [Codec.VP9] = AVCodecID.AV_CODEC_ID_OPUS,
-            [Codec.AV1] = AVCodecID.AV_CODEC_ID_OPUS,
-            [Codec.VVC] = AVCodecID.AV_CODEC_ID_OPUS
-        };
-
-        public static readonly Dictionary<AVCodecID, List<int>> AvailableSampleRate = new()
-        {
-            [AVCodecID.AV_CODEC_ID_AAC] = new List<int> { 44100, 48000, 96000 },
-            [AVCodecID.AV_CODEC_ID_OPUS] = new List<int> { 48000 }
-        };
-    }
-}

Util/FFmpeg/FFmpegNativeDecoder.cs

@@ -3,8 +3,8 @@ using FFmpeg.AutoGen;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 
-namespace ADOFAIRenderer.Util.FFmpeg
-{
+namespace ADOFAIRenderer.Util.FFmpeg;
+
 /// <summary>
 /// Decodes video files in a streaming fashion using FFmpeg's native C API.
 /// Unlike a standalone player, it allows reading frames sequentially or seeking/skipping forward on demand.
@@ -860,4 +860,3 @@ namespace ADOFAIRenderer.Util.FFmpeg
         Dispose();
     }
 }
-}

Util/FFmpeg/FFmpegNativeEncoder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using ADOFAIRenderer.Data;
 using FFmpeg.AutoGen;
 using MelonLoader;
 using Unity.Collections;

Util/FFmpeg/RateControlMode.cs

@@ -1,12 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace ADOFAIRenderer.Util.FFmpeg
-{
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum RateControlMode
-    {
-        CBR,
-        VBR,
-        CQP
-    }
-}

Util/FFmpeg/VideoEncoder.cs

@@ -2,11 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using ADOFAIRenderer.Data;
+
+namespace ADOFAIRenderer.Util.FFmpeg;
 
-namespace ADOFAIRenderer.Util.FFmpeg
-{
 [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EncoderKind
+internal enum EncoderKind
 {
     Software,
     NVENC,
@@ -110,4 +111,3 @@ namespace ADOFAIRenderer.Util.FFmpeg
 
     public override string ToString() => Name;
 }
-}

Util/GPUUtil.cs

@@ -2,12 +2,13 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.RegularExpressions;
+using ADOFAIRenderer.Data;
 using ADOFAIRenderer.Util.FFmpeg;
 using MelonLoader;
 using UnityEngine;
 
-namespace ADOFAIRenderer.Util
-{
+namespace ADOFAIRenderer.Util;
+
 [SuppressMessage("ReSharper", "InconsistentNaming")]
 internal enum GPUVendor
 {
@@ -150,4 +151,3 @@ namespace ADOFAIRenderer.Util
         return prioritized;
     }
 }
-}