ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add some verbose logging for font loading

Browse source
This commit is contained in:
goat 2020-09-08 20:55:37 +02:00
parent 84b1dabbd2
commit 6d9b9a5eda
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Dalamud/Interface/InterfaceManager.cs
View file

@ -6,6 +6,7 @@ using System.Linq;
using System.Numerics; using System.Numerics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading;
using CheapLoc; using CheapLoc;
using Dalamud.Game; using Dalamud.Game;
using Dalamud.Game.Internal.DXGI; using Dalamud.Game.Internal.DXGI;
@ -207,9 +208,13 @@ namespace Dalamud.Interface
// Sets up a deferred invocation of font rebuilding, before the next render frame // Sets up a deferred invocation of font rebuilding, before the next render frame
public void RebuildFonts() public void RebuildFonts()
{ {
Log.Verbose("[FONT] RebuildFonts() called");
// don't invoke this multiple times per frame, in case multiple plugins call it // don't invoke this multiple times per frame, in case multiple plugins call it
if (!this.isRebuildingFonts) if (!this.isRebuildingFonts)
{ {
Log.Verbose("[FONT] RebuildFonts() trigger");
this.isRebuildingFonts = true; this.isRebuildingFonts = true;
this.scene.OnNewRenderFrame += RebuildFontsInternal; this.scene.OnNewRenderFrame += RebuildFontsInternal;
} }
@ -300,10 +305,18 @@ namespace Dalamud.Interface
}, GCHandleType.Pinned); }, GCHandleType.Pinned);
IconFont = ImGui.GetIO().Fonts.AddFontFromFileTTF(fontPathIcon, 17.0f, null, iconRangeHandle.AddrOfPinnedObject()); IconFont = ImGui.GetIO().Fonts.AddFontFromFileTTF(fontPathIcon, 17.0f, null, iconRangeHandle.AddrOfPinnedObject());
Log.Verbose("[FONT] Invoke OnBuildFonts");
this.OnBuildFonts?.Invoke(); this.OnBuildFonts?.Invoke();
Log.Verbose("[FONT] OnBuildFonts OK!");
for (var i = 0; i < ImGui.GetIO().Fonts.Fonts.Size; i++) {
Log.Verbose("{0} - {1}", i, ImGui.GetIO().Fonts.Fonts[i].GetDebugName());
}
ImGui.GetIO().Fonts.Build(); ImGui.GetIO().Fonts.Build();
Log.Verbose("[FONT] Fonts built!");
fontConfig.Destroy(); fontConfig.Destroy();
japaneseRangeHandle.Free(); japaneseRangeHandle.Free();
gameRangeHandle.Free(); gameRangeHandle.Free();
@ -313,11 +326,15 @@ namespace Dalamud.Interface
// This is intended to only be called as a handler attached to scene.OnNewRenderFrame // This is intended to only be called as a handler attached to scene.OnNewRenderFrame
private void RebuildFontsInternal() private void RebuildFontsInternal()
{ {
Log.Verbose("[FONT] RebuildFontsInternal() called");
SetupFonts(); SetupFonts();
Log.Verbose("[FONT] RebuildFontsInternal() detaching");
this.scene.OnNewRenderFrame -= RebuildFontsInternal; this.scene.OnNewRenderFrame -= RebuildFontsInternal;
this.scene.InvalidateFonts(); this.scene.InvalidateFonts();
Log.Verbose("[FONT] Font Rebuild OK!");
this.isRebuildingFonts = false; this.isRebuildingFonts = false;
} }

5
Dalamud/Interface/UiBuilder.cs
View file

@ -120,8 +120,11 @@ namespace Dalamud.Interface
/// This will invoke any <see cref="OnBuildFonts"/> handlers and ensure that any loaded fonts are /// This will invoke any <see cref="OnBuildFonts"/> handlers and ensure that any loaded fonts are
/// ready to be used on the next UI frame. /// ready to be used on the next UI frame.
/// </summary> /// </summary>
public void RebuildFonts() => public void RebuildFonts()
{
Log.Verbose("[FONT] {0} plugin is initiating FONT REBUILD", this.namespaceName);
this.dalamud.InterfaceManager.RebuildFonts(); this.dalamud.InterfaceManager.RebuildFonts();
}
/// <summary> /// <summary>
/// Event that is fired when the plugin should open its configuration interface. /// Event that is fired when the plugin should open its configuration interface.