From 24ed0d3aa98b981e4e75d73bf2b11c6bfe7507c7 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:35:18 +0200 Subject: [PATCH] feat: add 'Enable Asserts' menu item --- Dalamud/Interface/Internal/DalamudInterface.cs | 18 ++++++++++++++---- lib/ImGuiScene | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index 68c733ee2..c782fe44e 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -12,6 +12,7 @@ using Dalamud.Logging.Internal; using Dalamud.Plugin.Internal; using Dalamud.Utility; using ImGuiNET; +using ImGuiScene.ManagedAsserts; using Serilog.Events; namespace Dalamud.Interface.Internal @@ -87,6 +88,8 @@ namespace Dalamud.Interface.Internal this.windowSystem.AddWindow(this.settingsWindow); this.windowSystem.AddWindow(this.selfTestWindow); + ImGuiManagedAsserts.EnableAsserts = true; + this.dalamud.InterfaceManager.Draw += this.OnDraw; Log.Information("Windows added"); @@ -426,10 +429,6 @@ namespace Dalamud.Interface.Internal ImGui.Separator(); - ImGui.MenuItem("Draw ImGui demo", string.Empty, ref this.isImGuiDrawDemoWindow); - - ImGui.Separator(); - if (ImGui.MenuItem("Unload Dalamud")) { this.dalamud.Unload(); @@ -458,6 +457,17 @@ namespace Dalamud.Interface.Internal ImGui.EndMenu(); } + if (ImGui.BeginMenu("GUI")) + { + ImGui.MenuItem("Draw ImGui demo", string.Empty, ref this.isImGuiDrawDemoWindow); + + ImGui.Separator(); + + ImGui.MenuItem("Enable Asserts", string.Empty, ref ImGuiManagedAsserts.EnableAsserts); + + ImGui.EndMenu(); + } + if (ImGui.BeginMenu("Game")) { if (ImGui.MenuItem("Replace ExceptionHandler")) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index f54c1d795..304d78d22 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit f54c1d79540cd7789900b23459c6c14ed74127e2 +Subproject commit 304d78d229d3bbca46d3e0752761c732e98ffe03