Description:
Ensure changing the font is applied to SpriteFont.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -393,13 +393,8 | |||||
|
|
393 | this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar)); |
|
393 | this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar)); |
|
|
394 | #endif |
|
394 | #endif |
|
|
395 |
|
395 | ||
|
|
396 | //font = fontBakeResult.CreateSpriteFont(GraphicsDevice); |
|
||
|
|
397 |
|
|||
|
|
398 | this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0); |
|
396 | this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0); |
|
|
399 |
|
397 | ||
|
|
400 | // this.setFont(options.fontName, options.fontSize); |
|
||
|
|
401 | // debugWindow.setMonoFont(debugWindow.addFont(options.fontName, options.fontSize, false)); |
|
||
|
|
402 |
|
|||
|
|
403 | Logging.Success("Content loaded."); |
|
398 | Logging.Success("Content loaded."); |
|
|
404 | } |
|
399 | } |
|
|
405 |
|
400 | ||
| @@ -408,7 +403,7 | |||||
|
|
408 | { |
|
403 | { |
|
|
409 | var font_path = DebugWindow.fonts[font]; |
|
404 | var font_path = DebugWindow.fonts[font]; |
|
|
410 |
|
405 | ||
|
|
411 |
var baked = TtfFontBaker.Bake(File.OpenRead( |
|
406 | var baked = TtfFontBaker.Bake(File.OpenRead(font_path), |
|
|
412 | size, |
|
407 | size, |
|
|
413 | 1024, |
|
408 | 1024, |
|
|
414 | 1024, |
|
409 | 1024, |
| @@ -744,7 +739,6 | |||||
|
|
744 | #endif |
|
739 | #endif |
|
|
745 |
|
740 | ||
|
|
746 | #region draw_cursor |
|
741 | #region draw_cursor |
|
|
747 | //drawTileAt((int)this.mouseGrid.X, (int)this.mouseGrid.Y, 2, 1, 0.85f); //between tiles and gridlines |
|
||
|
|
748 |
|
742 | ||
|
|
749 | if (MathUtils.Between(this.mouseGrid.X, 0, this.simulation.map.MapWidth) |
|
743 | if (MathUtils.Between(this.mouseGrid.X, 0, this.simulation.map.MapWidth) |
|
|
750 | && MathUtils.Between(this.mouseGrid.Y, 0, this.simulation.map.MapHeight)) |
|
744 | && MathUtils.Between(this.mouseGrid.Y, 0, this.simulation.map.MapHeight)) |
| @@ -787,7 +781,6 | |||||
|
|
787 | { |
|
781 | { |
|
|
788 | for (int j = 0; j < this.simulation.map.MapWidth; j += 1) |
|
782 | for (int j = 0; j < this.simulation.map.MapWidth; j += 1) |
|
|
789 | { |
|
783 | { |
|
|
790 |
|
|||
|
|
791 | if (this.simulation.map.cells[i][j].hasTree) |
|
784 | if (this.simulation.map.cells[i][j].hasTree) |
|
|
792 | { //until we actually simulate: |
|
785 | { //until we actually simulate: |
|
|
793 | drawTileAt(i, j, 142, 2); |
|
786 | drawTileAt(i, j, 142, 2); |
| @@ -803,7 +796,6 | |||||
|
|
803 | else if (this.simulation.map.cells[i][j].status == CellStatus.DeadTree) { |
|
796 | else if (this.simulation.map.cells[i][j].status == CellStatus.DeadTree) { |
|
|
804 | drawTileAt(i, j, 141, 2); |
|
797 | drawTileAt(i, j, 141, 2); |
|
|
805 | // System.Console.WriteLine(String.Format("Drew Dead Tree at {0},{1}", i, j)); |
|
798 | // System.Console.WriteLine(String.Format("Drew Dead Tree at {0},{1}", i, j)); |
|
|
806 |
|
|||
|
|
807 | } |
|
799 | } |
|
|
808 | } |
|
800 | } |
|
|
809 | } |
|
801 | } |
| @@ -832,7 +824,6 | |||||
|
|
832 | { |
|
824 | { |
|
|
833 | has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree; |
|
825 | has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree; |
|
|
834 | } |
|
826 | } |
|
|
835 | //*/ |
|
||
|
|
836 |
|
827 | ||
|
|
837 | String status_left = ""; |
|
828 | String status_left = ""; |
|
|
838 | if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) |
|
829 | if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) |
You need to be logged in to leave comments.
Login now