Merge remote-tracking branch 'origin/main'

Reviewed-on: #4

ADOFAIRenderer.csproj

@@ -94,7 +94,9 @@
 
     <ItemGroup>
       <Folder Include="Bundle/" />
-      <EmbeddedResource Include="Bundle/*" />
+      <EmbeddedResource Include="Bundle/Linux/*" />
+      <EmbeddedResource Include="Bundle/Win64/*" />
+      <EmbeddedResource Include="Bundle/OSX/*" />
     </ItemGroup>
 
     <!-- Build 후 XML 문서에서 ADOFAIRenderer.API 네임스페이스만 남기고 나머지 제거 -->

Core/RenderManager.cs

@@ -366,7 +366,7 @@ internal class RenderManager : MonoBehaviour
     {
         if (Configuration.AudioConfig.RenderAudio && Configuration.VideoConfig.Codec is Codec.VP9 or Codec.AV1 or Codec.VVC)
         {
-            Configuration.AudioConfig.AudioSampleRate = 48000;
+            if (Configuration.AudioConfig.AudioSampleRate == 44100) Configuration.AudioConfig.AudioSampleRate = 48000;
         }
 
         for (; countdown > 0; countdown--)
@@ -775,7 +775,7 @@ internal class RenderManager : MonoBehaviour
         _frameReader?.Dispose();
         AudioMixer?.Reset(); AudioMixer = null;
         SyncCalculator.Reset();
-            
+
         RenderContext.Reset();
             
         ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "scnEditor");

Data/RenderConfig.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using ADOFAIRenderer.Util.FFmpeg;
+using UnityEngine;
 
 namespace ADOFAIRenderer.Data;
 
@@ -27,6 +28,10 @@ public class AdvancedConfig
     public bool ProcessAudio { get; set; } = true;
     public bool NonTile { get; set; } = false;
     public string FileExtension { get; set; } = "mkv";
+
+    public Color? firePlanetColor = null;
+    public Color? icePlanetColor = null;
+    public Color? windPlanetColor = null;
 }
 
 public class VideoEncodingConfig
