Merge pull request #419 from C7-Game/pcen/use-tilemaps-grid-view

[4.x] TileMap: Grid View

Author: pcen

.gitignore

@@ -20,7 +20,6 @@ data_*/
 
 # Below here are ignores imported from Puppeteer's project
 sav/
-*.png
 *.pcx
 *.flc
 *.mp4

C7/Art/grid.png

@@ -453,7 +453,7 @@ private void processActions() {
 		}
 
 		if (Input.IsActionJustPressed(C7Action.ToggleGrid)) {
-			mapView.showGrid = !mapView.showGrid;
+			mapView.toggleGrid();
 		}
 
 		if (Input.IsActionJustPressed(C7Action.Escape) && !this.inUnitGoToMode) {

C7/Game.cs

@@ -19,13 +19,19 @@ public partial class MapView : Node2D {
 		public int worldEdgeLeft {get; private set;}
 		private int width;
 		private int height;
-		public bool showGrid {
-			get => showGrid;
-			set {
-				showGrid = value;
-			}
-		}
+		private bool showGrid = false;
+		private void setShowGrid(bool value) {
+ 			bool update = showGrid != value;
+ 			showGrid = value;
+ 			if (update) {
+ 				updateGridLayer();
+ 			}
+ 		}
+ 		public void toggleGrid() {
+ 			setShowGrid(!showGrid);
+ 		}
 		private Game game;
+		private GameData data;
 		private GameMap gameMap;
 
 		public override void _Draw() {
@@ -119,8 +125,9 @@ private Vector2I stackedCoords(Tile tile) {
 		}
 
 		public MapView(Game game, GameData data) {
+			this.data = data;
 			this.game = game;
-			gameMap = data.map;
+			this.gameMap = data.map;
 			width = gameMap.numTilesWide / 2;
 			height = gameMap.numTilesTall;
 			initializeTileMap();
@@ -441,5 +448,15 @@ public void updateTile(Tile tile) {
 
 			updateBuildingLayer(tile);
 		}
+
+		private void updateGridLayer() {
+ 			if (showGrid) {
+ 				foreach (Tile tile in data.map.tiles) {
+ 					setCell(Layer.Grid, Atlas.Grid, tile, Vector2I.Zero);
+ 				}
+ 			} else {
+ 				tilemap.ClearLayer(Layer.Grid.Index());
+ 			}
+ 		}
 	}
 }

C7/Map/MapView.cs

@@ -13,6 +13,7 @@ public enum Layer {
 		Resource,
 		TerrainYield,
 		Building,
+		Grid,
 		Invalid,
 	};
 
@@ -44,6 +45,7 @@ public enum Atlas {
 		TerrainYield,
 		TerrainBuilding,
 		GoodyHut,
+		Grid,
 		Invalid,
 	}
 
@@ -68,7 +70,7 @@ public AtlasLoader(string p, int w, int h, Vector2I rs, int y = 0) {
 			height = h;
 			regionSize = rs;
 			textureOrigin = new Vector2I(0, y);
-			source = new TileSetAtlasSource{
+			source = new TileSetAtlasSource {
 				Texture = Util.LoadTextureFromPCX(path),
 				TextureRegionSize = regionSize,
 			};
@@ -140,7 +142,7 @@ protected override void load() {
 	}
 
 	class MarshAtlasLoader : AtlasLoader {
-		public MarshAtlasLoader(string p, Vector2I rs) : base(p, -1, -1, rs, 12) {}
+		public MarshAtlasLoader(string p, Vector2I rs) : base(p, -1, -1, rs, 12) { }
 
 		protected override void load() {
 			// TODO: incomplete
@@ -217,6 +219,13 @@ public static TileSet LoadCiv3TileSet() {
 				tileset.AddSource(source, atlas.Index());
 			}
 
+			TileSetAtlasSource gridSource = new TileSetAtlasSource{
+				Texture = Util.LoadTextureFromC7JPG("Art/grid.png"),
+				TextureRegionSize = tileSize,
+			};
+			gridSource.CreateTile(Vector2I.Zero);
+			tileset.AddSource(gridSource, Atlas.Grid.Index());
+
 			return tileset;
 		}
 	}