diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -228,6 +228,7 @@ WorldBuilder.AddEngine(new UIEngine()); WorldBuilder.AddEngine(new GameBridgeEngine(this)); + WorldBuilder.AddEngine(new GameStateEngine()); WorldBuilder.AddEngine(this.simulation.BridgeEngine); WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera)); this.imGuiWindowBridgeEngine = new ImGuiWindowBridgeEngine(); @@ -252,6 +253,10 @@ WorldBuilder.SetComponent(newsWindow, new VisibilityComponent { visible = false }); WorldBuilder.SetComponent(newsWindow, new WindowTypeComponent { type = isometricparkfna.Messages.Window.News }); + var mainMenu = WorldBuilder.CreateEntity(); + WorldBuilder.SetComponent(mainMenu, new VisibilityComponent { visible = true }); + WorldBuilder.SetComponent(mainMenu, new WindowTypeComponent { type = isometricparkfna.Messages.Window.MainMenu }); + // var budgetWindow = WorldBuilder.CreateEntity(); // WorldBuilder.SetComponent(budgetWindow, new VisibilityComponent{visible = true}); // WorldBuilder.SetComponent(budgetWindow, new BudgetComponent()); @@ -867,8 +872,6 @@ Vector2 middle_dimensions = largeMonoFont.MeasureString("Isometric Park"); float middle_start = (int)((FNAGame.width / 2) - (middle_dimensions.X / 2)); ImGui.SetNextWindowPos(new Num.Vector2(((FNAGame.width/2) - 40), 200)); - MainMenu.Render(debugWindow.monoFont, imGuiWindowBridgeEngine); - batch.DrawString(largeMonoFont, "Isometric Park", new Vector2(middle_start, 50), Color.Black, 0.0f, Vector2.Zero, @@ -877,6 +880,7 @@ new Vector2(middle_start-1, 49), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.51f); + World.Draw(); Vector2 version_dimensions = monoFont.MeasureString(typeof(FNAGame).Assembly.GetName().Version.ToString()); batch.DrawString(monoFont, diff --git a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs --- a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs +++ b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs @@ -1,6 +1,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; +using System; using System.Collections.Generic; using System.Linq; @@ -89,7 +90,10 @@ ContractWindow.Render(this.font, this.italicFont, this.BridgeEngine, entity, data.name, data.description, data.status, data.amount, data.delta_trees, area_size, data.image_index, data.square); break; + case Window.MainMenu: + MainMenu.Render(this.font, this.BridgeEngine); + break; default: break; }