alysbrooks-public/games/isometric-park-fna Commit - r536:e3be69aada5b

alysbrooks-public » games » isometric-park-fna

Commit `r536:e3be69aada5b` public

parent | child

Description:

Draw areas when clicked.

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

r536:e3be69aada5b - Sat, 12 Feb 2022 11:06:30

isometric-park-fna/Engines/BuildToolEngine.cs ¶ created 644 +29 0

@@ -0,0 +1,29
	1	using System;
	2	using Microsoft.Xna.Framework;
	3	using Microsoft.Xna.Framework.Graphics;
	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(SpawnSelection),
	14	typeof(AdjustSelection))]
	15	[Writes(typeof(AreaComponent))]
	16	public class BuildToolEngine : Engine {
	17	public override void Update(double dt) {
	18
	19	foreach (ref readonly var message in ReadMessages<SpawnSelection>())
	20	{
	21	var entity = CreateEntity();
	22
	23	AddComponent(entity, new AreaComponent { squares = new[] {message.Start} });
	24	AddComponent(entity, new SelectedComponent { selected = false});
	25	}
	26	}
	27	}
	28	}
	29

isometric-park-fna/Messages/AdjustSelection.cs ¶ created 644 +9 0

@@ -0,0 +1,9
	1	using Microsoft.Xna.Framework;
	2
	3	using Encompass;
	4
	5	namespace isometricparkfna.Messages {
	6	public struct AdjustSelection : IMessage {
	7	public Vector2 End;
	8	}
	9	}

isometric-park-fna/Messages/SpawnSelection.cs ¶ created 644 +9 0

@@ -0,0 +1,9
	1	using Microsoft.Xna.Framework;
	2
	3	using Encompass;
	4
	5	namespace isometricparkfna.Messages {
	6	public struct SpawnSelection : IMessage {
	7	public Vector2 Start;
	8	}
	9	}

isometric-park-fna/CellMap.cs ¶ +13 0

             using System;
             using System.Collections.Generic;
+            using Microsoft.Xna.Framework;
             namespace isometricparkfna
             {
                         return count;
                     }
+                public static Vector2 calculateMousegrid(Vector2 normalizedMousePos)
+                {
+                    Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight);
+                    Vector2 adjustedMousePos = normalizedMousePos - adjust;
+                    float boardx = ((adjustedMousePos.X / Tile.TileSpriteWidth) + (adjustedMousePos.Y / Tile.TileSpriteHeight));
+                    float boardy = ((adjustedMousePos.Y / Tile.TileSpriteHeight) - (adjustedMousePos.X / Tile.TileSpriteWidth));
+                    return new Vector2((int)boardx, (int)boardy);
+                }
                     public System.Collections.Generic.IEnumerable<Cell> iterate_cells_with_neighbors(int neighbors)
                     {
                         for (int i = 0; i < MapHeight; i++)

isometric-park-fna/Engines/GameBridgeEngine.cs ¶ +17 -13

@@ -91,19 +91,23
91	foreach (ref readonly var entity in ReadEntities<AreaComponent>())	91	foreach (ref readonly var entity in ReadEntities<AreaComponent>())
92	{	92	{
93	var areaComponent = GetComponent<AreaComponent>(entity);	93	var areaComponent = GetComponent<AreaComponent>(entity);
94	var contractStatusComponent = GetComponent<ContractStatusComponent>(entity);	94
95	foreach (var square in areaComponent.squares)	95	if (HasComponent<ContractStatusComponent>(entity))
96	{	96	{
97	if (game.mouseGrid == square)	97	var contractStatusComponent = GetComponent<ContractStatusComponent>(entity);
98	{	98	foreach (var square in areaComponent.squares)
99	game.in_zone = true;	99	{
100	if ((contractStatusComponent.status == ContractStatus.Active)	100	if (game.mouseGrid == square)
101	\|\| (contractStatusComponent.status == ContractStatus.Accepted))	101	{
102	{	102	game.in_zone = true;
103	game.in_active_zone = true;	103	if ((contractStatusComponent.status == ContractStatus.Active)
104	}	104	\|\| (contractStatusComponent.status == ContractStatus.Accepted))
105	}	105	{
106	}	106	game.in_active_zone = true;
		107	}
		108	}
		109	}
		110	}
107	}	111	}
108		112
109	foreach (ref readonly var message in ReadMessages<QuitGameMessage>())	113	foreach (ref readonly var message in ReadMessages<QuitGameMessage>())

isometric-park-fna/Engines/InputEngine.cs ¶ +10 -2

                         typeof(TogglePauseMessage),
                         typeof(GameRateMessage),
                         typeof(GameStateMessage),
-                        typeof(QuitGameMessage))]
+                        typeof(QuitGameMessage),
+            	    typeof(SpawnSelection),
+            	    typeof(AdjustSelection))]
                 [Reads(typeof(WindowTypeComponent),
                        typeof(GameStateComponent),
                        typeof(VisibilityComponent))]
                         var mouseCur = Mouse.GetState();
                         var original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y),
                                                                Matrix.Invert(this.camera.get_transformation(this.graphicsDevice)));
                         bool isPlaying = false;
                         var viewWidth = gdm.PreferredBackBufferWidth;
                             SendMessage(new JumpCameraMessage {Movement = original_point});
                         }
