Add ImNodes, ImPlot, and ImGuizmo addons from Hexa.NET.ImGui

Directory.Packages.props

@@ -9,9 +9,13 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="Hexa.NET.ImGui" Version="2.2.8.4" />
+    <PackageVersion Include="Hexa.NET.ImGuizmo" Version="2.2.8.4" />
+    <PackageVersion Include="Hexa.NET.ImNodes" Version="2.2.8.4" />
+    <PackageVersion Include="Hexa.NET.ImPlot" Version="2.2.8.4" />
     <PackageVersion Include="ktsu.Invoker" Version="1.1.0" />
     <PackageVersion Include="ktsu.ScopedAction" Version="1.1.2" />
-    <PackageVersion Include="ktsu.StrongPaths" Version="1.3.2" />
+    <PackageVersion Include="ktsu.Extensions" Version="1.5.6" />
+    <PackageVersion Include="ktsu.Semantics" Version="1.0.19" />
     <PackageVersion Include="Silk.NET" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Assimp" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Direct3D12" Version="2.22.0" />
@@ -21,7 +25,7 @@
     <PackageVersion Include="Silk.NET.OpenGLES" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.OpenXR" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Windowing.Sdl" Version="2.22.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.10" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
     <PackageVersion Include="System.Text.Json" Version="9.0.7" />
     <!-- Test Dependencies -->
     <PackageVersion Include="Moq" Version="4.20.72" />
@@ -33,11 +37,11 @@
     <PackageVersion Include="Microsoft.Testing.Extensions.HotReload" Version="1.7.3" />
     <PackageVersion Include="Microsoft.Testing.Extensions.Retry" Version="1.7.3" />
     <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.3" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.9.3" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.9.3" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.10.0" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.10.0" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
     <!-- SDK Dependencies -->
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>

ImGuiApp.Test/AdvancedCoverageTests.cs

@@ -7,6 +7,7 @@ namespace ktsu.ImGuiApp.Test;
 using System;
 using Hexa.NET.ImGui;
 using ktsu.ImGuiApp.ImGuiController;
+using ktsu.Semantics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 /// <summary>
@@ -179,8 +180,8 @@ public void ImGuiApp_WindowState_MultipleAccess_ReturnsConsistentValues()
 	[TestMethod]
 	public void ImGuiApp_Textures_MultipleAccess_ReturnsSameInstance()
 	{
-		System.Collections.Concurrent.ConcurrentDictionary<StrongPaths.AbsoluteFilePath, ImGuiAppTextureInfo> textures1 = ImGuiApp.Textures;
-		System.Collections.Concurrent.ConcurrentDictionary<StrongPaths.AbsoluteFilePath, ImGuiAppTextureInfo> textures2 = ImGuiApp.Textures;
+		System.Collections.Concurrent.ConcurrentDictionary<AbsoluteFilePath, ImGuiAppTextureInfo> textures1 = ImGuiApp.Textures;
+		System.Collections.Concurrent.ConcurrentDictionary<AbsoluteFilePath, ImGuiAppTextureInfo> textures2 = ImGuiApp.Textures;
 
 		// Should return the same collection instance
 		Assert.AreSame(textures1, textures2);

ImGuiApp.Test/ImGuiAppCoreTests.cs

@@ -6,7 +6,7 @@ namespace ktsu.ImGuiApp.Test;
 
 using System.Collections.Concurrent;
 using ktsu.Extensions;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 /// <summary>

ImGuiApp.Test/ImGuiAppDataStructureTests.cs

@@ -6,7 +6,7 @@ namespace ktsu.ImGuiApp.Test;
 
 using System.Numerics;
 using ktsu.Extensions;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Silk.NET.Windowing;
 

ImGuiApp.Test/ImGuiAppTests.cs

@@ -2,15 +2,13 @@
 // All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 [assembly: DoNotParallelize]
 
 namespace ktsu.ImGuiApp.Test;
 
 using System.Numerics;
 using ktsu.Extensions;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Silk.NET.Core.Contexts;

ImGuiApp.Test/ImGuiAppWindowManagementTests.cs

@@ -5,8 +5,7 @@
 namespace ktsu.ImGuiApp.Test;
 
 using System.Numerics;
-
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Silk.NET.Windowing;

ImGuiApp/DebugLogger.cs

@@ -5,7 +5,7 @@
 namespace ktsu.ImGuiApp;
 
 using ktsu.Extensions;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 
 /// <summary>
 /// Simple file logger for debugging crashes

ImGuiApp/ImGuiApp.cs

@@ -15,7 +15,7 @@
 using ktsu.ImGuiApp.ImGuiController;
 using ktsu.Invoker;
 using ktsu.ScopedAction;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 using Silk.NET.Input;
 using Silk.NET.OpenGL;
 using Silk.NET.Windowing;
@@ -31,12 +31,12 @@
 [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "This class is the main entry point for the ImGui application and requires many dependencies. Consider refactoring in the future.")]
 public static partial class ImGuiApp
 {
 	internal static IWindow? window;
 	internal static GL? gl;
 	internal static ImGuiController.ImGuiController? controller;
 	internal static IInputContext? inputContext;
 	internal static OpenGLProvider? glProvider;
 	internal static IntPtr currentGLContextHandle; // Track the current GL context handle
 
 	internal static ImGuiAppWindowState LastNormalWindowState { get; set; } = new();
 
@@ -58,7 +58,7 @@
 	}
 
 	internal static ConcurrentDictionary<string, int> FontIndices { get; } = [];
 	internal static float lastFontScaleFactor;
 	internal static readonly List<GCHandle> currentPinnedFontData = [];
 
 	/// <summary>
