From 301cbc12b8e18bacf49ec992f5710eeef792bd88 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Fri, 22 Jan 2021 22:39:42 +0100 Subject: [PATCH 1/5] deps: update ImGuiScene --- Dalamud/Plugin/PluginManager.cs | 4 ++++ lib/ImGuiScene | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dalamud/Plugin/PluginManager.cs b/Dalamud/Plugin/PluginManager.cs index 810bc1ca3..baaad9466 100644 --- a/Dalamud/Plugin/PluginManager.cs +++ b/Dalamud/Plugin/PluginManager.cs @@ -182,6 +182,8 @@ namespace Dalamud.Plugin return false; } + Log.Verbose("Plugin CreateInstance..."); + var plugin = (IDalamudPlugin)Activator.CreateInstance(type); // this happens for raw plugins that don't specify a PluginDefinition - just generate a dummy one to avoid crashes anywhere @@ -202,6 +204,8 @@ namespace Dalamud.Plugin return false; } + Log.Verbose("Plugin Initialize..."); + var dalamudInterface = new DalamudPluginInterface(this.dalamud, type.Assembly.GetName().Name, this.pluginConfigs, reason); plugin.Initialize(dalamudInterface); diff --git a/lib/ImGuiScene b/lib/ImGuiScene index cc64961aa..b74bf95c6 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit cc64961aab96356c3f67ba7ff529448e2d04e4b3 +Subproject commit b74bf95c6def7b2d708d6875741d61344df2509a From 216ce04a74c21a29862bbc9e8d93e34efa4efbed Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Sat, 23 Jan 2021 17:22:04 +0100 Subject: [PATCH 2/5] fix: timestamp brackets --- Dalamud/EntryPoint.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 028325c3d..069c5432d 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -66,7 +66,7 @@ namespace Dalamud { #endif var newLogger = new LoggerConfiguration() - .WriteTo.Async(a => a.File(logPath, outputTemplate: "{Timestamp:HH:mm:ss.fff}[{Level:u3}] {Message:lj}{NewLine}{Exception}")) + .WriteTo.Async(a => a.File(logPath, outputTemplate: "[{Timestamp:HH:mm:ss.fff}][{Level:u3}] {Message:lj}{NewLine}{Exception}")) .WriteTo.EventSink() .MinimumLevel.ControlledBy(levelSwitch) .CreateLogger(); From 484e4579be5baee2247594db24548f915f4a2258 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Tue, 26 Jan 2021 15:52:37 +0100 Subject: [PATCH 3/5] refactor: better log messages --- Dalamud/Dalamud.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index 5bf074dc5..53781dafc 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -263,7 +263,7 @@ namespace Dalamud { Log.Information("Dalamud is ready."); } catch (Exception ex) { - Log.Error(ex, "Oh no! Dalamud::Start() failed."); + Log.Error(ex, "Dalamud::Start() failed."); Unload(); } } @@ -308,9 +308,9 @@ namespace Dalamud { AntiDebug.Dispose(); - Log.Debug("Dalamud::Dispose OK!"); + Log.Debug("Dalamud::Dispose() OK!"); } catch (Exception ex) { - Log.Error(ex, "skjdgjjkodsfg"); + Log.Error(ex, "Dalamud::Dispose() failed."); } } From 31216efc7b0605de2ac739708ebb3a6cbd2fb637 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Tue, 26 Jan 2021 15:52:49 +0100 Subject: [PATCH 4/5] deps: update ImGuiScene --- lib/ImGuiScene | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ImGuiScene b/lib/ImGuiScene index b74bf95c6..ab463eb04 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit b74bf95c6def7b2d708d6875741d61344df2509a +Subproject commit ab463eb0434c1ffa864adfc3699afc2fe707489d From a2ba2faf6fac97829d0d76baaa8fd2dc9c638bca Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Wed, 3 Feb 2021 23:25:28 +0100 Subject: [PATCH 5/5] feat: add frame counter to dev bar --- Dalamud/Interface/DalamudInterface.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dalamud/Interface/DalamudInterface.cs b/Dalamud/Interface/DalamudInterface.cs index 96f6b2c14..64e37a79c 100644 --- a/Dalamud/Interface/DalamudInterface.cs +++ b/Dalamud/Interface/DalamudInterface.cs @@ -22,6 +22,8 @@ namespace Dalamud.Interface { private readonly Dalamud dalamud; + private ulong frameCount = 0; + public DalamudInterface(Dalamud dalamud) { this.dalamud = dalamud; } @@ -239,6 +241,9 @@ namespace Dalamud.Interface if (this.dalamud.Framework.Gui.GameUiHidden) ImGui.BeginMenu("UI is hidden...", false); + ImGui.BeginMenu(this.frameCount.ToString(), false); + this.frameCount++; + ImGui.EndMainMenuBar(); } }