alysbrooks-public/games/isometric-park-fna Commit - r538:5c22e0ed170b

alysbrooks-public » games » isometric-park-fna

Commit `r538:5c22e0ed170b` public

parent | child

Description:

Limit to boundaries.

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

r538:5c22e0ed170b - Sun, 13 Feb 2022 07:39:10

isometric-park-fna/CellMap.cs ¶ +8 -8

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

isometric-park-fna/Engines/BuildToolEngine.cs ¶ +19 -24

@@ -13,12 +13,18
13	namespace isometricparkfna.Engines {	13	namespace isometricparkfna.Engines {
14		14
15	[Receives(typeof(SpawnSelection),	15	[Receives(typeof(SpawnSelection),
16	typeof(AdjustSelection))]	16	typeof(AdjustSelection))]
17	[Writes(typeof(AreaComponent))]	17	[Writes(typeof(AreaComponent))]
18	[Reads(typeof(SelectedComponent),	18	[Reads(typeof(SelectedComponent),
19	typeof(AreaComponent))]	19	typeof(AreaComponent))]
20	public class BuildToolEngine : Engine {	20	public class BuildToolEngine : Engine {
21		21
		22	private CellMap Map;
		23
		24	public BuildToolEngine(CellMap map) {
		25	this.Map = map;
		26	}
		27
22	private System.Collections.Generic.IEnumerable<float> step_until(float start, float stop) {	28	private System.Collections.Generic.IEnumerable<float> step_until(float start, float stop) {
23	if (stop >= start) {	29	if (stop >= start) {
24	for(float i = start; i <= stop; i++)	30	for(float i = start; i <= stop; i++)
@@ -60,22 +66,11
60		66
61	newSquares.Add(area.squares[0]);	67	newSquares.Add(area.squares[0]);
62		68
		69	var end_x = MathUtils.Clamp(message.End.X, 0.0f, this.Map.MapWidth);
		70	var end_y = MathUtils.Clamp(message.End.Y, 0.0f, this.Map.MapHeight);
63		71
64	//	72	foreach (var i in step_until(area.squares[0].X, end_x)) {
65	~~// for (float i =~~ area.squares[0].~~X; i >= message.End.X; i--~~) {	73	foreach (var j in step_until(area.squares[0].Y, end_y)) {
66	// for (float j = area.squares[0].Y; j >= message.End.Y; j--) {
67	// newSquares.Add(new Vector2(i, j));
68	// }
69	// }
70	//
71	// for (float i = area.squares[0].X; i <= message.End.X; i++) {
72	// for (float j = area.squares[0].Y; j <= message.End.Y; j++) {
73	// newSquares.Add(new Vector2(i, j));
74	// }
75	// }
76
77	foreach (var i in step_until(area.squares[0].X, message.End.X)) {
78	foreach (var j in step_until(area.squares[0].Y, message.End.Y)) {
79	newSquares.Add(new Vector2(i, j));	74	newSquares.Add(new Vector2(i, j));
80	}	75	}
81	}	76	}
@@ -83,12 +78,12
83	newSquares.Add(message.End);	78	newSquares.Add(message.End);
84		79
85	SetComponent(entity, new AreaComponent { squares = newSquares.ToArray() /( new[]{ area.squares[0], message.End}/});	80	SetComponent(entity, new AreaComponent { squares = newSquares.ToArray() /( new[]{ area.squares[0], message.End}/});
86	}	81	}
87	}	82	}
88	}	83	}
89		84
90	}	85	}
91	}	86	}
92	}	87	}
93	}	88	}
94		89

isometric-park-fna/Engines/GameBridgeEngine.cs ¶ +16 -16

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

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

                         typeof(GameRateMessage),
                         typeof(GameStateMessage),
                         typeof(QuitGameMessage),
-            	    typeof(SpawnSelection),
+                        typeof(SpawnSelection),
-            	    typeof(AdjustSelection))]
+                        typeof(AdjustSelection))]
                 [Reads(typeof(WindowTypeComponent),
                        typeof(GameStateComponent),
                        typeof(VisibilityComponent))]
                         }
                         if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Released
-            		    && keyboardCur.IsKeyDown(Keys.LeftShift)
+                                && keyboardCur.IsKeyDown(Keys.LeftShift)
+                           )
                         {
                             SendMessage(new SpawnSelection {Start = CellMap.calculateMousegrid(original_point)});
                         }
-            	    if ( mouseCur.LeftButton == ButtonState.Released && mousePrev.LeftButton == ButtonState.Pressed )
+                        if ( mouseCur.LeftButton == ButtonState.Released && mousePrev.LeftButton == ButtonState.Pressed )
+                        {
                             SendMessage(new AdjustSelection {Clear = true });
+                        }
                         if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Pressed)
+                        {
-            		    SendMessage(new AdjustSelection { End =  CellMap.calculateMousegrid(original_point)});
+                            SendMessage(new AdjustSelection { End =  CellMap.calculateMousegrid(original_point)});
+                        }
                         #endregion
                         this.keyboardPrev = keyboardCur;

isometric-park-fna/Engines/UIEngine.cs ¶ +4 -4

                     {
                         foreach (var entity in ReadEntities<SelectedComponent>())
                         {
-            		var selected = GetComponent<SelectedComponent>(entity);
+                            var selected = GetComponent<SelectedComponent>(entity);
-            		if (selected.Type == SelectionType.Window) {
+                            if (selected.Type == SelectionType.Window) {
-            			SetComponent(entity, new SelectedComponent { selected = false });
+                                SetComponent(entity, new SelectedComponent { selected = false });
+                            }
                         }
                         foreach (ref readonly var windowMessage in ReadMessages<SetWindowVisibilityMessage>())

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.AddEngine(new BuildToolEngine(this.simulation.map));
                     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 ¶ +8 -8

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

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +3 -3

                                         foreach (var e in contracts)
                                         {
-            				    if(HasComponent<ContractStatusComponent>(e)) {
+                                            if(HasComponent<ContractStatusComponent>(e)) {
-            					    contract_data.Add(getContractDetails(e));
+                                                contract_data.Add(getContractDetails(e));
+                                            }
                                         }
                                         ContractsWindow.Render(this.BridgeEngine.font, this.BridgeEngine, contract_data);

isometric-park-fna/Utils/MathUtils.cs ¶ +16 0

@@ -68,6 +68,22
68	}	68	}
69	}	69	}
70		70
		71	public static float Clamp(float val, float min, float max)
		72	{
		73	if (val > max)
		74	{
		75	return max;
		76	}
		77	else if (val < min)
		78	{
		79	return min;
		80	}
		81	else
		82	{
		83	return val;
		84	}
		85	}
		86
71	protected float Decrement(float value, float delta)	87	protected float Decrement(float value, float delta)
72	{	88	{
73	float magnitude = Math.Abs(value);	89	float magnitude = Math.Abs(value);

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

r538:5c22e0ed170b - Sun, 13 Feb 2022 07:39:10

Sign in to your account

Commit r538:5c22e0ed170b public

Author

r538:5c22e0ed170b - Sun, 13 Feb 2022 07:39:10

Commit `r538:5c22e0ed170b` public