alysbrooks-public/games/isometric-park-fna Commit - r564:628e13aebaa0

alysbrooks-public » games » isometric-park-fna

Commit `r564:628e13aebaa0` public

parent | child

Description:

Move cursor rendering out of FNAGame to separate Renderer.

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

r564:628e13aebaa0 - Tue, 26 Apr 2022 08:30:21

isometric-park-fna/Renderers/CursorRenderer.cs ¶ created 644 +36 0

@@ -0,0 +1,36
	1	using Microsoft.Xna.Framework;
	2	using Microsoft.Xna.Framework.Graphics;
	3
	4	using isometricparkfna.UI;
	5	using isometricparkfna.Components;
	6
	7	using Encompass;
	8	using SpriteFontPlus;
	9
	10	namespace isometricparkfna.Renderers
	11	{
	12	public class CursorRenderer : GeneralRenderer
	13	{
	14	private SpriteBatch batch;
	15	private SpriteFont font;
	16
	17	public CursorRenderer(SpriteBatch batch, SpriteFont font)
	18	{
	19	this.batch = batch;
	20	this.font = font;
	21	}
	22
	23	public override void Render()
	24	{
	25
	26	foreach (ref readonly var entity in ReadEntities<CursorComponent>())
	27	{
	28
	29	var cursorComponent = GetComponent<CursorComponent>(entity);
	30	Tile.OutlineSquare(batch, cursorComponent.position.X, cursorComponent.position.Y, Color.Yellow);
	31	}
	32	}
	33
	34
	35	}
	36	}

isometric-park-fna/Engines/InputEngine.cs ¶ +39 -3

                         typeof(GameStateMessage),
                         typeof(QuitGameMessage),
                         typeof(SpawnSelection),
-                        typeof(AdjustSelection))]
+                        typeof(AdjustSelection)
+                        )]
                 [Reads(typeof(WindowTypeComponent),
                        typeof(GameStateComponent),
-                       typeof(VisibilityComponent))]
+                       typeof(VisibilityComponent),
+                       typeof(CursorComponent))]
+                [Writes(typeof(CursorComponent))]
                 public class InputEngine : Engine
                 {
                     private KeyboardState keyboardPrev;
                     //Area to ignore:
                     private int menuBarHeight;
+                    private int height;
+                    private int width;
                     public InputEngine(int menuBarHeight, Camera camera,
-                                       GraphicsDeviceManager gdm) {
+                                       GraphicsDeviceManager gdm, int height, int width) {
                         //initialize to blank for now
                         this.keyboardPrev = new KeyboardState();
                         this.menuBarHeight = menuBarHeight;
                         this.camera = camera;
                         this.gdm = gdm;
                         this.graphicsDevice = gdm.GraphicsDevice;
+                        this.height = height;
+                        this.width = width;
+                    }
+                    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 override void Update(double dt) {
             		    {
             			    SendMessage(new AdjustSelection {End =  CellMap.calculateMousegrid(original_point)});
             		    }
+                        var transformedPosition = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(this.graphicsDevice)));
+                        var gridPosition = calculateMousegrid(transformedPosition);
+                        if (MathUtils.Between(gridPosition.X, 0, this.width)
+                                && MathUtils.Between(gridPosition.Y, 0, this.height))
+                        {
+                            foreach (ref readonly var entity in ReadEntities<CursorComponent>()) {
+                                var cursorComponent = GetComponent<CursorComponent>(entity);
+                                SetComponent(entity, new CursorComponent { position = gridPosition,
+                                        size = 1 });
+                            }
+                        }
             	    }
                         #endregion

isometric-park-fna/Engines/Spawners/GameSpawner.cs ¶ +9 0

@@ -137,6 +137,15
137	_ => 1000M	137	_ => 1000M
138	};	138	};
139		139
		140	#region
		141
		142	var cursorEntity = CreateEntity();
		143	AddComponent(cursorEntity,
		144	new CursorComponent { position = new Vector2(20, 20),
		145	size = 1 });
		146
		147	#endregion
		148
