alysbrooks-public/games/isometric-park-fna Commit - r194:49caa188c262

alysbrooks-public » games » isometric-park-fna

Commit `r194:49caa188c262` public

parent | child

Description:

Add contracts window.

Commit status:

[Not Reviewed]

References:

m3-contracts

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r194:49caa188c262 - Sun, 11 Apr 2021 23:46:53

isometric-park-fna/Components/WindowTypeComponent.cs ¶ created 644 +10 0

			@@ -0,0 +1,10
		1	using Encompass;
		2
		3	using isometricparkfna.Messages;
		4
		5	namespace isometricparkfna.Components {
		6
		7	public struct WindowTypeComponent : IComponent {
		8	public Window type;
		9	}
		10	}

isometric-park-fna/Engines/UIEngine.cs ¶ created 644 +35 0

			@@ -0,0 +1,35
		1
		2
		3
		4	using Microsoft.Xna.Framework.Input;
		5
		6	using Encompass;
		7
		8	using isometricparkfna.Messages;
		9	using isometricparkfna.Components;
		10
		11	namespace isometricparkfna.Engines {
		12
		13	[Receives(typeof(ToggleWindowMessage), typeof(ToggleVisibilityMessage))]
		14	[Reads(typeof(WindowTypeComponent), typeof(VisibilityComponent))]
		15	[Writes(typeof(VisibilityComponent))]
		16	class UIEngine : Engine
		17	{
		18
		19	public override void Update(double dt)
		20	{
		21	foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowMessage>())
		22	{
		23	foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
		24	{
		25	var window_type = GetComponent<WindowTypeComponent>(entity).type;
		26	if (window_type == windowMessage.Window)
		27	{
		28	var visibilityComponent = GetComponent<VisibilityComponent>(entity);
		29	SetComponent(entity, new VisibilityComponent{visible = !visibilityComponent.visible});
		30	}
		31	}
		32	}
		33	}
		34	}
		35	} No newline at end of file

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ created 644 +63 0

			@@ -0,0 +1,63
		1	using Microsoft.Xna.Framework;
		2	using Microsoft.Xna.Framework.Graphics;
		3
		4	using System.Collections.Generic;
		5
		6	using isometricparkfna.UI;
		7	using isometricparkfna.Engines;
		8	using isometricparkfna.Components;
		9	using isometricparkfna.Messages;
		10
		11	using ImGuiNET;
		12
		13	using Encompass;
		14	using SpriteFontPlus;
		15
		16	namespace isometricparkfna.Renderers
		17	{
		18	public class ImGuiWindowRenderer : GeneralRenderer
		19	{
		20	private ImFontPtr font;
		21	private ImGuiWindowBridgeEngine BridgeEngine;
		22	public ImGuiWindowRenderer(ImFontPtr font, ImGuiWindowBridgeEngine engine)
		23	{
		24	this.font = font;
		25	this.BridgeEngine = engine;
		26	}
		27
		28	public override void Render()
		29	{
		30	foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
		31	{
		32	var window_type = GetComponent<WindowTypeComponent>(entity).type;
		33	var visible = GetComponent<VisibilityComponent>(entity).visible;
		34
		35	if (visible)
		36	{
		37	switch (window_type)
		38	{
		39	case Window.Contracts:
		40	var contracts = ReadEntities<AreaComponent>();
		41
		42	var names = new List<string>();
		43
		44	// var names = contracts.Select(entity => GetComponent<NameComponent>(entity).DisplayName)
		45	foreach(var e in contracts)
		46	{
		47	names.Add(GetComponent<NameComponent>(e).DisplayName);
		48
		49	}
		50
		51	ContractsWindow.Render(this.font, this.BridgeEngine, names);
		52	break;
		53	default:
		54	break;
		55	}
		56	}
		57
		58	}
		59
		60	}
		61
		62	}
		63	} No newline at end of file

