ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-25 18:09:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: remove need for AssetManager, pass asset dir via StartInfo

Browse source
This commit is contained in:
goat 2021-01-16 18:57:16 +01:00
parent 79bdf4464e
commit e27ae3fd0c
6 changed files with 78 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Interface/InterfaceManager.cs
View file

@ -274,13 +274,13 @@ namespace Dalamud.Interface
fontConfig.MergeMode = true;
fontConfig.PixelSnapH = true;
var fontPathJp = Path.Combine(this.dalamud.StartInfo.WorkingDirectory, "UIRes", "NotoSansCJKjp-Medium.otf");
var fontPathJp = Path.Combine(this.dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKjp-Medium.otf");
var japaneseRangeHandle = GCHandle.Alloc(GlyphRangesJapanese.GlyphRanges, GCHandleType.Pinned);
DefaultFont = ImGui.GetIO().Fonts.AddFontFromFileTTF(fontPathJp, 17.0f, null, japaneseRangeHandle.AddrOfPinnedObject());
var fontPathGame = Path.Combine(this.dalamud.StartInfo.WorkingDirectory, "UIRes", "gamesym.ttf");
var fontPathGame = Path.Combine(this.dalamud.AssetDirectory.FullName, "UIRes", "gamesym.ttf");
var gameRangeHandle = GCHandle.Alloc(new ushort[]
{
@ -291,7 +291,7 @@ namespace Dalamud.Interface
ImGui.GetIO().Fonts.AddFontFromFileTTF(fontPathGame, 17.0f, fontConfig, gameRangeHandle.AddrOfPinnedObject());
var fontPathIcon = Path.Combine(this.dalamud.StartInfo.WorkingDirectory, "UIRes", "FontAwesome5FreeSolid.otf");
var fontPathIcon = Path.Combine(this.dalamud.AssetDirectory.FullName, "UIRes", "FontAwesome5FreeSolid.otf");
var iconRangeHandle = GCHandle.Alloc(new ushort[]
{