alysbrooks-public/games/isometric-park-fna Commit - r592:ce2d3dd6110a

alysbrooks-public » games » isometric-park-fna

Commit `r592:ce2d3dd6110a` public

parent | child

Description:

Use OCR-A for the Budget window. I think it improves the theming. ?\_(?)_/?

Commit status:

[Not Reviewed]

References:

m6-tiles-and-trees

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r592:ce2d3dd6110a - Wed, 25 May 2022 06:45:24

isometric-park-fna/Content/OCRA.ttf ¶ created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

README.mkd ¶ +1 -1

             Libraries: [FNA](https://fna-xna.github.io/), [SpriteFontPlus](https://github.com/rds1983/SpriteFontPlus), [Tracery.Net](https://github.com/josh-perry/Tracery.Net), [ImGui.NET](http://imgui.net/), and [Encompass-cs](http://moonside.games/docs/encompass/)
-            Fonts: Droid Sans, [Iosevka,](https://typeof.net/Iosevka/) [Typicons by Stephen Hutchings](https://www.s-ings.com/typicons/)
+            Fonts: Droid Sans, [Iosevka,](https://typeof.net/Iosevka/), [Typicons by Stephen Hutchings](https://www.s-ings.com/typicons/), [OCRA}() designed by American Type Founders and converted by Matthew Skala
             Sources for the procedural generation are documented in Sources.md.

isometric-park-fna/FNAGame.cs ¶ +19 -1

             // #endif
                 private SpriteFont monoFont;
                 private SpriteFont largeMonoFont;
+                private SpriteFont ocrFont;
                 private Camera camera = new Camera(new float[] {0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f });
                         new CharacterRange((char) 0x00B7)
                     }
                                                           );
+                    var bakedOCR = TtfFontBaker.Bake(File.OpenRead(@"Content/OCRA.ttf"),
+,
+,
+,
+                                                           new[]
+                    {
+                        CharacterRange.BasicLatin,
+                        CharacterRange.Latin1Supplement,
+                        CharacterRange.LatinExtendedA,
+                        CharacterRange.Cyrillic,
+                        CharacterRange.LatinExtendedB,
+                        new CharacterRange((char) 0x00B7)
+                    }
+                                                          );
                     monoFont = bakedMono.CreateSpriteFont(GraphicsDevice);
                     largeMonoFont = bakedMonoLarge.CreateSpriteFont(GraphicsDevice);
+                    ocrFont = bakedOCR.CreateSpriteFont(GraphicsDevice);
                     //Has to happen before Encompass stuff, because the Encompass machinery around ImGui requires debugWindow's monoFont to be loaded:
                     this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice, this.imageMap);
                     }
                     this.simulation.LoadContent(this.newsItems, this.grammar);
-                    this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
+                    this.budgetWindow = new BudgetWindow(new Budget { }, this.ocrFont, 0, 0);
                     Logging.Success("Content loaded.");
                 }

isometric-park-fna/UI/BudgetWindow.cs ¶ +1 -1

                         batch.DrawString(font, String.Format("EXPENSES", this.budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black);
                         batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 11 + y), Color.Black);
-                        batch.DrawString(font, String.Format("Tree Planting.1........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 12 + y), Color.Black);
+                        batch.DrawString(font, String.Format("Tree Planting..........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 12 + y), Color.Black);
                         batch.DrawString(font, String.Format("Tree Clearing..........${0:}....${1:}", this.budget.tree_clearing, this.previous_budget.tree_clearing), new Vector2(x, bar_height * 13 + y), Color.Black);
                         batch.DrawString(font, String.Format("Enforcement............${0:}....${1:}", this.budget.enforcement, this.previous_budget.enforcement), new Vector2(x, bar_height * 14 + y), Color.Black);

isometric-park-fna/isometric-park-fna.csproj ¶ +3 0

                 <None Include="Content\iosevka-medium.ttf">
                   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                 </None>
+                <None Include="Content\OCRA.ttf">
+                  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                </None>
                 <Content Include="cimgui/win-x64/cimgui.dll" CopyToOutputDirectory="PreserveNewest" />
                 <Content Include="cimgui/osx-x64/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.dylib" />
                 <Content Include="cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.so" />

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r592:ce2d3dd6110a - Wed, 25 May 2022 06:45:24

Sign in to your account

Commit r592:ce2d3dd6110a public

Author

r592:ce2d3dd6110a - Wed, 25 May 2022 06:45:24

Commit `r592:ce2d3dd6110a` public