@@ -44,7 +49,7 @@ public class VideoEncodingConfig
 
 public class AudioEncodingConfig
 {
-    private int _audioSampleRate = 44100;
+    private int _audioSampleRate = 48000;
     private int _audioChannels = 2;
     private int _audioBitrate = 256000;
 

Patch/Game/PlanetRendererPatch.cs

@@ -0,0 +1,30 @@
+using ADOFAIRenderer.Core;
+using HarmonyLib;
+using UnityEngine;
+
+namespace ADOFAIRenderer.Patch.Game;
+
+[HarmonyPatch(typeof(PlanetRenderer))]
+public static class PlanetRendererPatch
+{
+    [HarmonyPrefix]
+    [HarmonyPatch("SetColor")]
+    // ReSharper disable once InconsistentNaming
+    private static void OverrideColor(PlanetRenderer __instance, ref PlanetColor planetColor)
+    {
+        if (RenderManager.Instance.stage == RenderStage.None) return;
+        
+        var advConf = RenderManager.Instance.Configuration.AdvancedConfig;
+        ApplyColor(ref planetColor, scrController.instance.planetRed, advConf.firePlanetColor);
+        ApplyColor(ref planetColor, scrController.instance.planetBlue, advConf.icePlanetColor);
+        ApplyColor(ref planetColor, scrController.instance.planetGreen, advConf.windPlanetColor);
+
+        return;
+
+        void ApplyColor(ref PlanetColor planetColor, scrPlanet targetPlanet, Color? customColor)
+        {
+            if (__instance == targetPlanet.planetRenderer && customColor != null)
+                planetColor = new PlanetColor(customColor.Value);
+        }
+    }
+}

RenderMod.cs

@@ -2,27 +2,23 @@ using System;
 using ADOFAIRenderer;
 using ADOFAIRenderer.Core;
 using ADOFAIRenderer.Data;
-using ADOFAIRenderer.Util;
+using ADOFAIRenderer.UI;
 using FFmpeg.AutoGen;
 using MelonLoader;
 using MelonLoader.Utils;
 using UnityEngine;
-using UnityEngine.EventSystems;
 using Object = UnityEngine.Object;
 
-[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.3.3-BETA", "ADOFAI Editor Forum")]
+[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.2.0-INDEV", "ADOFAI Editor Forum")]
 [assembly: MelonGame("7th Beat Games", "A Dance of Fire and Ice")]
 
 namespace ADOFAIRenderer;
 
 internal class RenderMod : MelonMod
 {
-    public static AssetBundle FontBundle = null!;
     // ReSharper disable once MemberCanBePrivate.Global
-    public static AssetBundle ShaderBundle = null!;
-    public static ComputeShader ColorConversionShader = null!;
     public static bool IsFeatureDisabled = false;
-    public static DateTime ExpirationTime = new(2026, 09, 21, 0, 0, 0, DateTimeKind.Utc);
+    public static DateTime ExpirationTime = new(2026, 11, 21, 0, 0, 0, DateTimeKind.Utc);
 
     public override void OnInitializeMelon()
     {
@@ -39,35 +35,8 @@ internal class RenderMod : MelonMod
             
         renderManagerObj.AddComponent<RenderManager>();
         updateHookerObj.AddComponent<FirstUpdateHook>();
-        uiManagerObj.AddComponent<UI.RendererUIManager>();
-        LoadBundles();
-    }
-
-    private static void LoadBundles()
-    {
-        FontBundle = BundleLoader.GetBundle("fonts");
-        try
-        {
-            ShaderBundle = BundleLoader.GetBundle("shaders");
-            ColorConversionShader = ShaderBundle.LoadAsset<ComputeShader>("ColorConversion");
-            Melon<RenderMod>.Logger.Msg("Color conversion Compute Shader loaded successfully.");
-        }
-        catch (Exception ex)
-        {
-            Melon<RenderMod>.Logger.Warning($"Failed to load Shader AssetBundle. GPU color conversion will be disabled and fallback to CPU. Error: {ex.Message}");
-        }
-    }
-        
-    public static void FixEventSystem()
-    {
-        if (EventSystem.current == null) return;
-        var currentModule = EventSystem.current.currentInputModule;
-
-        if (currentModule) return;
-        Melon<RenderMod>.Logger.Msg("Ported Unity 6 Input Module.");
-            
-        var newModule = EventSystem.current.gameObject.AddComponent<StandaloneInputModule>();
-        newModule.enabled = true;
+        uiManagerObj.AddComponent<RendererUIManager>();
+        ModAssets.Load();
     }
 
     public override void OnApplicationQuit()

UI/CommonWarningDialogUI.cs

@@ -52,46 +52,6 @@ internal class CommonWarningDialogUI : MonoBehaviour
         }
     }
 
-    private static TMP_FontAsset GetNanumSquareNeoBdFontAsset()
-    {
-        TMP_FontAsset? font = null;
-        if (RenderMod.FontBundle)
-        {
-            try
-            {
-                font = RenderMod.FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
-            }
-            catch
-            {
-                // Loading failed
-            }
-        }
-
-        // Fallback processing
-        if (!font)
-        {
-            try
-            {
-                font = RDString.fontData.fontTMP;
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-        if (!font)
-        {
-            // 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!;
-    }
-
     public static void ShowDialog(string title, string description, params DialogButton[] buttons)
     {
         if (buttons.Length == 0) return;
@@ -153,7 +113,7 @@ internal class CommonWarningDialogUI : 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/DebugMonitorUI.cs

@@ -30,39 +30,6 @@ internal class DebugMonitorUI : MonoBehaviour
     private RectTransform _fillRect = null!;
     private TextMeshProUGUI _progressText = null!;
 
-    private static TMP_FontAsset GetNanumSquareNeoBdFontAsset()
-    {
-        TMP_FontAsset? font = null;
-        if (RenderMod.FontBundle != null)
-        {
-            try
-            {
-                font = RenderMod.FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
-            }
-            catch
-            {
-                // Loading failed
-            }
-        }
-
-        // Fallback: Use game's own font or built-in TMP SDF font if AssetBundle loading fails
-        if (font == null)
-        {
-            font = RDString.fontData.fontTMP;
-        }
-        if (font == null)
-        {
-            // ReSharper disable once Unity.UnknownResource
-            font = Resources.Load<TMP_FontAsset>("Fonts & Materials/LiberationSans SDF");
-        }
-
-        if (font != null) return font;
-        var fonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
-        if (fonts.Length > 0) font = fonts[0];
-
-        return font!;
-    }
-
     private void Start()
     {
         // Set UI layer (5)
@@ -112,8 +79,7 @@ internal class DebugMonitorUI : MonoBehaviour
         _text.overflowMode = TextOverflowModes.Overflow;
 
         // Load and apply font
-        var font = GetNanumSquareNeoBdFontAsset();
-        _text.font = font;
+        _text.font = ModAssets.NanumSquareNeoNormal;
 
         var textRect = textObj.GetComponent<RectTransform>();
         textRect.anchorMin = Vector2.zero;
@@ -166,7 +132,7 @@ internal class DebugMonitorUI : MonoBehaviour
         _progressText.richText = true;
         _progressText.fontSize = BarTextFontSize;
         _progressText.alignment = TextAlignmentOptions.Center;
-        _progressText.font = font;
+        _progressText.font = ModAssets.NanumSquareNeoNormal;
         _progressText.color = BarTextColor;
 
         // Add progress bar text outline for readability

UI/FFmpegDownloadUI.cs

@@ -88,11 +88,11 @@ internal class FFmpegDownloadUI : MonoBehaviour
     private static TMP_FontAsset GetNanumSquareNeoBdFontAsset()
     {
         TMP_FontAsset? font = null;
-        if (RenderMod.FontBundle)
+        if (ModAssets.FontBundle)
         {
             try
             {
-                font = RenderMod.FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
+                font = ModAssets.FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
             }
             catch
             {

UI/RendererUIManager.cs

@@ -1,25 +1,68 @@
+using System.Diagnostics.CodeAnalysis;
+using ADOFAIRenderer.Util;
+using MelonLoader;
 using O5Kit.Core;
+using TMPro;
 
 namespace ADOFAIRenderer.UI;
 
 using UnityEngine;
 
-public class RendererUIManager : MonoBehaviour
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal static class ModAssets
+{
+    public static void Load()
+    {
+        FontBundle = BundleLoader.GetBundle("fonts");
+        NanumSquareNeoNormal = FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Bd SDF");
+        NanumSquareNeoBold = FontBundle.LoadAsset<TMP_FontAsset>("NanumSquareNeoOTF-Eb SDF");
+        Melon<RenderMod>.Logger.Msg("Fonts loaded successfully.");
+            
+        ShaderBundle = BundleLoader.GetBundle("shaders");
+        ColorConversionShader = ShaderBundle.LoadAsset<ComputeShader>("ColorConversion");
+        Melon<RenderMod>.Logger.Msg("Shader loaded successfully.");
+    }
+
+    public static AssetBundle FontBundle = null!;
+    public static AssetBundle ShaderBundle = null!;
+
+    public static TMP_FontAsset NanumSquareNeoNormal = null!;
+    public static TMP_FontAsset NanumSquareNeoBold = null!;
+    
+    public static ComputeShader ColorConversionShader = null!;
+}
+
+internal sealed class RendererFontProvider : IFontProvider
+{
+    private static readonly DefaultFontProvider DefaultFontProvider = new();
+    private bool _disposed;
+
+    public TMP_FontAsset Regular => ModAssets.NanumSquareNeoNormal;
+    public TMP_FontAsset Medium => ModAssets.NanumSquareNeoBold;
+    public TMP_FontAsset Monospace => DefaultFontProvider.Monospace;
+
+    public void Dispose()
+    {
+        if (_disposed) return;
+        _disposed = true;
+    }
+}
+
+internal class RendererUIManager : MonoBehaviour
 {
     private static RendererUIManager? _instance;
     public static RendererUIManager Instance
     {
         get
         {
-            if (_instance == null)
-            {
-                var go = new GameObject("RendererUIManager");
-                DontDestroyOnLoad(go);
-                _instance = go.AddComponent<RendererUIManager>();
-            }
+            if (_instance != null) return _instance;
+            
+            var go = new GameObject("RendererUIManager");
+            DontDestroyOnLoad(go);
+            
+            _instance = go.AddComponent<RendererUIManager>();
             return _instance;
         }
-        private set => _instance = value;
     }
 
     public static O5Context Context => Instance._context;
@@ -37,7 +80,30 @@ public class RendererUIManager : MonoBehaviour
                 MiddleClickToDefault = true,
                 SliderSensitivity = 1.0f
             },
-            theme: O5Theme.Dark
+            theme: O5Theme.Dark with
+            {
+                PanelBG = new Color(0.067f, 0.067f, 0.067f, 1f),
+                TopBar = new Color(0f, 0f, 0f, 0.6f),
+                MenuBG = new Color(0f, 0f, 0f, 0.6f),
+                MenuHover = new Color(1.000f, 0.294f, 0.079f, .6f),
+                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),
+                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),
+                CardHeader = new Color(0.157f, 0f, 0f, 1f),
+                CardPanel = new Color(0, 0, 0, 0f),
+                SoftRed = new Color(1.000f, 0.576f, 0.590f, 1f),
+                MathOk = new Color(0.408f, 0.827f, 0.569f, 1f),
+                MathWarn = new Color(0.964f, 0.647f, 0.315f, 1f),
+                MathErr = new Color(1.000f, 0.576f, 0.590f, 1f),
+                CornerRadius = 12, OutlineWidth = 2, ControlHeight = 40, FontSizeBody = 18, FontSizeH1 = 48,
+                Outline = new Color(1f, 1f, 1f, 0.2f),
+                TextDimAlpha = 1f
+            },
+            fonts: new RendererFontProvider()
         );
         
         _windowManager = O5WindowManager.Create(_context, transform, "RendererMod_Canvas");

UI/Window/RenderConfigWindow.cs

@@ -1,15 +1,54 @@
-using ADOFAIRenderer.Localization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using ADOFAIRenderer.API;
+using ADOFAIRenderer.Core;
+using ADOFAIRenderer.Data;
+using ADOFAIRenderer.Localization;
+using ADOFAIRenderer.Util;
+using ADOFAIRenderer.Util.FFmpeg;
+using MelonLoader;
+using O5Kit.Control;
 using O5Kit.Core;
 using O5Kit.Factory;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace ADOFAIRenderer.UI.Window;
 
 internal static class RenderConfigWindow
 {
     private static O5Window? _configWindow;
-    
-    // 윈도우 만드는 메서드...
+
+    // Controls cache for validation & sync
+    private static O5Slider? _renderFpsSlider;
+    private static O5Slider? _videoFPSSlider;
+    private static O5Slider? _renderWidthSlider;
+    private static O5Slider? _renderHeightSlider;
+    private static O5Slider? _delayAfterEndSlider;
+    private static O5Toggle? _showJudgementToggle;
+
+    private static O5Dropdown<Codec>? _codecDropdown;
+    private static O5Dropdown<RateControlMode>? _rateControlDropdown;
+    private static O5InputField? _bitrateInput;
+    private static O5InputField? _maxBitrateInput;
+    private static O5InputField? _qpInput;
+    private static O5Slider? _keyframeIntervalSlider;
+    private static O5Toggle? _forceSoftwareToggle;
+
+    private static O5Toggle? _renderAudioToggle;
+    private static O5Dropdown<int>? _sampleRateDropdown;
+    private static O5Dropdown<int>? _channelsDropdown;
+    private static O5Slider? _audioBitrateSlider;
+
+    private static O5InputField? _outputDirInput;
+
+    private static O5Dropdown<string>? _fileExtensionDropdown;
+    private static O5InputField? _randomSeedInput;
+    private static O5Toggle? _processAudioToggle;
+    private static O5Toggle? _nonTileToggle;
+
     public static void CreateWindow()
     {
         if (_configWindow == null)
@@ -18,7 +57,7 @@ internal static class RenderConfigWindow
             {
                 Id = "RendererMod_RenderConfig",
                 Title = LocalizationManager.Get("ui.render_config.window_title"),
-                Size = new Vector2(580f, 420f),
+                Size = new Vector2(580f, 480f),
                 Draggable = true,
                 Resizable = true,
                 ShowCloseButton = true
@@ -28,20 +67,708 @@ internal static class RenderConfigWindow
             {
                 win.Rect.gameObject.SetActive(false);
             };
-            
+
             BuildUI(_configWindow.Content);
         }
+        
+        // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
+        var config = RenderManager.Instance.Configuration ??= new RenderConfig();
+        ApplyConfigToUI(config);
 
         SetWindowActive(true);
+        _configWindow.BringToFront();
     }
 
     private static void BuildUI(RectTransform content)
     {
-        var (viewport, scrollContent, scroller) = 
-            O5Factory.ScrollView(RendererUIManager.Context, content, spacing: 10f);
+        var ctx = RendererUIManager.Context;
+        var (viewport, scrollContent, scroller) =
+            O5Factory.ScrollView(ctx, content, spacing: 10f, padding: 8f);
+
+        // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
+        var config = RenderManager.Instance.Configuration ??= new RenderConfig();
+        EnsureDefaultConfig(config);
+
+        double[] renderFpsSnap = { 23.976, 24, 29.97, 30, 59.94, 60, 144, 
+            120, 240, 360, 480, 600, 720, // +120
+            288, 576, 864, 1152, 1440, 1728, // +288
+            3000 // MAX
+        };
+        double[] videoFpsSnap = { 23.976, 24, 29.97, 30, 59.94, 60, 72,
+            120, 180, 240, 300, 360, 420, 480, 540, // +60
+            144, 216, 288, 432, 504, 576, // +72
+            600 // MAX
+        };
         
-        // TODO: RenderFPS double 입력칸, VideoFPS double 입력칸, RenderWidth int (>0) 입력칸, RenderHeight int (>0) 입력칸, Video Encoding Config, Audio Encoding Config, Delay After Level End double (>=0) 입력칸, Show Judgement Toggle, Global Settings, Advanced Settings, Go Render 버튼 
-        // NOTE: 한 가로줄에 두개씩
+        double[] audioBitrateSnap = { 64, 96, 128, 192, 256, 320, 384 };
+        
+        // 1-3. Top section: 좌/우 컨테이너 1개씩으로 3행을 쌓는다 (중앙선 1개)
+        var (topLeft, topRight) = CreateTwoColumnPanel(scrollContent, spacing: 8f, columnSpacing: 10f);
+        
+        _renderFpsSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(topLeft),
+            defaultValue: 60, min: 0.01, max: 3000, value: 60,
+            format: "F3", clampMode: ClampMode.All,
+
+            sliderFilter: value => renderFpsSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            inputFilter: null, onComplete: null, onChanged: val => { config.RenderFPS = val; },
+            text: LocalizationManager.Get("ui.render_config.render_fps"),
+            id: "slider_render_fps", showFill: true
+        );
+        
+        _videoFPSSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(topRight), 
+            defaultValue: 60, min: 0.01, max: 600, value: 60,
+            format: "F3", clampMode: ClampMode.All,
+            
+            sliderFilter: value => videoFpsSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            inputFilter: null, onComplete: null, onChanged: val => { config.VideoFPS = val; },
+            text: LocalizationManager.Get("ui.render_config.video_fps"),
+            id: "slider_video_fps", showFill: true
+        );
+
+        _renderWidthSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(topLeft),
+            defaultValue: 2560, min: 0, max: 15360, value: 2560,
+            format: "F0", clampMode: ClampMode.All,
+            
+            sliderFilter: value => Math.Max(value, 2), 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
+        );
+        
+        _renderHeightSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(topRight),
+            defaultValue: 1440, min: 0, max: 8640, value: 1440,
+            format: "F0", clampMode: ClampMode.All,
+            
+            sliderFilter: value => Math.Max(value, 2), inputFilter: value => Math.Max(value, 2), 
+            onComplete: null, onChanged: val => { config.RenderWidth = (int)Math.Round(val); },
+            text: LocalizationManager.Get("ui.render_config.render_height"),
+            id: "slider_render_height", showFill: true
+        );
+        
+        _delayAfterEndSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(topLeft),
+            defaultValue: 15, min: 0, max: 9999.999, value: 15,
+            format: "F3", clampMode: ClampMode.All,
+            
+            sliderFilter: null, inputFilter: null, 
+            onComplete: null, onChanged: val => { config.DelayAfterEnd = val; },
+            text: LocalizationManager.Get("ui.render_config.delay_after_end"),
+            id: "slider_delay_after_end", showFill: true
+        );
+        
+        _showJudgementToggle = CreateToggleField(
+            ctx, CreateFieldSlot(topRight), "",
+            false, config.ShowJudgementText,
+            LocalizationManager.Get("ui.render_config.show_judgement"),
+            "toggle_show_judgement",
+            val => config.ShowJudgementText = val,
+            generateLabel: false
+        );
+
+        // 4. Video Encoding Config (Collapsible Card)
+        var (_, videoContent) = O5Factory.Card(
+            ctx, scrollContent,
+            LocalizationManager.Get("ui.render_config.video_encoding"),
+            activeValue: true,
+            onActiveChanged: null,
+            onDeleteClick: null,
+            showDeleteButton: false,
+            showActiveToggle: false
+        );
+
+        var (videoLeft, videoRight) = CreateTwoColumnPanel(videoContent);
+        var codecs = (Codec[])Enum.GetValues(typeof(Codec));
+        _codecDropdown = CreateDropdownField(
+            ctx, CreateFieldSlot(videoLeft),
+            LocalizationManager.Get("ui.render_config.codec"),
+            Codec.H264, config.VideoConfig.Codec,
+            codecs, c => c.ToString(),
+            "dd_video_codec",
+            c => config.VideoConfig.Codec = c
+        );
+        _bitrateInput = CreateInputField(
+            ctx, CreateFieldSlot(videoLeft),
+            LocalizationManager.Get("ui.render_config.bitrate"),
+            "30000", config.VideoConfig.Bitrate.ToString(),
+            "input_bitrate",
+            TMPro.TMP_InputField.CharacterValidation.Integer,
+            val => { if (int.TryParse(val, out var b) && b > 0) config.VideoConfig.Bitrate = b; }
+        );
+        _qpInput = CreateInputField(
+            ctx, CreateFieldSlot(videoLeft),
+            LocalizationManager.Get("ui.render_config.qp"),
+            "18", config.VideoConfig.QP.ToString(),
+            "input_qp",
+            TMPro.TMP_InputField.CharacterValidation.Integer,
+            val => { if (int.TryParse(val, out var qp) && qp >= 0) config.VideoConfig.QP = qp; }
+        );
+
+        var rateModes = (RateControlMode[])Enum.GetValues(typeof(RateControlMode));
+        _rateControlDropdown = CreateDropdownField(
+            ctx, CreateFieldSlot(videoRight),
+            LocalizationManager.Get("ui.render_config.rate_control"),
+            RateControlMode.CBR, config.VideoConfig.RateControlMode,
+            rateModes, m => m.ToString(),
+            "dd_rate_control",
+            m => config.VideoConfig.RateControlMode = m
+        );
+        _maxBitrateInput = CreateInputField(
+            ctx, CreateFieldSlot(videoRight),
+            LocalizationManager.Get("ui.render_config.max_bitrate"),
+            "50000", config.VideoConfig.MaxBitrate.ToString(),
+            "input_max_bitrate",
+            TMPro.TMP_InputField.CharacterValidation.Integer,
+            val => { if (int.TryParse(val, out var mb) && mb > 0) config.VideoConfig.MaxBitrate = mb; }
+        );
+        
+        _forceSoftwareToggle = CreateToggleField(
+            ctx, CreateFieldSlot(videoRight), "",
+            true, config.VideoConfig.ForceSoftwareEncoder,
+            LocalizationManager.Get("ui.render_config.force_software"),
+            "toggle_force_software",
+            val => config.AudioConfig.RenderAudio = val,
+            generateLabel: true
+        );
+
+        _keyframeIntervalSlider = O5Factory.Slider(
+            ctx: ctx, parent: videoContent,
+            defaultValue: 2, min: 0.1, max: 10, value: 2,
+            format: "F1", clampMode: ClampMode.All,
+            
+            sliderFilter: null, inputFilter: null, 
+            onComplete: null, onChanged: val => { config.VideoConfig.KeyframeInterval = val; },
+            text: LocalizationManager.Get("ui.render_config.keyframe_interval"),
+            id: "slider_keyframe_interval", showFill: true
+        );
+
+        // 5. Audio Encoding Config (Collapsible Card)
+        var (_, audioContent) = O5Factory.Card(
+            ctx, scrollContent,
+            LocalizationManager.Get("ui.render_config.audio_encoding"),
+            activeValue: true,
+            onActiveChanged: null,
+            onDeleteClick: null,
+            showDeleteButton: false,
+            showActiveToggle: false
+        );
+
+        var (audioLeft, audioRight) = CreateTwoColumnPanel(audioContent);
+        _renderAudioToggle = CreateToggleField(
+            ctx, CreateFieldSlot(audioLeft), "",
+            true, config.AudioConfig.RenderAudio,
+            LocalizationManager.Get("ui.render_config.render_audio"),
+            "toggle_render_audio",
+            val => config.AudioConfig.RenderAudio = val,
+            generateLabel: false
+        );
+        
+        _audioBitrateSlider = O5Factory.Slider(
+            ctx: ctx, parent: CreateFieldSlot(audioRight),
+            defaultValue: 256, min: 64, max: 384, value: 256,
+            format: "F0", clampMode: ClampMode.All,
+
+            sliderFilter: value => audioBitrateSnap.OrderBy(n => Math.Abs(n - value)).First(),
+            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
+        );
+        
+        var channels = new[] { 1, 2 };
+        _channelsDropdown = CreateDropdownField(
+            ctx, CreateFieldSlot(audioLeft),
+            LocalizationManager.Get("ui.render_config.channels"),
+            2, config.AudioConfig.AudioChannels,
+            channels, c => c == 1 ? "1 (Mono)" : "2 (Stereo)",
+            "dd_channels",
+            c => config.AudioConfig.AudioChannels = c
+        );
+
+        var sampleRates = new[] { 44100, 48000, 96000 };
+        _sampleRateDropdown = CreateDropdownField(
+            ctx, CreateFieldSlot(audioRight),
+            LocalizationManager.Get("ui.render_config.sample_rate"),
+            48000, config.AudioConfig.AudioSampleRate,
+            sampleRates, r => $"{r/1000.0} kHz",
+            "dd_sample_rate",
+            r => config.AudioConfig.AudioSampleRate = r
+        );
+
+        // 6. Global Settings (Collapsible Card)
+        var (_, globalContent) = O5Factory.Card(
+            ctx, scrollContent,
+            LocalizationManager.Get("ui.render_config.global_settings"),
+            activeValue: true,
+            onActiveChanged: null,
+            onDeleteClick: null,
+            showDeleteButton: false,
+            showActiveToggle: false
+        );
+
+        _outputDirInput = CreateFullWidthInputField(
+            ctx, globalContent,
+            LocalizationManager.Get("ui.render_config.output_dir"),
+            GlobalSettings.DefaultOutputDirectory,
+            GlobalSettings.EffectiveOutputDirectory,
+            "input_output_dir",
+            val =>
+            {
+                var trimmed = val?.Trim() ?? string.Empty;
+                if (string.IsNullOrWhiteSpace(trimmed) ||
+                    string.Equals(trimmed, GlobalSettings.DefaultOutputDirectory, StringComparison.OrdinalIgnoreCase))
+                {
+                    GlobalSettings.Current.OutputDirectory = null;
+                }
+                else
+                {
+                    GlobalSettings.Current.OutputDirectory = trimmed;
+                }
+            }
+        );
+
+        var (globalLeft, globalRight) = CreateTwoColumnPanel(globalContent);
+        O5Factory.Button(
+            ctx, globalLeft,
+            () =>
+            {
+                var initial = string.IsNullOrWhiteSpace(_outputDirInput.Value)
+                    ? GlobalSettings.DefaultOutputDirectory
+                    : _outputDirInput.Value;
+                FolderDialogUtil.OpenFolderBrowser(initial, selected =>
+                {
+                    if (!string.IsNullOrWhiteSpace(selected))
+                    {
+                        _outputDirInput.Set(selected);
+                        GlobalSettings.Current.OutputDirectory = selected;
+                        GlobalSettings.Save();
+                    }
+                });
+            },
+            LocalizationManager.Get("ui.render_config.browse"),
+            "btn_browse_output"
+        );
+
+        O5Factory.Button(
+            ctx, globalRight,
+            () =>
+            {
+                _outputDirInput.Set(GlobalSettings.DefaultOutputDirectory);
+                GlobalSettings.Current.OutputDirectory = null;
+                GlobalSettings.Save();
+            },
+            LocalizationManager.Get("ui.render_config.reset_default"),
+            "btn_reset_output"
+        );
+
+        // 7. Advanced Settings (Collapsible Card)
+        var (_, advContent) = O5Factory.Card(
+            ctx, scrollContent,
+            LocalizationManager.Get("ui.render_config.advanced_settings"),
+            activeValue: true,
+            onActiveChanged: null,
+            onDeleteClick: null,
+            showDeleteButton: false,
+            showActiveToggle: false
+        );
+
+        var (advLeft, advRight) = CreateTwoColumnPanel(advContent);
+        var extensions = new[] { "mkv", "mp4", "mov", "webm", "avi" };
+        _fileExtensionDropdown = CreateDropdownField(
+            ctx, CreateFieldSlot(advLeft),
+            LocalizationManager.Get("ui.render_config.file_extension"),
+            "mkv", config.AdvancedConfig.FileExtension,
+            extensions, e => e,
+            "dd_adv_file_extension",
+            e => { if (!string.IsNullOrEmpty(e)) config.AdvancedConfig.FileExtension = e; }
+        );
+        _processAudioToggle = CreateToggleField(
+            ctx, CreateFieldSlot(advLeft), "",
+            true, config.AdvancedConfig.ProcessAudio,
+            LocalizationManager.Get("ui.render_config.process_audio"),
+            "toggle_process_audio",
+            val => config.AdvancedConfig.ProcessAudio = val,
+            generateLabel: false
+        );
+
+        _randomSeedInput = CreateInputField(
+            ctx, CreateFieldSlot(advRight),
+            LocalizationManager.Get("ui.render_config.random_seed"),
+            "", config.AdvancedConfig.RandomSeed?.ToString() ?? "",
+            "input_random_seed",
+            TMPro.TMP_InputField.CharacterValidation.Integer,
+            val =>
+            {
+                if (int.TryParse(val, out var s)) config.AdvancedConfig.RandomSeed = s;
+                else if (string.IsNullOrWhiteSpace(val)) config.AdvancedConfig.RandomSeed = null;
+            }
+        );
+        _nonTileToggle = CreateToggleField(
+            ctx, CreateFieldSlot(advRight), "",
+            false, config.AdvancedConfig.NonTile,
+            LocalizationManager.Get("ui.render_config.non_tile"),
+            "toggle_non_tile",
+            val => config.AdvancedConfig.NonTile = val,
+            generateLabel: false
+        );
+
+        // 8. Go Render Button
+        O5Factory.Button(
+            ctx, scrollContent,
+            TryGoRender,
+            LocalizationManager.Get("ui.render_config.go_render"),
+            "btn_go_render",
+            height: 48f
+        );
+    }
+
+    private static void EnsureDefaultConfig(RenderConfig config)
+    {
+        if (config.RenderWidth <= 0) config.RenderWidth = Screen.width > 0 ? Screen.width : 2560;
+        if (config.RenderHeight <= 0) config.RenderHeight = Screen.height > 0 ? Screen.height : 1440;
+        if (config.RenderFPS <= 0) config.RenderFPS = 60.0;
+        if (config.VideoFPS <= 0) config.VideoFPS = 60.0;
+        if (config.DelayAfterEnd < 0) config.DelayAfterEnd = 15.0;
+    }
+
+    private static void ApplyConfigToUI(RenderConfig config)
+    {
+        EnsureDefaultConfig(config);
+
+        _renderFpsSlider?.Set((float) config.RenderFPS, false);
+        _videoFPSSlider?.Set((float) config.VideoFPS, false);
+        _renderWidthSlider?.Set(config.RenderWidth, false);
+        _renderHeightSlider?.Set(config.RenderHeight, false);
+        _delayAfterEndSlider?.Set((float) config.DelayAfterEnd, false);
+        _showJudgementToggle?.Set(config.ShowJudgementText, false);
+
+        _codecDropdown?.Set(config.VideoConfig.Codec, false);
+        _rateControlDropdown?.Set(config.VideoConfig.RateControlMode, false);
+        _bitrateInput?.Set(config.VideoConfig.Bitrate.ToString(), false);
+        _maxBitrateInput?.Set(config.VideoConfig.MaxBitrate.ToString(), false);
+        _qpInput?.Set(config.VideoConfig.QP.ToString(), false);
+        _keyframeIntervalSlider?.Set(config.VideoConfig.KeyframeInterval, false);
+        _forceSoftwareToggle?.Set(config.VideoConfig.ForceSoftwareEncoder, false);
+
+        _renderAudioToggle?.Set(config.AudioConfig.RenderAudio, false);
+        _sampleRateDropdown?.Set(config.AudioConfig.AudioSampleRate, false);
+        _channelsDropdown?.Set(config.AudioConfig.AudioChannels, false);
+        _audioBitrateSlider?.Set(config.AudioConfig.AudioBitrate / 1000.0, false);
+
+        _outputDirInput?.Set(GlobalSettings.EffectiveOutputDirectory, false);
+
+        _fileExtensionDropdown?.Set(config.AdvancedConfig.FileExtension, false);
+        _randomSeedInput?.Set(config.AdvancedConfig.RandomSeed?.ToString() ?? "", false);
+        _processAudioToggle?.Set(config.AdvancedConfig.ProcessAudio, false);
+        _nonTileToggle?.Set(config.AdvancedConfig.NonTile, false);
+    }
+
+    private static void TryGoRender()
+    {
+        var config = RenderManager.Instance.Configuration;
+
+        // Sync Video Config
+        if (_bitrateInput != null && int.TryParse(_bitrateInput.Value, out var bitrate) && bitrate > 0)
+        {
+            config.VideoConfig.Bitrate = bitrate;
+        }
+        if (_maxBitrateInput != null && int.TryParse(_maxBitrateInput.Value, out var maxBitrate) && maxBitrate > 0)
+        {
+            config.VideoConfig.MaxBitrate = maxBitrate;
+        }
+        if (_qpInput != null && int.TryParse(_qpInput.Value, out var qp) && qp >= 0)
+        {
+            config.VideoConfig.QP = qp;
+        }
+
+        // Sync Advanced Config
+        if (_randomSeedInput != null)
+        {
+            if (int.TryParse(_randomSeedInput.Value, out var seed))
+            {
+                config.AdvancedConfig.RandomSeed = seed;
+            }
+            else if (string.IsNullOrWhiteSpace(_randomSeedInput.Value))
+            {
+                config.AdvancedConfig.RandomSeed = null;
+            }
+        }
+
+        // Sync Output Directory
+        if (_outputDirInput != null)
+        {
+            var path = _outputDirInput.Value.Trim();
+            if (string.IsNullOrWhiteSpace(path) ||
+                string.Equals(path, GlobalSettings.DefaultOutputDirectory, StringComparison.OrdinalIgnoreCase))
+            {
+                GlobalSettings.Current.OutputDirectory = null;
+            }
+            else
+            {
+                try
+                {
+                    var fullPath = Path.GetFullPath(path);
+                    if (!Directory.Exists(fullPath))
+                    {
+                        Directory.CreateDirectory(fullPath);
+                    }
+                    GlobalSettings.Current.OutputDirectory = fullPath;
+                }
+                catch (Exception ex)
+                {
+                    ShowValidationError($"Output directory path is invalid:\n{ex.Message}");
+                    return;
+                }
+            }
+        }
+
+        GlobalSettings.Save();
+        SetWindowActive(false);
+
+        new RenderSession().Start(config, RenderManager.Instance.levelPath);
+    }
+
+    private static void ShowValidationError(string message)
+    {
+        Melon<RenderMod>.Logger.Error(message);
+        CommonWarningDialogUI.ShowDialog(
+            LocalizationManager.Get("ui.render_config.validation_title"),
+            message,
+            new DialogButton("OK", () => { })
+        );
+    }
+
+    // 카드(또는 상단 섹션)당 하나의 좌/우 컨테이너를 만들어
+    // 가로 한 줄 두 필드 사이 중앙이 행마다 어긋나지 않도록 한다.
+    // - 패널 1개 = 중앙선 1개 (행마다 HLG를 만들던 기존 방식의 P1-P2 어긋남 방지)
+    // - 좌/우 컬럼은 preferredWidth=0 + flexibleWidth=1 로 항상 50:50
+    // - 각 필드는 Field 슬롯(label 18 + 간격 3 + 컨트롤 50)으로 높이를 고정해
+    //   좌/우 스택을 써도 행 단위 Y 정렬이 유지되도록 한다.
+    private static (RectTransform left, RectTransform right) CreateTwoColumnPanel(
+        Transform parent, float spacing = 8f, float columnSpacing = 8f)
+    {
+        var panelObj = new GameObject("TwoColPanel");
+        panelObj.transform.SetParent(parent, false);
+
+        panelObj.AddComponent<RectTransform>();
+
+        var hLayout = panelObj.AddComponent<HorizontalLayoutGroup>();
+        hLayout.spacing = spacing;
+        hLayout.padding = new RectOffset(0, 0, 0, 0);
+        hLayout.childAlignment = TextAnchor.UpperCenter;
+        hLayout.childControlWidth = true;
+        hLayout.childControlHeight = true;
+        hLayout.childForceExpandWidth = true;
+        hLayout.childForceExpandHeight = false;
+
+        // ReSharper disable once InconsistentNaming
+        var panelLE = panelObj.AddComponent<LayoutElement>();
+        panelLE.flexibleWidth = 1f;
+
+        var left = CreateColumn(panelObj.transform, "LeftCol", columnSpacing);
+        var right = CreateColumn(panelObj.transform, "RightCol", columnSpacing);
+
+        return (left, right);
+    }
+
+    private static RectTransform CreateColumn(Transform parent, string name, float spacing)
+    {
+        var colObj = new GameObject(name);
+        colObj.transform.SetParent(parent, false);
+        var colRect = colObj.AddComponent<RectTransform>();
+
+        var colLayout = colObj.AddComponent<VerticalLayoutGroup>();
+        colLayout.spacing = spacing;
+        colLayout.padding = new RectOffset(0, 0, 0, 0);
+        colLayout.childControlWidth = true;
+        colLayout.childControlHeight = true;
+        colLayout.childForceExpandWidth = true;
+        colLayout.childForceExpandHeight = false;
+
+        // ReSharper disable once InconsistentNaming
+        // 핵심: 좌/우 선호 너비를 0으로 강제해 항상 정확히 절반씩 나누도록 한다.
+        // (기존 행마다 HLG 방식은 라벨/값 텍스트 길이에 따라 preferred가 달라져
+        //  중앙이 (W + P1 - P2) / 2 로 행마다 틀어졌음)
+        var colLE = colObj.AddComponent<LayoutElement>();
+        colLE.minWidth = 0f;
+        colLE.preferredWidth = 0f;
+        colLE.flexibleWidth = 1f;
+
+        return colRect;
+    }
+
+    private static RectTransform CreateFieldSlot(Transform column)
+    {
+        var slotObj = new GameObject("Field");
+        slotObj.transform.SetParent(column, false);
+        var slotRect = slotObj.AddComponent<RectTransform>();
+
+        var slotLayout = slotObj.AddComponent<VerticalLayoutGroup>();
+        slotLayout.spacing = 3f;
+        slotLayout.padding = new RectOffset(0, 0, 0, 0);
+        slotLayout.childControlWidth = true;
+        slotLayout.childControlHeight = true;
+        slotLayout.childForceExpandWidth = true;
+        slotLayout.childForceExpandHeight = false;
+
+        // ReSharper disable once InconsistentNaming
+        var slotLE = slotObj.AddComponent<LayoutElement>();
+        slotLE.flexibleWidth = 1f;
+
+        return slotRect;
+    }
+
+    private static O5InputField CreateInputField(
+        O5Context ctx,
+        Transform colParent,
+        string labelText,
+        string? defaultValue,
+        string value,
+        string id,
+        TMPro.TMP_InputField.CharacterValidation characterValidation = TMPro.TMP_InputField.CharacterValidation.None,
+        Action<string>? onChanged = null)
+    {
+        var label = O5Factory.ControlText(ctx, colParent, 13f, noPad: true);
+        label.text = labelText;
+        label.color = ctx.Theme.TextDim;
+        
+        // ReSharper disable once InconsistentNaming
+        var labelLE = label.gameObject.AddComponent<LayoutElement>();
+        labelLE.preferredHeight = 18f;
+        labelLE.minHeight = 18f;
+
+        var inputField = O5Factory.Input(
+            ctx: ctx,
+            parent: colParent,
+            defaultValue: defaultValue,
+            value: value,
+            onChanged: onChanged,
+            placeholder: labelText,
+            icon: null,
+            id: id
+        );
+
+        inputField.InputField.characterValidation = characterValidation;
+        return inputField;
+    }
+
+    private static O5InputField CreateFullWidthInputField(
+        O5Context ctx,
+        Transform parent,
+        string labelText,
+        string? defaultValue,
+        string value,
+        string id,
+        Action<string>? onChanged = null)
+    {
+        var container = new GameObject($"FullWidth_{id}");
+        container.transform.SetParent(parent, false);
+
+        var containerRect = container.AddComponent<RectTransform>();
+        var layout = container.AddComponent<VerticalLayoutGroup>();
+        layout.spacing = 3f;
+        layout.childControlWidth = true;
+        layout.childControlHeight = true;
+        layout.childForceExpandWidth = true;
+        layout.childForceExpandHeight = false;
+
+        var label = O5Factory.ControlText(ctx, containerRect, 13f, noPad: true);
+        label.text = labelText;
+        label.color = ctx.Theme.TextDim;
+        
+        // ReSharper disable once InconsistentNaming
+        var labelLE = label.gameObject.AddComponent<LayoutElement>();
+        labelLE.preferredHeight = 18f;
+        labelLE.minHeight = 18f;
+
+        var input = O5Factory.Input(
+            ctx: ctx,
+            parent: containerRect,
+            defaultValue: defaultValue,
+            value: value,
+            onChanged: onChanged,
+            placeholder: labelText,
+            icon: null,
+            id: id
+        );
+
+        return input;
+    }
+
+    private static O5Toggle CreateToggleField(
+        O5Context ctx,
+        Transform colParent,
+        string labelText,
+        bool? defaultValue,
+        bool value,
+        string toggleText,
+        string id,
+        Action<bool>? onChanged = null,
+        bool generateLabel = true)
+    {
+        if (generateLabel)
+        {
+            var label = O5Factory.ControlText(ctx, colParent, 13f, noPad: true);
+            label.text = labelText;
+            label.color = ctx.Theme.TextDim;
+
+            // ReSharper disable once InconsistentNaming
+            var labelLE = label.gameObject.AddComponent<LayoutElement>();
+            labelLE.preferredHeight = 18f;
+            labelLE.minHeight = 18f;
+        }
+
+        return O5Factory.Toggle(
+            ctx: ctx,
+            parent: colParent,
+            defaultValue: defaultValue,
+            value: value,
+            onChanged: onChanged,
+            text: toggleText,
+            id: id
+        );
+    }
+
+    private static O5Dropdown<T> CreateDropdownField<T>(
+        O5Context ctx,
+        Transform colParent,
+        string labelText,
+        T defaultValue,
+        T value,
+        IReadOnlyList<T> values,
+        Func<T, string> display,
+        string id,
+        Action<T>? onChanged = null)
+    {
+        var label = O5Factory.ControlText(ctx, colParent, 13f, noPad: true);
+        label.text = labelText;
+        label.color = ctx.Theme.TextDim;
+        
+        // ReSharper disable once InconsistentNaming
+        var labelLE = label.gameObject.AddComponent<LayoutElement>();
+        labelLE.preferredHeight = 18f;
+        labelLE.minHeight = 18f;
+
+        var ddContainer = new GameObject($"DD_{id}");
+        ddContainer.transform.SetParent(colParent, false);
+        
+        // ReSharper disable once InconsistentNaming
+        var ddLE = ddContainer.AddComponent<LayoutElement>();
+        ddLE.preferredHeight = 50f;
+        ddLE.minHeight = 0f;
+
+        return O5Factory.DropDown(
+            ctx: ctx,
+            parent: ddContainer.transform,
+            defaultValue: defaultValue,
+            value: value,
+            values: values,
+            display: display,
+            onChanged: val => { if (val != null) onChanged?.Invoke(val); },
+            id: id
+        );
     }
 
     private static void SetWindowActive(bool enabled)

Util/BundleLoader.cs

@@ -4,41 +4,40 @@ using System.Resources;
 using MelonLoader;
 using UnityEngine;
 
-namespace ADOFAIRenderer.Util
+namespace ADOFAIRenderer.Util;
+
+internal static class BundleLoader
 {
-    internal static class BundleLoader
+    private static readonly string BundlePlatform;
+    private static readonly Assembly? ExecutingAssembly;
+
+    static BundleLoader()
     {
-        private static readonly string BundlePlatform;
-        private static readonly Assembly? ExecutingAssembly;
-
-        static BundleLoader()
+        BundlePlatform = Application.platform switch
         {
-            BundlePlatform = Application.platform switch
-            {
-                RuntimePlatform.WindowsPlayer => "Win64",
-                RuntimePlatform.OSXPlayer => "OSX",
-                _ => "Linux"
-            };
-            ExecutingAssembly = Assembly.GetExecutingAssembly();
-        }
+            RuntimePlatform.WindowsPlayer => "Win64",
+            RuntimePlatform.OSXPlayer => "OSX",
+            _ => "Linux"
+        };
+        ExecutingAssembly = Assembly.GetExecutingAssembly();
+    }
 
-        public static AssetBundle GetBundle(string resourcePath)
+    public static AssetBundle GetBundle(string resourcePath)
+    {
+        if (ExecutingAssembly != null)
         {
-            if (ExecutingAssembly != null)
+            var bundlePath = $"ADOFAIRenderer.Bundle.{BundlePlatform}.{resourcePath}";
+            using var resourceStream = ExecutingAssembly.GetManifestResourceStream(bundlePath);
+            if (resourceStream != null)
             {
-                var bundlePath = $"ADOFAIRenderer.Bundle.{BundlePlatform}.{resourcePath}";
-                using var resourceStream = ExecutingAssembly.GetManifestResourceStream(bundlePath);
-                if (resourceStream != null)
-                {
-                    return AssetBundle.LoadFromStream(resourceStream);
-                }
-                
-                Melon<RenderMod>.Logger.Error($"Could not find bundle resource in DLL.\n{bundlePath}");
-                throw new MissingManifestResourceException("Could not find bundle resource in DLL.");
+                return AssetBundle.LoadFromStream(resourceStream);
             }
-            
-            Melon<RenderMod>.Logger.Error("Executing assembly has not been set properly.");
-            throw new InvalidOperationException("ExecutingAssembly has not been set."); 
+                
+            Melon<RenderMod>.Logger.Error($"Could not find bundle resource in DLL.\n{bundlePath}");
+            throw new MissingManifestResourceException("Could not find bundle resource in DLL.");
         }
+            
+        Melon<RenderMod>.Logger.Error("Executing assembly has not been set properly.");
+        throw new InvalidOperationException("ExecutingAssembly has not been set."); 
     }
 }

Util/FFmpegVideoBGPlayer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using ADOFAIRenderer.UI;
 using ADOFAIRenderer.Util.FFmpeg;
 using MelonLoader;
 using UnityEngine;
@@ -77,7 +78,7 @@ namespace ADOFAIRenderer.Util
             try
             {
                 _decoder = new FFmpegNativeDecoder(videoPath);
-                _computeShader = RenderMod.ColorConversionShader;
+                _computeShader = ModAssets.ColorConversionShader;
 
                 var w = _decoder.Width;
                 var h = _decoder.Height;

Util/FrameReader.cs

@@ -3,6 +3,7 @@ using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using ADOFAIRenderer.Core;
+using ADOFAIRenderer.UI;
 using FFmpeg.AutoGen;
 using MelonLoader;
 using Unity.Collections;
@@ -71,7 +72,7 @@ namespace ADOFAIRenderer.Util
             }
 
             // Check if GPU color conversion is enabled
-            bool useGPUConversion = RenderMod.ColorConversionShader;
+            bool useGPUConversion = ModAssets.ColorConversionShader;
             AVPixelFormat expectedFmt = AVPixelFormat.AV_PIX_FMT_RGBA;
             
             if (useGPUConversion)
@@ -87,31 +88,31 @@ namespace ADOFAIRenderer.Util
             var bufferSize = texture.width * texture.height * 4; // RGBA = 4 channel
             state.Setup(currentFrame, bufferSize, useGPUConversion, expectedFmt, texture.width, texture.height);
 
-            if (useGPUConversion && state.GPUBuffer != null && RenderMod.ColorConversionShader)
+            if (useGPUConversion && state.GPUBuffer != null && ModAssets.ColorConversionShader)
             {
                 int kernelIndex = -1;
                 if (expectedFmt == AVPixelFormat.AV_PIX_FMT_NV12)
                 {
-                    kernelIndex = RenderMod.ColorConversionShader.FindKernel("CSMain_NV12");
+                    kernelIndex = ModAssets.ColorConversionShader.FindKernel("CSMain_NV12");
                 }
                 else if (expectedFmt == AVPixelFormat.AV_PIX_FMT_YUV420P)
                 {
-                    kernelIndex = RenderMod.ColorConversionShader.FindKernel("CSMain_YUV420P");
+                    kernelIndex = ModAssets.ColorConversionShader.FindKernel("CSMain_YUV420P");
                 }
 
                 if (kernelIndex >= 0)
                 {
-                    RenderMod.ColorConversionShader.SetTexture(kernelIndex, SourceTexture, texture);
-                    RenderMod.ColorConversionShader.SetBuffer(kernelIndex, DestinationBuffer, state.GPUBuffer);
-                    RenderMod.ColorConversionShader.SetInt(Width, texture.width);
-                    RenderMod.ColorConversionShader.SetInt(Height, texture.height);
+                    ModAssets.ColorConversionShader.SetTexture(kernelIndex, SourceTexture, texture);
+                    ModAssets.ColorConversionShader.SetBuffer(kernelIndex, DestinationBuffer, state.GPUBuffer);
+                    ModAssets.ColorConversionShader.SetInt(Width, texture.width);
+                    ModAssets.ColorConversionShader.SetInt(Height, texture.height);
 
                     var threadGroupsX = expectedFmt == AVPixelFormat.AV_PIX_FMT_NV12
                         ? (texture.width + 31) / 32
                         : (texture.width + 63) / 64;
                     var threadGroupsY = (texture.height + 15) / 16;
 
-                    RenderMod.ColorConversionShader.Dispatch(kernelIndex, threadGroupsX, threadGroupsY, 1);
+                    ModAssets.ColorConversionShader.Dispatch(kernelIndex, threadGroupsX, threadGroupsY, 1);
 
                     AsyncGPUReadback.Request(
                         state.GPUBuffer,