From 80ac97fea874cccffe907b8fd203dab53d7dec53 Mon Sep 17 00:00:00 2001 From: Soreepeong Date: Mon, 22 Jul 2024 19:24:34 +0900 Subject: [PATCH] Move ReShadeAddonInterface into sep. ns. --- .../Internal/InterfaceManager.AsReShadeAddon.cs | 6 +++--- Dalamud/Interface/Internal/InterfaceManager.cs | 8 ++++---- .../ReShadeAddonInterface.AddonEvent.cs | 2 +- .../ReShadeAddonInterface.Exports.cs | 2 +- .../{ => ReShadeHandling}/ReShadeAddonInterface.cs | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) rename Dalamud/Interface/Internal/{ => ReShadeHandling}/ReShadeAddonInterface.AddonEvent.cs (99%) rename Dalamud/Interface/Internal/{ => ReShadeHandling}/ReShadeAddonInterface.Exports.cs (97%) rename Dalamud/Interface/Internal/{ => ReShadeHandling}/ReShadeAddonInterface.cs (90%) diff --git a/Dalamud/Interface/Internal/InterfaceManager.AsReShadeAddon.cs b/Dalamud/Interface/Internal/InterfaceManager.AsReShadeAddon.cs index 0f1eeb707..9c08aaf06 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.AsReShadeAddon.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.AsReShadeAddon.cs @@ -11,7 +11,7 @@ namespace Dalamud.Interface.Internal; /// internal partial class InterfaceManager { - private unsafe void ReShadeAddonInterfaceOnDestroySwapChain(ref ReShadeAddonInterface.ApiObject swapchain) + private unsafe void ReShadeAddonInterfaceOnDestroySwapChain(ref ReShadeHandling.ReShadeAddonInterface.ApiObject swapchain) { var swapChain = swapchain.GetNative(); if (this.scene?.SwapChain.NativePointer != (nint)swapChain) @@ -20,7 +20,7 @@ internal partial class InterfaceManager this.scene?.OnPreResize(); } - private unsafe void ReShadeAddonInterfaceOnInitSwapChain(ref ReShadeAddonInterface.ApiObject swapchain) + private unsafe void ReShadeAddonInterfaceOnInitSwapChain(ref ReShadeHandling.ReShadeAddonInterface.ApiObject swapchain) { var swapChain = swapchain.GetNative(); if (this.scene?.SwapChain.NativePointer != (nint)swapChain) @@ -33,7 +33,7 @@ internal partial class InterfaceManager this.scene?.OnPostResize((int)desc.BufferDesc.Width, (int)desc.BufferDesc.Height); } - private void ReShadeAddonInterfaceOnReShadeOverlay(ref ReShadeAddonInterface.ApiObject runtime) + private void ReShadeAddonInterfaceOnReShadeOverlay(ref ReShadeHandling.ReShadeAddonInterface.ApiObject runtime) { var swapChain = runtime.GetNative(); diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 10d508d99..6bbded0f9 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -90,7 +90,7 @@ internal partial class InterfaceManager : IInternalDisposableService private Hook? setCursorHook; private Hook? dxgiPresentHook; private Hook? resizeBuffersHook; - private ReShadeAddonInterface? reShadeAddonInterface; + private ReShadeHandling.ReShadeAddonInterface? reShadeAddonInterface; private IFontAtlas? dalamudAtlas; private ILockedImFont? defaultFontResourceLock; @@ -759,7 +759,7 @@ internal partial class InterfaceManager : IInternalDisposableService this.SetCursorDetour); Log.Verbose("===== S W A P C H A I N ====="); - if (ReShadeAddonInterface.TryRegisterAddon(out this.reShadeAddonInterface)) + if (ReShadeHandling.ReShadeAddonInterface.TryRegisterAddon(out this.reShadeAddonInterface)) { this.resizeBuffersHook = Hook.FromAddress( (nint)SwapChainHelper.GameDeviceSwapChainVtbl->ResizeBuffers, @@ -768,8 +768,8 @@ internal partial class InterfaceManager : IInternalDisposableService Log.Verbose( "Registered as a ReShade({name}: 0x{addr:X}) addon.", - ReShadeAddonInterface.ReShadeModule!.FileName, - ReShadeAddonInterface.ReShadeModule!.BaseAddress); + ReShadeHandling.ReShadeAddonInterface.ReShadeModule!.FileName, + ReShadeHandling.ReShadeAddonInterface.ReShadeModule!.BaseAddress); this.reShadeAddonInterface.InitSwapChain += this.ReShadeAddonInterfaceOnInitSwapChain; this.reShadeAddonInterface.DestroySwapChain += this.ReShadeAddonInterfaceOnDestroySwapChain; this.reShadeAddonInterface.ReShadeOverlay += this.ReShadeAddonInterfaceOnReShadeOverlay; diff --git a/Dalamud/Interface/Internal/ReShadeAddonInterface.AddonEvent.cs b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.AddonEvent.cs similarity index 99% rename from Dalamud/Interface/Internal/ReShadeAddonInterface.AddonEvent.cs rename to Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.AddonEvent.cs index 23f01875d..c68cf4fb6 100644 --- a/Dalamud/Interface/Internal/ReShadeAddonInterface.AddonEvent.cs +++ b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.AddonEvent.cs @@ -1,4 +1,4 @@ -namespace Dalamud.Interface.Internal; +namespace Dalamud.Interface.Internal.ReShadeHandling; /// ReShade interface. internal sealed partial class ReShadeAddonInterface diff --git a/Dalamud/Interface/Internal/ReShadeAddonInterface.Exports.cs b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.Exports.cs similarity index 97% rename from Dalamud/Interface/Internal/ReShadeAddonInterface.Exports.cs rename to Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.Exports.cs index 3dce1b79b..46d3cc1af 100644 --- a/Dalamud/Interface/Internal/ReShadeAddonInterface.Exports.cs +++ b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.Exports.cs @@ -8,7 +8,7 @@ using TerraFX.Interop.Windows; using static TerraFX.Interop.Windows.Windows; -namespace Dalamud.Interface.Internal; +namespace Dalamud.Interface.Internal.ReShadeHandling; /// ReShade interface. [SuppressMessage( diff --git a/Dalamud/Interface/Internal/ReShadeAddonInterface.cs b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.cs similarity index 90% rename from Dalamud/Interface/Internal/ReShadeAddonInterface.cs rename to Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.cs index 156688c27..df324941e 100644 --- a/Dalamud/Interface/Internal/ReShadeAddonInterface.cs +++ b/Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.cs @@ -10,7 +10,7 @@ using TerraFX.Interop.Windows; using static TerraFX.Interop.Windows.Windows; -namespace Dalamud.Interface.Internal; +namespace Dalamud.Interface.Internal.ReShadeHandling; /// ReShade interface. internal sealed unsafe partial class ReShadeAddonInterface : IDisposable @@ -53,27 +53,27 @@ internal sealed unsafe partial class ReShadeAddonInterface : IDisposable /// Finalizes an instance of the class. ~ReShadeAddonInterface() => this.ReleaseUnmanagedResources(); - /// Delegate for . + /// Delegate for . /// Reference to the ReShade runtime. public delegate void ReShadeOverlayDelegate(ref ApiObject effectRuntime); - /// Delegate for . + /// Delegate for . /// Reference to the ReShade SwapChain wrapper. public delegate void ReShadeInitSwapChain(ref ApiObject swapChain); - /// Delegate for . + /// Delegate for . /// Reference to the ReShade SwapChain wrapper. public delegate void ReShadeDestroySwapChain(ref ApiObject swapChain); private delegate BOOL GetModuleHandleExWDelegate(uint dwFlags, ushort* lpModuleName, HMODULE* phModule); - /// Called on . + /// Called on . public event ReShadeOverlayDelegate? ReShadeOverlay; - /// Called on . + /// Called on . public event ReShadeInitSwapChain? InitSwapChain; - /// Called on . + /// Called on . public event ReShadeDestroySwapChain? DestroySwapChain; /// Registers Dalamud as a ReShade addon.