ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

WIP updates for direct render testing. Currently ImGui draws, but basically off into space and nothing is visible. Working on porting some reshade logic to see if we can get away with simple additional targets and msaa handling

Browse source
This commit is contained in:
meli 2019-12-28 18:24:54 -08:00
parent c618626345
commit 661e79aa2f
4 changed files with 108 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Dalamud.cs
View file

@ -84,8 +84,8 @@ namespace Dalamud {
this.WinSock2 = new WinSockHandlers();
this.InterfaceManager = new InterfaceManager();
this.InterfaceManager.Start();
this.InterfaceManager = new InterfaceManager(this, this.sigScanner);
//this.InterfaceManager.Start();
try {
this.PluginManager.LoadPlugins();

22
Dalamud/Game/Internal/DXGI/SwapChainAddressResolver.cs Normal file
View file

@ -0,0 +1,22 @@
using System;
using System.Diagnostics;
using System.Linq;
using Serilog;
namespace Dalamud.Game.Internal.DXGI
{
public sealed class SwapChainAddressResolver : BaseAddressResolver
{
public IntPtr Present { get; private set; }
protected override void Setup64Bit(SigScanner sig)
{
var module = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().First(m => m.ModuleName == "dxgi.dll");
Log.Debug($"Found DXGI: {module.BaseAddress.ToInt64():X}");
var scanner = new SigScanner(module);
Present = scanner.ScanModule("48 89 5C 24 ?? 48 89 74 24 ?? 55 57 41 56 48 8D 6C 24 ??");
}
}
}

109
Dalamud/Interface/InterfaceManager.cs
View file

@ -1,51 +1,108 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using Dalamud.Game;
using Dalamud.Game.Internal.DXGI;
using Dalamud.Hooking;
using ImGuiNET;
using ImGuiScene;
using Serilog;
namespace Dalamud.Interface
{
public class InterfaceManager : IDisposable
{
private Task _task;
[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
private delegate IntPtr PresentDelegate(IntPtr swapChain, uint syncInterval, uint presentFlags);
private readonly Hook<PresentDelegate> presentHook;
private SwapChainAddressResolver Address { get; }
//private Task _task;
private RawDX11Scene _scene;
private Dalamud _dalamud;
public InterfaceManager(Dalamud dalamud, SigScanner scanner)
{
this._dalamud = dalamud;
Address = new SwapChainAddressResolver();
Address.Setup(scanner);
Log.Verbose("===== S W A P C H A I N =====");
Log.Verbose("Present address {Present}", Address.Present);
this.presentHook =
new Hook<PresentDelegate>(Address.Present,
new PresentDelegate(PresentDetour),
this);
Enable();
}
public void Enable()
{
this.presentHook.Enable();
}
public void Disable()
{
this.presentHook.Disable();
}
public void Dispose()
{
_task?.Wait();
_task = null;
this._scene.Dispose();
this.presentHook.Dispose();
//_task?.Wait();
//_task = null;
}
public void Start()
//public void Start()
//{
// if (_task == null || _task.IsCompleted || _task.IsFaulted || _task.IsCanceled)
// {
// _task = new Task(Display);
// _task.Start();
// }
//}
//private void Display()
//{
// using (var scene = SimpleImGuiScene.CreateOverlay(RendererFactory.RendererBackend.DirectX11))
// {
// // this basically pauses background rendering to reduce cpu load by the scene when it isn't actively in focus
// // the impact is generally pretty minor, but it's probably best to enable when we can
// // If we have any windows that we want to update dynamically even when the game is the focus
// // and not the overlay, this should be disabled.
// // It is dynamic, so we could disable it only when dynamic windows are open etc
// scene.PauseWhenUnfocused = true;
// scene.OnBuildUI += DrawUI;
// scene.Run();
// }
//}
//private void DrawUI()
//{
// ImGui.ShowDemoWindow();
//}
private IntPtr PresentDetour(IntPtr swapChain, uint syncInterval, uint presentFlags)
{
if (_task == null || _task.IsCompleted || _task.IsFaulted || _task.IsCanceled)
if (_scene == null)
{
_task = new Task(Display);
_task.Start();
_scene = new RawDX11Scene(swapChain);
}
}
private void Display()
{
using (var scene = SimpleImGuiScene.CreateOverlay(RendererFactory.RendererBackend.DirectX11))
{
// this basically pauses background rendering to reduce cpu load by the scene when it isn't actively in focus
// the impact is generally pretty minor, but it's probably best to enable when we can
// If we have any windows that we want to update dynamically even when the game is the focus
// and not the overlay, this should be disabled.
// It is dynamic, so we could disable it only when dynamic windows are open etc
scene.PauseWhenUnfocused = true;
_scene.Render();
scene.OnBuildUI += DrawUI;
scene.Run();
}
}
private void DrawUI()
{
ImGui.ShowDemoWindow();
return this.presentHook.Original(swapChain, syncInterval, presentFlags);
}
}
}

2
lib/ImGuiScene

@ -1 +1 @@
Subproject commit d0f143197f4620150cadf1020c45bfaf856e7801
Subproject commit 82b3509a40d5311afbd0ecf0e9494ccf43c554ff