From 6118cfa148d984b8e3f3e5b80dd974d6614f6fdb Mon Sep 17 00:00:00 2001 From: liam Date: Fri, 1 Jul 2022 00:17:55 -0400 Subject: [PATCH] Update ImGuiScene and add ImPlot demo to GUI menu bar element. --- Dalamud/Interface/Internal/DalamudInterface.cs | 6 ++++++ lib/ImGuiScene | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index c9e13b8b5..0dd8e7812 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -27,6 +27,7 @@ using FFXIVClientStructs.FFXIV.Client.System.Framework; using FFXIVClientStructs.FFXIV.Client.UI; using ImGuiNET; using ImGuiScene; +using ImPlotNET; using PInvoke; using Serilog.Events; @@ -70,6 +71,7 @@ namespace Dalamud.Interface.Internal #endif private bool isImGuiDrawDemoWindow = false; + private bool isImPlotDrawDemoWindow = false; private bool isImGuiTestWindowsInMonospace = false; private bool isImGuiDrawMetricsWindow = false; @@ -400,6 +402,9 @@ namespace Dalamud.Interface.Internal if (this.isImGuiDrawDemoWindow) ImGui.ShowDemoWindow(ref this.isImGuiDrawDemoWindow); + if (this.isImPlotDrawDemoWindow) + ImPlot.ShowDemoWindow(ref this.isImPlotDrawDemoWindow); + if (this.isImGuiDrawMetricsWindow) ImGui.ShowMetricsWindow(ref this.isImGuiDrawMetricsWindow); @@ -632,6 +637,7 @@ namespace Dalamud.Interface.Internal { ImGui.MenuItem("Use Monospace font for following windows", string.Empty, ref this.isImGuiTestWindowsInMonospace); ImGui.MenuItem("Draw ImGui demo", string.Empty, ref this.isImGuiDrawDemoWindow); + ImGui.MenuItem("Draw ImPlot demo", string.Empty, ref this.isImPlotDrawDemoWindow); ImGui.MenuItem("Draw metrics", string.Empty, ref this.isImGuiDrawMetricsWindow); ImGui.Separator(); diff --git a/lib/ImGuiScene b/lib/ImGuiScene index 65c26d024..f9540e420 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit 65c26d024c814fda8154022e615073210bb62b3b +Subproject commit f9540e4202dfb1d50e3ab11456b894c0cb0ad186