140	Logging.Success("Spawned new game.");	149	Logging.Success("Spawned new game.");
141	}	150	}
142	}	151	}

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

                     Logging.Debug(this.Story.ContinueMaximally());
-                    WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
+                    WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm,
+                                this.simulation.map.MapHeight, this.simulation.map.MapWidth));
                     WorldBuilder.AddEngine(new UIEngine(this.Story));
                     WorldBuilder.AddEngine(new DialogEngine(this.Story, this.grammar));
                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.tileBatch, this.monoFont), 1);
                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, this.simulation, this.imGuiWindowBridgeEngine, this.gdm), 2);
+                    WorldBuilder.AddGeneralRenderer(new CursorRenderer(this.tileBatch, this.monoFont), 3);
                     var contractWindow = WorldBuilder.CreateEntity();
                     WorldBuilder.SetComponent(contractWindow, new VisibilityComponent { visible = false });
                     WorldBuilder.SetComponent(contractWindow, new WindowTypeComponent { type = isometricparkfna.Messages.Window.Contracts });
                         drawTileAt(12, 25, 300, 2);
             #endif
-                        #region draw_cursor
-                        if (MathUtils.Between(this.mouseGrid.X, 0, this.simulation.map.MapWidth)
-                                && MathUtils.Between(this.mouseGrid.Y, 0, this.simulation.map.MapHeight))
-                            Tile.OutlineSquare(tileBatch, this.mouseGrid.X, this.mouseGrid.Y, Color.Yellow, 1);
             #if DEBUG
                         Tile.OutlineSquare(tileBatch, 1, 1, Color.Red, 2);
                         Quad.FillSquare2(tileBatch, 8, 7, Color.Teal, .125f, 0.79f);
             #endif
-                        #endregion draw_cursor
                         stopWatch2 = new Stopwatch();
                         stopWatch2.Start();
                         #region draw_trees

isometric-park-fna/Renderers/AreaRenderer.cs ¶ 0 -2

             using Microsoft.Xna.Framework;
             using Microsoft.Xna.Framework.Graphics;
                     private SpriteBatch batch;
                     private SpriteFont font;
                     public AreaRenderer(SpriteBatch batch, SpriteFont font)
                     {
                         this.batch = batch;

isometric-park-fna/Tile.cs ¶ +5 -6

                     static public Texture2D TileSetTexture;
+            	public const float DEPTH = 0.79f;
                     public Tile()
                     }
                     static public Rectangle GetSourceRectangle(int tileIndex)
                     {
                         int tileY = tileIndex / (TileSetTexture.Width / TileWidth);
                                       new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                       //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                       new Vector2(((x - y + size_less_one) * Tile.TileSpriteWidth / 2), (x + y + size_less_one) * Tile.TileSpriteHeight / 2) + adjust2,
-                                      color, 0.79f);
+                                      color, Tile.DEPTH);
                         //Bottom right
                         Line.drawLine(batch,
                                       new Vector2(((x + size - y) * Tile.TileSpriteWidth / 2), (x + size_less_one + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                       //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                       new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size_less_one + (y + size_less_one)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                      color, 0.79f);
+                                      color, Tile.DEPTH);
                         //Bottom left
                         Line.drawLine(batch,
                                       new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + y + size) * Tile.TileSpriteHeight / 2) + adjust2,
                                       //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                       new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                      color, 0.79f);
+                                      color, Tile.DEPTH);
                         //Upper left
                         Line.drawLine(batch,
                                       new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                       //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                       new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                      color, 0.79f);
+                                      color, Tile.DEPTH);
                     }
                     public static void drawOutline(SpriteBatch batch, Color color) {

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

r564:628e13aebaa0 - Tue, 26 Apr 2022 08:30:21

Sign in to your account

Commit r564:628e13aebaa0 public

Author

r564:628e13aebaa0 - Tue, 26 Apr 2022 08:30:21

Commit `r564:628e13aebaa0` public