ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-18 05:47:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move ReShadeAddonInterface into sep. ns.

Browse source
This commit is contained in:
Soreepeong 2024-07-22 19:24:34 +09:00
parent 1f315be94e
commit 80ac97fea8
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Interface/Internal/InterfaceManager.AsReShadeAddon.cs
View file

@ -11,7 +11,7 @@ namespace Dalamud.Interface.Internal;
/// </summary> /// </summary>
internal partial class InterfaceManager 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<IDXGISwapChain>(); var swapChain = swapchain.GetNative<IDXGISwapChain>();
if (this.scene?.SwapChain.NativePointer != (nint)swapChain) if (this.scene?.SwapChain.NativePointer != (nint)swapChain)
@ -20,7 +20,7 @@ internal partial class InterfaceManager
this.scene?.OnPreResize(); this.scene?.OnPreResize();
} }
private unsafe void ReShadeAddonInterfaceOnInitSwapChain(ref ReShadeAddonInterface.ApiObject swapchain) private unsafe void ReShadeAddonInterfaceOnInitSwapChain(ref ReShadeHandling.ReShadeAddonInterface.ApiObject swapchain)
{ {
var swapChain = swapchain.GetNative<IDXGISwapChain>(); var swapChain = swapchain.GetNative<IDXGISwapChain>();
if (this.scene?.SwapChain.NativePointer != (nint)swapChain) 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); 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(); var swapChain = runtime.GetNative();

8
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -90,7 +90,7 @@ internal partial class InterfaceManager : IInternalDisposableService
private Hook<SetCursorDelegate>? setCursorHook; private Hook<SetCursorDelegate>? setCursorHook;
private Hook<DxgiPresentDelegate>? dxgiPresentHook; private Hook<DxgiPresentDelegate>? dxgiPresentHook;
private Hook<ResizeBuffersDelegate>? resizeBuffersHook; private Hook<ResizeBuffersDelegate>? resizeBuffersHook;
private ReShadeAddonInterface? reShadeAddonInterface; private ReShadeHandling.ReShadeAddonInterface? reShadeAddonInterface;
private IFontAtlas? dalamudAtlas; private IFontAtlas? dalamudAtlas;
private ILockedImFont? defaultFontResourceLock; private ILockedImFont? defaultFontResourceLock;
@ -759,7 +759,7 @@ internal partial class InterfaceManager : IInternalDisposableService
this.SetCursorDetour); this.SetCursorDetour);
Log.Verbose("===== S W A P C H A I N ====="); 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<ResizeBuffersDelegate>.FromAddress( this.resizeBuffersHook = Hook<ResizeBuffersDelegate>.FromAddress(
(nint)SwapChainHelper.GameDeviceSwapChainVtbl->ResizeBuffers, (nint)SwapChainHelper.GameDeviceSwapChainVtbl->ResizeBuffers,
@ -768,8 +768,8 @@ internal partial class InterfaceManager : IInternalDisposableService
Log.Verbose( Log.Verbose(
"Registered as a ReShade({name}: 0x{addr:X}) addon.", "Registered as a ReShade({name}: 0x{addr:X}) addon.",
ReShadeAddonInterface.ReShadeModule!.FileName, ReShadeHandling.ReShadeAddonInterface.ReShadeModule!.FileName,
ReShadeAddonInterface.ReShadeModule!.BaseAddress); ReShadeHandling.ReShadeAddonInterface.ReShadeModule!.BaseAddress);
this.reShadeAddonInterface.InitSwapChain += this.ReShadeAddonInterfaceOnInitSwapChain; this.reShadeAddonInterface.InitSwapChain += this.ReShadeAddonInterfaceOnInitSwapChain;
this.reShadeAddonInterface.DestroySwapChain += this.ReShadeAddonInterfaceOnDestroySwapChain; this.reShadeAddonInterface.DestroySwapChain += this.ReShadeAddonInterfaceOnDestroySwapChain;
this.reShadeAddonInterface.ReShadeOverlay += this.ReShadeAddonInterfaceOnReShadeOverlay; this.reShadeAddonInterface.ReShadeOverlay += this.ReShadeAddonInterfaceOnReShadeOverlay;

2
Dalamud/Interface/Internal/ReShadeAddonInterface.AddonEvent.cs → Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.AddonEvent.cs
View file

@ -1,4 +1,4 @@
namespace Dalamud.Interface.Internal; namespace Dalamud.Interface.Internal.ReShadeHandling;
/// <summary>ReShade interface.</summary> /// <summary>ReShade interface.</summary>
internal sealed partial class ReShadeAddonInterface internal sealed partial class ReShadeAddonInterface

2
Dalamud/Interface/Internal/ReShadeAddonInterface.Exports.cs → Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.Exports.cs
View file

@ -8,7 +8,7 @@ using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.Windows; using static TerraFX.Interop.Windows.Windows;
namespace Dalamud.Interface.Internal; namespace Dalamud.Interface.Internal.ReShadeHandling;
/// <summary>ReShade interface.</summary> /// <summary>ReShade interface.</summary>
[SuppressMessage( [SuppressMessage(

14
Dalamud/Interface/Internal/ReShadeAddonInterface.cs → Dalamud/Interface/Internal/ReShadeHandling/ReShadeAddonInterface.cs
View file

@ -10,7 +10,7 @@ using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.Windows; using static TerraFX.Interop.Windows.Windows;
namespace Dalamud.Interface.Internal; namespace Dalamud.Interface.Internal.ReShadeHandling;
/// <summary>ReShade interface.</summary> /// <summary>ReShade interface.</summary>
internal sealed unsafe partial class ReShadeAddonInterface : IDisposable internal sealed unsafe partial class ReShadeAddonInterface : IDisposable
@ -53,27 +53,27 @@ internal sealed unsafe partial class ReShadeAddonInterface : IDisposable
/// <summary>Finalizes an instance of the <see cref="ReShadeAddonInterface"/> class.</summary> /// <summary>Finalizes an instance of the <see cref="ReShadeAddonInterface"/> class.</summary>
~ReShadeAddonInterface() => this.ReleaseUnmanagedResources(); ~ReShadeAddonInterface() => this.ReleaseUnmanagedResources();
/// <summary>Delegate for <see cref="AddonEvent.ReShadeOverlay"/>.</summary> /// <summary>Delegate for <see cref="ReShadeAddonInterface.AddonEvent.ReShadeOverlay"/>.</summary>
/// <param name="effectRuntime">Reference to the ReShade runtime.</param> /// <param name="effectRuntime">Reference to the ReShade runtime.</param>
public delegate void ReShadeOverlayDelegate(ref ApiObject effectRuntime); public delegate void ReShadeOverlayDelegate(ref ApiObject effectRuntime);
/// <summary>Delegate for <see cref="AddonEvent.InitSwapChain"/>.</summary> /// <summary>Delegate for <see cref="ReShadeAddonInterface.AddonEvent.InitSwapChain"/>.</summary>
/// <param name="swapChain">Reference to the ReShade SwapChain wrapper.</param> /// <param name="swapChain">Reference to the ReShade SwapChain wrapper.</param>
public delegate void ReShadeInitSwapChain(ref ApiObject swapChain); public delegate void ReShadeInitSwapChain(ref ApiObject swapChain);
/// <summary>Delegate for <see cref="AddonEvent.DestroySwapChain"/>.</summary> /// <summary>Delegate for <see cref="ReShadeAddonInterface.AddonEvent.DestroySwapChain"/>.</summary>
/// <param name="swapChain">Reference to the ReShade SwapChain wrapper.</param> /// <param name="swapChain">Reference to the ReShade SwapChain wrapper.</param>
public delegate void ReShadeDestroySwapChain(ref ApiObject swapChain); public delegate void ReShadeDestroySwapChain(ref ApiObject swapChain);
private delegate BOOL GetModuleHandleExWDelegate(uint dwFlags, ushort* lpModuleName, HMODULE* phModule); private delegate BOOL GetModuleHandleExWDelegate(uint dwFlags, ushort* lpModuleName, HMODULE* phModule);
/// <summary>Called on <see cref="AddonEvent.ReShadeOverlay"/>.</summary> /// <summary>Called on <see cref="ReShadeAddonInterface.AddonEvent.ReShadeOverlay"/>.</summary>
public event ReShadeOverlayDelegate? ReShadeOverlay; public event ReShadeOverlayDelegate? ReShadeOverlay;
/// <summary>Called on <see cref="AddonEvent.InitSwapChain"/>.</summary> /// <summary>Called on <see cref="ReShadeAddonInterface.AddonEvent.InitSwapChain"/>.</summary>
public event ReShadeInitSwapChain? InitSwapChain; public event ReShadeInitSwapChain? InitSwapChain;
/// <summary>Called on <see cref="AddonEvent.DestroySwapChain"/>.</summary> /// <summary>Called on <see cref="ReShadeAddonInterface.AddonEvent.DestroySwapChain"/>.</summary>
public event ReShadeDestroySwapChain? DestroySwapChain; public event ReShadeDestroySwapChain? DestroySwapChain;
/// <summary>Registers Dalamud as a ReShade addon.</summary> /// <summary>Registers Dalamud as a ReShade addon.</summary>