alysbrooks-public » games » isometric-park-fna

Commit r97:b806215143c6 public

parent | child
Description:
Add Icon font.
Commit status:
[Not Reviewed]
References:
proto-toolbar
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r97:b806215143c6 -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -769,7 +769,7
769 769 status_left = String.Format("{0:},{1:} {2}", this.mouseGrid.X, this.mouseGrid.Y, this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status);
770 770 }
771 771
772 String header_left = String.Format("${0:}|{1:} trees⚘𐂷🌳", this.simulation.money, this.simulation.map.tree_count);
772 String header_left = String.Format("${0:}|{1:} trees⚘𐂷🌳\ue125", this.simulation.money, this.simulation.map.tree_count);
773 773 String header_middle = String.Format("{0:MMMMM yyyy} ({1:})", this.simulation.DateTime, this.simulation.Season);
774 774 // String header_right = String.Format("Press H for help.");
775 775 String header_right = "";
Show file before | Show file after | Show commentsHide comments
@@ -6,6 +6,7
6 6 using Num = System.Numerics;
7 7 using Microsoft.Xna.Framework;
8 8 using Microsoft.Xna.Framework.Graphics;
9 using System.Runtime.InteropServices;
9 10
10 11 namespace isometricparkfna.UI
11 12 {
@@ -38,15 +39,28
38 39 ImGuiIOPtr io = ImGui.GetIO();
39 40 //io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-medium.ttf", 15);
40 41
41 #if DEBUG
42 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-medium.ttf", 15);
43 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-medium.ttf", 15);
44 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-medium.ttf", 17);
45 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 20);
46 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 25);
47 io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 30);
48 #endif
42 // #if DEBUG
43 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-medium.ttf", 15);
44 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-medium.ttf", 15);
45 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-medium.ttf", 17);
46 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 20);
47 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 25);
48 // io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 30);
49 // #endif
50
49 51 this.monoFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 15);
52 unsafe //god this sucks
53 {
54 ImFontConfigPtr config = ImGuiNative.ImFontConfig_ImFontConfig();
55 config.MergeMode = true;
56 var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder());
57 // builder.AddText("\ue125\ue126");
58 var icon_ranges = new ushort[] { 0xe000, 0xe1f4, 0 };
59 GCHandle rangeHandle = GCHandle.Alloc(icon_ranges, GCHandleType.Pinned);
60 io.Fonts.AddFontFromFileTTF(@"Content/typicons.ttf", 15, config, rangeHandle.AddrOfPinnedObject());
61
62
63 }
50 64
51 65 _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering
52 66
Show file before | Show file after | Show commentsHide comments
@@ -111,6 +111,9
111 111 <None Include="Content\iosevka-term-medium.ttf">
112 112 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113 113 </None>
114 <None Include="Content\typicons.ttf">
115 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116 </None>
114 117 <None Include="Content\grammar.json">
115 118 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116 119 </None>
You need to be logged in to leave comments. Login now