diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -25,7 +25,6 @@ using ImGuiNET.SampleProgram.XNA; using ImGuiNET; -using ImPlotNET; using TraceryNet; using Encompass; using Ink.Runtime; diff --git a/isometric-park-fna/ImGuiRenderer.cs b/isometric-park-fna/ImGuiRenderer.cs --- a/isometric-park-fna/ImGuiRenderer.cs +++ b/isometric-park-fna/ImGuiRenderer.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Runtime.InteropServices; -using ImPlotNET; namespace ImGuiNET.SampleProgram.XNA { @@ -45,9 +44,6 @@ { var context = ImGui.CreateContext(); ImGui.SetCurrentContext(context); - var plotContext = ImPlot.CreateContext(); - ImPlot.SetCurrentContext(plotContext); - ImPlot.SetImGuiContext(context); _game = game ?? throw new ArgumentNullException(nameof(game)); _graphicsDevice = game.GraphicsDevice; diff --git a/isometric-park-fna/UI/DebugWindow.cs b/isometric-park-fna/UI/DebugWindow.cs --- a/isometric-park-fna/UI/DebugWindow.cs +++ b/isometric-park-fna/UI/DebugWindow.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using ImGuiNET; -using ImPlotNET; using ImGuiNET.SampleProgram.XNA; using Num = System.Numerics; @@ -37,7 +36,6 @@ private Texture2D _xnaTexture; private IntPtr _imGuiTexture; private bool show_test_window; - private bool show_implot_test_window; public ImFontPtr monoFont; public ImFontPtr italicFont; @@ -190,7 +188,6 @@ float f = 0.0f; bool show_test_window = false; - bool show_implot_test_window = false; bool show_another_window = false; Num.Vector3 clear_color = new Num.Vector3(114f / 255f, 144f / 255f, 154f / 255f); byte[] _textBuffer = new byte[100]; @@ -204,7 +201,6 @@ ImGui.SliderFloat("float", ref f, 0.0f, 1.0f, string.Empty); ImGui.ColorEdit3("clear color", ref clear_color); if (ImGui.Button("Test Window")) show_test_window = !show_test_window; - if (ImGui.Button("Implot Test Window")) show_implot_test_window = !show_implot_test_window; if (ImGui.Button("Another Window")) show_another_window = !show_another_window; ImGui.Text(string.Format("Application average {0:F3} ms/frame ({1:F1} FPS)", 1000f / ImGui.GetIO().Framerate, ImGui.GetIO().Framerate)); @@ -251,9 +247,6 @@ this.show_test_window = !this.show_test_window; } - if (ImGui.Button("Implot Test Window")) { - show_implot_test_window = !show_implot_test_window; - } if (ImGui.Button("Test Logging")) { Logging.Log(LogLevel.Critical, "Test"); @@ -325,10 +318,6 @@ ImGui.SetNextWindowPos(new Num.Vector2(650, 20), ImGuiCond.FirstUseEver); ImGui.ShowDemoWindow(ref show_test_window); } - if (this.show_implot_test_window) - { - ImPlot.ShowDemoWindow(ref this.show_implot_test_window); - } } } } diff --git a/isometric-park-fna/UI/Graph.cs b/isometric-park-fna/UI/Graph.cs --- a/isometric-park-fna/UI/Graph.cs +++ b/isometric-park-fna/UI/Graph.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using ImGuiNET; -using ImPlotNET; using JM.LinqFaster; @@ -387,31 +386,6 @@ ImGui.Checkbox("##Logarithmic", ref logarithmic); #endif - - #if DEBUG - ImPlot.PushStyleVar(ImPlotStyleVar.LineWeight, 2.0f); - ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f); - - ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max, ImGuiCond.Always); - if (ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend | ImPlotFlags.NoMousePos )) { - foreach (var key in keys) { - var show = data_sets_show[key]; - var data = data_sets[key]; - var data_array = data_sets[key].ToArray(); - if (data_array.Length > 0 && show) - { - ImPlot.PlotLine(key, ref data_array[0], data_array.Length); - ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1], - new Num.Vector2(5, -10), StyleSets.grey, key); - } - } - - ImPlot.EndPlot(); - } - - ImPlot.PopStyleVar(2); - #endif - ImGui.End(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; StyleSets.defaultSet.pop(); diff --git a/isometric-park-fna/isometric-park-fna-core.csproj b/isometric-park-fna/isometric-park-fna-core.csproj --- a/isometric-park-fna/isometric-park-fna-core.csproj +++ b/isometric-park-fna/isometric-park-fna-core.csproj @@ -31,8 +31,6 @@ - - diff --git a/isometric-park-fna/isometric-park-fna.csproj b/isometric-park-fna/isometric-park-fna.csproj --- a/isometric-park-fna/isometric-park-fna.csproj +++ b/isometric-park-fna/isometric-park-fna.csproj @@ -75,9 +75,6 @@ ImGui.NET ..\packages\ImGui.NET.1.78.0\lib\netstandard2.0\ImGui.NET.dll - - ImPlot.NET - @@ -126,8 +123,6 @@ - -