isometric-park-fna/UI/ContractsWindow.cs ¶ created 644 +73 0

			@@ -0,0 +1,73
		1	using System.Collections.Generic;
		2
		3	using ImGuiNET;
		4
		5	using isometricparkfna.Engines;
		6	using isometricparkfna.Messages;
		7
		8	using Num = System.Numerics;
		9
		10	namespace isometricparkfna.UI
		11	{
		12	public static class ContractsWindow
		13	{
		14
		15	public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, List<string> contracts )
		16	{
		17	bool newShow = true;
		18	if (newShow)
		19	{
		20	ImGui.PushFont(font);
		21
		22	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;
		23	ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0.0f);
		24	ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0.0f);
		25	ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.0f);
		26	ImGui.PushStyleVar(ImGuiStyleVar.TabRounding, 0.0f);
		27	ImGui.PushStyleColor(ImGuiCol.WindowBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		28	ImGui.PushStyleColor(ImGuiCol.Header, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		29	ImGui.PushStyleColor(ImGuiCol.HeaderHovered, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		30	ImGui.PushStyleColor(ImGuiCol.HeaderActive, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		31	ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		32
		33	var title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f);
		34	ImGui.PushStyleColor(ImGuiCol.TitleBg, title_bar);
		35	ImGui.PushStyleColor(ImGuiCol.TitleBgActive, title_bar);
		36	ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, title_bar);
		37
		38	ImGui.PushStyleColor(ImGuiCol.Border, new Num.Vector4(0f, 0f, 0f, 1f));
		39	ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Num.Vector4(0f, 0f, 0f, 0.5f));
		40
		41
		42
		43	ImGui.PushStyleColor(ImGuiCol.Button, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f));
		44	ImGui.PushStyleColor(ImGuiCol.Text, new Num.Vector4(0f, 0f, 0f, 1f));
		45	ImGui.SetNextWindowSize(new Num.Vector2(400, 400));
		46	ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize \| ImGuiWindowFlags.NoCollapse \| ImGuiWindowFlags.NoSavedSettings);
		47	ImGui.ListBoxHeader("Contracts:");
		48	foreach (var contract in contracts)
		49	{
		50	// ImGui.Text(contract);
		51	ImGui.Selectable(contract, false);
		52	}
		53	ImGui.ListBoxFooter();
		54	if (ImGui.Button("Okay"))
		55	{
		56	newShow = false;
		57	}
		58
		59	ImGui.End();
		60	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;
		61	ImGui.PopStyleVar(4);
		62	ImGui.PopStyleColor(12);
		63	ImGui.PopFont();
		64	}
		65
		66	if (!newShow)
		67	{
		68	engine.messages.Add(new ToggleWindowMessage {Window = Window.Contracts });
		69	}
		70
		71	}
		72	}
		73	} No newline at end of file

.vscode/launch.json ¶ +1 -1

                    "args": [],
                    "env": {
                      "LD_LIBRARY_PATH": "${workspaceFolder}/isometric-park-fna/bin/Debug/netcoreapp3.1/lib64",
-                     "DYLD_LIBRARY_PATH": "${workspaceFolder}/isometric-park-fna/bin/Debug/netcoreapp3.1/osx"
+                     "DYLD_LIBRARY_PATH": "${workspaceFolder}/fnalibs/osx"
                    },
                    "cwd": "${workspaceFolder}/isometric-park-fna/bin/Debug/netcoreapp3.1",
                    "console": "integratedTerminal",

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna.sln ¶ +13 -13

              EndProject
              Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET", "ImGui.NET\ImGui.NET.csproj", "{0023328E-2EFD-448B-BD85-A76769CD106A}"
              EndProject
-             Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "encompass-cs", "encompass-cs\encompass-cs\encompass-cs.csproj", "{93842D17-2CBE-40A9-AA4C-A2BCE836B817}"
+             Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "encompass-cs", "encompass-cs\encompass-cs\encompass-cs.csproj", "{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}"
              EndProject
              Global
              	GlobalSection(SolutionConfigurationPlatforms) = preSolution
              		{0023328E-2EFD-448B-BD85-A76769CD106A}.Debug|x64.Build.0 = Debug|Any CPU
              		{0023328E-2EFD-448B-BD85-A76769CD106A}.Release|x64.ActiveCfg = Release|Any CPU
              		{0023328E-2EFD-448B-BD85-A76769CD106A}.Release|x64.Build.0 = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|anycpu.ActiveCfg = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|anycpu.Build.0 = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|anycpu.ActiveCfg = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|anycpu.Build.0 = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|x86.ActiveCfg = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|x86.Build.0 = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|x86.ActiveCfg = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|x86.Build.0 = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|x64.ActiveCfg = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Debug|x64.Build.0 = Debug|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|x64.ActiveCfg = Release|Any CPU
-             		{93842D17-2CBE-40A9-AA4C-A2BCE836B817}.Release|x64.Build.0 = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|anycpu.ActiveCfg = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|anycpu.Build.0 = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|anycpu.ActiveCfg = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|anycpu.Build.0 = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|x86.ActiveCfg = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|x86.Build.0 = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|x86.ActiveCfg = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|x86.Build.0 = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Debug|x64.Build.0 = Debug|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|x64.ActiveCfg = Release|Any CPU
+             		{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}.Release|x64.Build.0 = Release|Any CPU
              	EndGlobalSection
              	GlobalSection(SolutionProperties) = preSolution
              		HideSolutionNode = FALSE

isometric-park-fna/Engines/InputEngine.cs ¶ +7 0

              using Encompass;
              using isometricparkfna.Messages;