+                        if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Released
+            		    && keyboardCur.IsKeyDown(Keys.LeftShift)
+            		    )
+                        {
+                            SendMessage(new SpawnSelection {Start = CellMap.calculateMousegrid(original_point)});
+                        }
                         #endregion
                         this.keyboardPrev = keyboardCur;
                         this.mousePrev = mouseCur;

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

                     WorldBuilder.AddEngine(new PolicyEngine());
                     WorldBuilder.AddEngine(new TraceryBridgeEngine(this.grammar));
                     WorldBuilder.AddEngine(new SimulationGameRateBridgeEngine(this.simulation));
+                    WorldBuilder.AddEngine(new BuildToolEngine());
                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.tileBatch, this.monoFont), 1);
                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, this.simulation, this.imGuiWindowBridgeEngine, this.gdm), 2);

isometric-park-fna/Renderers/AreaRenderer.cs ¶ +7 -3

                         {
                             var areaComponent = GetComponent<AreaComponent>(entity);
                             // var SelectedComponent = GetComponent<SelectedComponent>(entity);
+                            var selected = GetComponent<SelectedComponent>(entity).selected;
                             if (!HasComponent<ContractStatusComponent>(entity)
                                     || GetComponent<ContractStatusComponent>(entity).status == ContractStatus.Accepted
                                 Quad.FillSquares(batch, areaComponent.squares, Color.Teal, 0.5f, 0.79f);
                             }
-                            var selected = GetComponent<SelectedComponent>(entity).selected;
+            		else if (HasComponent<ContractStatusComponent>(entity)
-                            if (HasComponent<ContractStatusComponent>(entity)
                                     && selected
                                     // && GetComponent<SelectedComponent>(entity).selected
                                )
                                 Tile.DrawOutlinedSquares(batch, areaComponent.squares, Color.Teal);
                                 Quad.FillSquares(batch, areaComponent.squares, Color.Gray, 0.5f, 0.80f);
                             }
+            		else if (!HasComponent<ContractStatusComponent>(entity) )
+            		{
+                                Quad.FillSquares(batch, areaComponent.squares, Color.Red, 0.5f, 0.80f);
+                                Tile.DrawOutlinedSquares(batch, areaComponent.squares, Color.Red);
+            		}
                         }
                     }
                 }

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

r536:e3be69aada5b - Sat, 12 Feb 2022 11:06:30

Sign in to your account

Commit r536:e3be69aada5b public

Author

r536:e3be69aada5b - Sat, 12 Feb 2022 11:06:30

Commit `r536:e3be69aada5b` public