max/Nerfed
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

working on window handling

Browse Source
This commit is contained in:
max 2024-07-10 23:18:56 +02:00
parent 2c839d8fad
commit 42b978e8c9
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Nerfed.Runtime/Engine.cs
View File

@ -19,7 +19,6 @@ public static class Engine
private static Stopwatch gameTimer;
private static long previousTicks = 0;
private static TimeSpan accumulatedUpdateTime = TimeSpan.Zero;
private static TimeSpan accumulatedDrawTime = TimeSpan.Zero;
// must be a power of 2 so we can do a bitmask optimization when checking worst case
@ -65,6 +64,10 @@ internal static void Run(string[] args)
throw new Exception("Failed to claim window");
}
MainWindow.OnCloseEvent += (w) => {
quit = true;
};
AudioDevice = new AudioDevice();
Controller = new Gui.GuiController(GraphicsDevice, MainWindow, Color.DarkOliveGreen);

35
Nerfed.Runtime/Gui/GuiController.cs
View File

@ -37,7 +37,8 @@ internal class GuiController : IDisposable
private readonly Shader imGuiFragmentShader;
private readonly Sampler imGuiSampler;
private readonly GuiTextureStorage textureStorage = new GuiTextureStorage();
private readonly Dictionary<Window, GCHandle> windows = new Dictionary<Window, GCHandle>(16);
private readonly Dictionary<Window, GCHandle> windowToHandle = new Dictionary<Window, GCHandle>(16);
private readonly Dictionary<ImGuiViewportPtr, Window> imguiToWindow = new Dictionary<ImGuiViewportPtr, Window>(16);
private Texture fontTexture = null;
private uint vertexCount = 0;
@ -49,7 +50,6 @@ internal class GuiController : IDisposable
public GuiController(GraphicsDevice graphicsDevice, Window mainWindow, Color clearColor, ImGuiConfigFlags configFlags = ImGuiConfigFlags.NavEnableKeyboard | ImGuiConfigFlags.DockingEnable | ImGuiConfigFlags.ViewportsEnable)
{
this.mainWindow = mainWindow;
this.graphicsDevice = graphicsDevice;
this.clearColor = clearColor;
resourceUploader = new ResourceUploader(graphicsDevice);
@ -100,7 +100,6 @@ public GuiController(GraphicsDevice graphicsDevice, Window mainWindow, Color cle
BuildFontAtlas();
io.ConfigFlags = configFlags;
//io.MouseDrawCursor = true;
if (!OperatingSystem.IsWindows())
{
@ -167,11 +166,6 @@ public void Update(float deltaTime)
OnGui?.Invoke();
{ // Debug
ImGuiIOPtr io = ImGui.GetIO();
ImGui.Text($"mouse pos: {io.MousePos}");
}
ImGui.EndFrame();
}
@ -557,21 +551,21 @@ private void CreateWindow(ImGuiViewportPtr vp)
private void DestroyWindow(ImGuiViewportPtr vp)
{
if (vp.PlatformUserData == IntPtr.Zero) return;
//Window window = (Window)GCHandle.FromIntPtr(vp.PlatformUserData).Target;
Window window = (Window)GCHandle.FromIntPtr(vp.PlatformUserData).Target;
if(imguiToWindow.TryGetValue(vp, out Window window))
{
graphicsDevice.UnclaimWindow(window);
if (windows.TryGetValue(window, out GCHandle handle))
if (windowToHandle.TryGetValue(window, out GCHandle handle))
{
handle.Free();
windows.Remove(window);
windowToHandle.Remove(window);
}
//graphicsDevice.Wait();
imguiToWindow.Remove(vp);
window.Dispose();
vp.PlatformUserData = IntPtr.Zero;
}
}
private void AddWindow(Window window, ImGuiViewportPtr vp, GCHandle handle)
@ -592,14 +586,12 @@ private void AddWindow(Window window, ImGuiViewportPtr vp, GCHandle handle)
for (int i = 0; i < platformIO.Viewports.Capacity; i++)
{
ImGuiViewportPtr vp = platformIO.Viewports[i];
if(win == (Window)GCHandle.FromIntPtr(vp.PlatformUserData).Target)
{
DestroyWindow(vp);
}
}
};
windows.Add(window, handle);
windowToHandle.Add(window, handle);
imguiToWindow.Add(vp, window);
}
private void ShowWindow(ImGuiViewportPtr vp)
@ -697,7 +689,7 @@ public void Dispose()
imGuiSampler?.Dispose();
resourceUploader?.Dispose();
foreach (KeyValuePair<Window, GCHandle> window in windows)
foreach (KeyValuePair<Window, GCHandle> window in windowToHandle)
{
if (window.Key == mainWindow) continue;
@ -705,6 +697,7 @@ public void Dispose()
window.Key.Dispose();
window.Value.Free();
}
windows.Clear();
windowToHandle.Clear();
imguiToWindow.Clear();
}
}

2
Nerfed.Runtime/Window/Window.cs
View File

@ -136,9 +136,9 @@ private void ProcessMovedChangedEvent(ref SDL.SDL_WindowEvent ev)
private void ProcessCloseEvent(ref SDL.SDL_WindowEvent ev)
{
OnCloseEvent?.Invoke(this);
Engine.GraphicsDevice.UnclaimWindow(this);
Dispose();
OnCloseEvent?.Invoke(this);
}
/// <summary>