+             using isometricparkfna.Components;
              namespace isometricparkfna.Engines {
              			typeof(ToggleVisibilityMessage),
              			typeof(TogglePauseMessage),
              			typeof(GameRateMessage))]
+                 [Reads(typeof(WindowTypeComponent),
+                 typeof(VisibilityComponent))]
              	public class InputEngine : Engine
              	{
              		private KeyboardState keyboardPrev;
              				SendMessage(new ToggleWindowMessage{Window = Window.News});
              			}
+             			if (keyboardCur.IsKeyDown(Keys.O) && keyboardPrev.IsKeyUp(Keys.O))
+             			{
+             				SendMessage(new ToggleWindowMessage{Window = Window.Contracts});
+             			}
              			if (keyboardCur.IsKeyDown(Keys.G) && keyboardPrev.IsKeyUp(Keys.G))
              			{
              				SendMessage(new ToggleVisibilityMessage{Element = Element.Grid});

isometric-park-fna/FNAGame.cs ¶ +17 -3

                  private BudgetWindow budgetWindow;
                  public bool showForest;
                  public bool showNews;
+                 public bool showContracts;
                  //Encompass
                  private WorldBuilder WorldBuilder = new WorldBuilder();
                      Line.initialize(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);
                      //let's see if this works:
                      // WorldBuilder = new WorldBuilder();
                      var dummy_entity = WorldBuilder.CreateEntity();
-                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
                      WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));
+                     WorldBuilder.AddEngine(new UIEngine());
                      WorldBuilder.AddEngine(new GameBridgeEngine(this));
                      WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));
                      WorldBuilder.AddEngine(new CameraBridgeEngine(this.camera));
                      this.imGuiWindowBridgeEngine = new ImGuiWindowBridgeEngine();
                      WorldBuilder.AddEngine(this.imGuiWindowBridgeEngine);
                      WorldBuilder.AddEngine(new ContractSpawner());
+                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
+                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(debugWindow.monoFont, this.imGuiWindowBridgeEngine), 2);
+                     var contractWindow = WorldBuilder.CreateEntity();
+                     WorldBuilder.SetComponent(contractWindow, new VisibilityComponent{visible = false});
+                     WorldBuilder.SetComponent(contractWindow, new WindowTypeComponent{type = isometricparkfna.Messages.Window.Contracts});
                      // var budgetWindow = WorldBuilder.CreateEntity();
                      // WorldBuilder.SetComponent(budgetWindow, new VisibilityComponent{visible = true});
                      // WorldBuilder.SetComponent(budgetWindow, new BudgetComponent());
                              }
                          );
-                     this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice);
                      var json2 = new FileInfo(@"Content/grammar.json");
                      drawTileAt(1, 1, 140, 2);
                      drawTileAt(3, 2, 140, 2);
+                     _imGuiRenderer.BeforeLayout(gameTime);
                      World.Draw();
+                     // _imGuiRenderer.AfterLayout();
                      batch.End();
              #region draw_header
                      };
                      //Finally, draw the debug window
-                     _imGuiRenderer.BeforeLayout(gameTime);
+                     // _imGuiRenderer.BeforeLayout(gameTime);
                      var additionalInfo = new Dictionary<string, string>();

isometric-park-fna/Messages/ToggleWindowMessage.cs ¶ +2 -1

              		Debug,
              		Budget,
              		Forest,
-             		News
+             		News,
+             		Contracts
              	}
              	public struct ToggleWindowMessage : IMessage//, IHasEntity

isometric-park-fna/isometric-park-fna.csproj ¶ +2 -1

                  <Compile Include="Utils\Extensions.cs" />
                  <Compile Include="Utils\Node.cs" />
                  <Compile Include="UI\BudgetWindow.cs" />
+                 <Compile Include="UI\ContractsWindow.cs" />
                  <Compile Include="UI\DebugWindow.cs" />
                  <Compile Include="UI\Dialog.cs" />
                  <Compile Include="UI\ForestWindow.cs" />
                    <HintPath>..\packages\ImGui.NET.1.78.0\lib\netstandard2.0\ImGui.NET.dll</HintPath>
                  </ProjectReference>
                  <ProjectReference Include="..\encompass-cs\encompass-cs\encompass-cs.csproj">
-                   <Project>{93842D17-2CBE-40A9-AA4C-A2BCE836B817}</Project>
+                   <Project>{D0CCEB74-D8A8-446A-AFFC-2B043DAF1E5F}</Project>
                    <Name>encompass-cs</Name>
                  </ProjectReference>
                </ItemGroup>

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

r194:49caa188c262 - Sun, 11 Apr 2021 23:46:53

Sign in to your account

Commit r194:49caa188c262 public

Author

r194:49caa188c262 - Sun, 11 Apr 2021 23:46:53

Commit `r194:49caa188c262` public