@@ -91,8 +91,8 @@
 	/// </summary>
 	public static bool IsIdle { get; private set; }
 
 	internal static DateTime lastInputTime = DateTime.UtcNow;
 	internal static double targetFrameTimeMs = 1000.0 / 30.0; // Default to 30 FPS (33.33ms per frame)
 	internal static readonly PidFrameLimiter frameLimiter = new();
 	internal static double previousTargetFrameTimeMs = 1000.0 / 30.0;
 
@@ -337,6 +337,8 @@
 			UpdateWindowPerformance();
 			UpdatePerformanceMonitoring((float)delta);
 
+			// SetupContext prepares ImGui context for this frame
+			controller?.SetupContext();
 			controller?.Update((float)delta);
 			config.OnUpdate?.Invoke((float)delta);
 			Invoker.DoInvokes();
@@ -510,7 +512,7 @@
 		{
 			// Temporarily keep console window visible for debugging
 			// if (OperatingSystem.IsWindows())
 			// {
 			//     DebugLogger.Log("ImGuiApp.Start: Hiding console window");
 			//     nint handle = NativeMethods.GetConsoleWindow();
 			//     NativeMethods.ShowWindow(handle, SW_HIDE);

ImGuiApp/ImGuiApp.csproj

@@ -7,9 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Hexa.NET.ImGui" />
+    <PackageReference Include="ktsu.Extensions" />
     <PackageReference Include="ktsu.Invoker" />
     <PackageReference Include="ktsu.ScopedAction" />
-    <PackageReference Include="ktsu.StrongPaths" />
+    <PackageReference Include="ktsu.Semantics" />
     <PackageReference Include="Silk.NET" />
     <PackageReference Include="Silk.NET.Assimp" />
     <PackageReference Include="Silk.NET.Direct3D12" />

ImGuiApp/ImGuiAppTextureInfo.cs

@@ -4,7 +4,7 @@
 
 namespace ktsu.ImGuiApp;
 using Hexa.NET.ImGui;
-using ktsu.StrongPaths;
+using ktsu.Semantics;
 
 /// <summary>
 /// Represents information about a texture, including its file path, texture ID, width, and height.

ImGuiApp/ImGuiController/ImGuiController.cs

@@ -45,6 +45,8 @@ internal class ImGuiController : IDisposable
 
 	internal bool _disposed;
 
+	internal ImGuiContextPtr imGuiContextPtr;
+
 	/// <summary>
 	/// Constructs a new ImGuiController.
 	/// </summary>
@@ -102,8 +104,8 @@ public ImGuiController(GL gl, IView view, IInputContext input, ImGuiFontConfig?
 
 		SetPerFrameImGuiData(1f / 60f);
 
-		DebugLogger.Log("ImGuiController: Beginning frame");
-		BeginFrame();
+		DebugLogger.Log("ImGuiController: Setting up input handlers");
+		SetupInputHandlers();
 		DebugLogger.Log("ImGuiController: Initialization completed");
 	}
 
@@ -115,15 +117,24 @@ internal void Init(GL gl, IView view, IInputContext input)
 		_windowWidth = view.Size.X;
 		_windowHeight = view.Size.Y;
 
-		ImGui.CreateContext();
+		imGuiContextPtr = ImGui.CreateContext();
+
+		// Initialize ImGui extensions (ImGuizmo, ImNodes, ImPlot) if available
+		ImGuiExtensionManager.Initialize();
+
+		// Create extension contexts and apply dark styles
+		ImGuiExtensionManager.CreateExtensionContexts();
+
+		SetupContext();
 
 		ImGui.StyleColorsDark();
 	}
 
-	internal void BeginFrame()
+	/// <summary>
+	/// Sets up input event handlers. Should only be called once during initialization.
+	/// </summary>
+	internal void SetupInputHandlers()
 	{
-		ImGui.NewFrame();
-		_frameBegun = true;
 		_keyboard = _input?.Keyboards[0];
 		_mouse = _input?.Mice[0];
 		if (_view is not null)
@@ -147,6 +158,16 @@ internal void BeginFrame()
 		}
 	}
 
+	/// <summary>
+	/// Sets up ImGui context for the current frame. Should be called every frame before Update().
+	/// </summary>
+	internal void SetupContext()
+	{
+		// Set context for ImGui and extensions
+		ImGui.SetCurrentContext(imGuiContextPtr);
+		ImGuiExtensionManager.SetImGuiContext(imGuiContextPtr);
+	}
+
 	/// <summary>
 	/// Delegate to receive keyboard key down events.
 	/// </summary>
@@ -265,8 +286,13 @@ internal void Update(float deltaSeconds)
 		SetPerFrameImGuiData(deltaSeconds);
 		UpdateImGuiInput();
 
-		_frameBegun = true;
+		// Start ImGui frame first
 		ImGui.NewFrame();
+		_frameBegun = true;
+
+		// IMPORTANT: Call extension BeginFrame methods AFTER ImGui.NewFrame()
+		// ImGuizmo, ImNodes, and ImPlot require ImGui to have started the frame first
+		ImGuiExtensionManager.BeginFrame();
 	}
 
 	/// <summary>
@@ -933,6 +959,9 @@ protected virtual void Dispose(bool disposing)
 				_fontTexture.Dispose();
 				_shader.Dispose();
 
+				// Cleanup extension contexts before destroying ImGui context
+				ImGuiExtensionManager.Cleanup();
+
 				ImGui.DestroyContext();
 			}
 		}