Merge pull request #412 from C7-Game/pcen/use-tilemaps-render-cities

Godot 4 Render Cities on TileMap

Author: pcen

C7/C7Game.tscn

@@ -257,16 +257,6 @@ libraries = {
 [connection signal="ShowSpecificAdvisor" from="." to="CanvasLayer/Advisor" method="OnShowSpecificAdvisor"]
 [connection signal="TurnEnded" from="." to="CanvasLayer/Control/GameStatus" method="OnTurnEnded"]
 [connection signal="TurnStarted" from="." to="CanvasLayer/Control/GameStatus" method="OnTurnStarted"]
-[connection signal="BlinkyEndTurnButtonPressed" from="CanvasLayer/GameStatus" to="." method="OnPlayerEndTurn"]
-[connection signal="toggled" from="CanvasLayer/SlideOutBar/SlideToggle" to="." method="_on_SlideToggle_toggled"]
-[connection signal="pressed" from="CanvasLayer/SlideOutBar/VBoxContainer/DownButton" to="." method="_on_DownButton_pressed"]
-[connection signal="pressed" from="CanvasLayer/SlideOutBar/VBoxContainer/RightButton" to="." method="_on_RightButton_pressed"]
-[connection signal="pressed" from="CanvasLayer/SlideOutBar/VBoxContainer/LeftButton" to="." method="_on_LeftButton_pressed"]
-[connection signal="pressed" from="CanvasLayer/SlideOutBar/VBoxContainer/UpButton" to="." method="_on_UpButton_pressed"]
-[connection signal="value_changed" from="CanvasLayer/SlideOutBar/VBoxContainer/Zoom" to="." method="onSliderZoomChanged"]
-[connection signal="pressed" from="CanvasLayer/SlideOutBar/VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]
-[connection signal="pressed" from="CanvasLayer/ToolBar/MarginContainer/HBoxContainer/AdvisorButton" to="CanvasLayer/Advisor" method="ShowLatestAdvisor"]
-[connection signal="pressed" from="CanvasLayer/ToolBar/MarginContainer/HBoxContainer/UiBarEndTurnButton" to="." method="_onEndTurnButtonPressed"]
 [connection signal="BuildCity" from="CanvasLayer/PopupOverlay" to="." method="OnBuildCity"]
 [connection signal="HidePopup" from="CanvasLayer/PopupOverlay" to="CanvasLayer/PopupOverlay" method="OnHidePopup"]
 [connection signal="UnitDisbanded" from="CanvasLayer/PopupOverlay" to="." method="OnUnitDisbanded"]

C7/Game.cs

@@ -94,9 +94,6 @@ public override void _Ready() {
 
 			Toolbar = GetNode<Control>("CanvasLayer/Control/ToolBar/MarginContainer/HBoxContainer");
 
-			//TODO: What was this supposed to do?  It throws errors and occasinally causes crashes now, because _OnViewportSizeChanged doesn't exist
-			// GetTree().Root.Connect("size_changed",new Callable(this,"_OnViewportSizeChanged"));
-
 			// Hide slideout bar on startup
 			_on_SlideToggle_toggled(false);
 
@@ -154,6 +151,11 @@ public void processEngineMessages(GameData gameData) {
 				case MsgStartTurn mST:
 					OnPlayerStartTurn();
 					break;
+				case MsgCityBuilt mBC:
+					Tile cityTile = gameData.map.tiles[mBC.tileIndex];
+					City city = cityTile.cityAtTile;
+					mapView.addCity(city, cityTile);
+					break;
 			}
 		}
 	}
@@ -220,11 +222,10 @@ public override void _Process(double delta) {
 
 	// If "location" is not already near the center of the screen, moves the camera to bring it into view.
 	public void ensureLocationIsInView(Tile location) {
-		// TODO: implement
 		if (controller.tileKnowledge.isTileKnown(location) && location != Tile.NONE) {
-			// Vector2 relativeScreenLocation = oldMapView.screenLocationOfTile(location, true) / oldMapView.getVisibleAreaSize();
-			// if (relativeScreenLocation.DistanceTo(new Vector2((float)0.5, (float)0.5)) > 0.30)
-			// 	oldMapView.centerCameraOnTile(location);
+			if (!camera.isTileInView(location, mapView)) {
+				camera.centerOnTile(location, mapView);
+			}
 		}
 	}
 
@@ -341,18 +342,6 @@ public override void _UnhandledInput(InputEvent @event) {
 								if (to_select != null && to_select.owner == controller)
 									setSelectedUnit(to_select);
 							}
-							GD.Print($"tile: {tile.xCoordinate}, {tile.yCoordinate}: {tile.baseTerrainType.Key} - {tile.overlayTerrainType.Key}");
-							int left = mapView.worldEdgeLeft;
-							int right = mapView.worldEdgeRight;
-							int camLeft = (int)camera.getVisibleWorld().Position.X;
-							int camRight = (int)camera.getVisibleWorld().End.X;
-							GD.Print(camera.getVisibleWorld().End);
-							if (camLeft <= left) {
-								GD.Print($"left is visible - world: {left}, cam: {camLeft}");
-							}
-							if (camRight >= right) {
-								GD.Print($"right is visible - world: {right}, cam: {camRight}");
-							}
 						}
 					}
 				}
@@ -529,7 +518,6 @@ private void processActions() {
 		if (Input.IsActionJustPressed(C7Action.UnitBuildRoad) && CurrentlySelectedUnit.canBuildRoad()) {
 			new MsgBuildRoad(CurrentlySelectedUnit.guid).send();
 		}
-
 	}
 
 	private void GetNextAutoselectedUnit(GameData gameData) {

C7/Map/CityLabelScene.cs

@@ -11,7 +11,6 @@ public partial class CityLabelScene : Node2D {
 
 		private City city;
 		private Tile tile;
-		private Vector2I tileCenter;
 
 		private ImageTexture cityTexture;
 
@@ -37,6 +36,11 @@ public partial class CityLabelScene : Node2D {
 		private static Theme popSizeTheme = new Theme();
 
 		private int lastLabelWidth = 0;
+		private int lastTurnsUntilGrowth;
+		private int lastTurnsUntilProductFinished;
+		private int lastCitySize;
+		private string lastProductionName;
+		private bool wasCapital;
 
 		static CityLabelScene() {
 			smallFontTheme.DefaultFont = smallFont;
@@ -54,94 +58,105 @@ static CityLabelScene() {
 			nonEmbassyStar = PCXToGodot.getImageFromPCX(cityIcons, 20, 1, 18, 18);
 		}
 
-		public CityLabelScene(City city, Tile tile, Vector2I tileCenter) {
+		public CityLabelScene(City city, Tile tile) {
 			this.city = city;
 			this.tile = tile;
-			this.tileCenter = tileCenter;
-
 
 			labelTextureRect.MouseFilter = Control.MouseFilterEnum.Ignore;
 			cityNameLabel.MouseFilter = Control.MouseFilterEnum.Ignore;
 			productionLabel.MouseFilter = Control.MouseFilterEnum.Ignore;
 			popSizeLabel.MouseFilter = Control.MouseFilterEnum.Ignore;
 
+			cityNameLabel.Text = city.name;
 			AddChild(labelTextureRect);
 			AddChild(cityNameLabel);
 			AddChild(productionLabel);
 			AddChild(popSizeLabel);
+
+			cityNameLabel.Theme = smallFontTheme;
+			cityNameLabel.OffsetTop = 24;
+
+			productionLabel.Theme = smallFontTheme;
+			productionLabel.OffsetTop = 36;
+
+			popSizeLabel.Theme = popSizeTheme;
+			popSizeLabel.OffsetTop = 28;
+
+			lastTurnsUntilGrowth = city.TurnsUntilGrowth();
+			lastTurnsUntilProductFinished = city.TurnsUntilProductionFinished();
+			lastCitySize = city.size;
+			lastProductionName = city.itemBeingProduced.name;
+			wasCapital = city.IsCapital();
+
+			resize(lastTurnsUntilGrowth, lastTurnsUntilProductFinished, lastCitySize, lastProductionName, wasCapital);
 		}
 
-		public override void _Draw() {
-			base._Draw();
+		private string getCityNameAndGrowthString(int turnsUntilGrowth) {
+			string turnsUntilGrowthText = turnsUntilGrowth == int.MaxValue || turnsUntilGrowth < 0 ? "- -" : turnsUntilGrowth.ToString();
+			return $"{city.name} : {turnsUntilGrowthText}";
+		}
 
-			int turnsUntilGrowth = city.TurnsUntilGrowth();
-			string turnsUntilGrowthText = turnsUntilGrowth == int.MaxValue || turnsUntilGrowth < 0 ? "- -" : "" + turnsUntilGrowth;
-			string cityNameAndGrowth = $"{city.name} : {turnsUntilGrowthText}";
-			string productionDescription = city.itemBeingProduced.name + " : " + city.TurnsUntilProductionFinished();
+		private void resize(int turnsUntilGrowth, int turnsUntilProductionFinished, int citySize, string productionName, bool isCapital) {
+			string productionDescription = $"{productionName} : {turnsUntilProductionFinished}";
+			int productionDescriptionWidth = (int)smallFont.GetStringSize(productionDescription).X;
 
+			string cityNameAndGrowth = getCityNameAndGrowthString(turnsUntilGrowth);
 			int cityNameAndGrowthWidth = (int)smallFont.GetStringSize(cityNameAndGrowth).X;
-			int productionDescriptionWidth = (int)smallFont.GetStringSize(productionDescription).X;
 			int maxTextWidth = Math.Max(cityNameAndGrowthWidth, productionDescriptionWidth);
+			int cityLabelWidth = maxTextWidth + (isCapital? 70 : 45); //TODO: Is 65 right?  70?  Will depend on whether it's capital, too
 
-			int cityLabelWidth = maxTextWidth + (city.IsCapital()? 70 : 45);	//TODO: Is 65 right?  70?  Will depend on whether it's capital, too
-			int textAreaWidth = cityLabelWidth - (city.IsCapital() ? 50 : 25);
+			int textAreaWidth = cityLabelWidth - (isCapital ? 50 : 25);
 			if (log.IsEnabled(LogEventLevel.Verbose)) {
-				log.Verbose("Width of city name = " + maxTextWidth);
 				log.Verbose("City label width: " + cityLabelWidth);
 				log.Verbose("Text area width: " + textAreaWidth);
 			}
-
 			if (cityLabelWidth != lastLabelWidth) {
 				Image labelBackground = CreateLabelBackground(cityLabelWidth, city, textAreaWidth);
-				cityLabel =  ImageTexture.CreateFromImage(labelBackground);
+				cityLabel = ImageTexture.CreateFromImage(labelBackground);
 				lastLabelWidth = cityLabelWidth;
+				labelTextureRect.Texture = cityLabel;
+				labelTextureRect.OffsetLeft = (cityLabelWidth / -2);
+				labelTextureRect.OffsetTop = 24;
 			}
-
-			DrawLabelOnScreen(tileCenter, cityLabelWidth, city, cityLabel);
-			DrawTextOnLabel(tileCenter, cityNameAndGrowthWidth, productionDescriptionWidth, city, cityNameAndGrowth, productionDescription, cityLabelWidth);
-		}
-
-		private void DrawLabelOnScreen(Vector2I tileCenter, int cityLabelWidth, City city, ImageTexture cityLabel)
-		{
-			labelTextureRect.OffsetLeft = tileCenter.X + (cityLabelWidth / -2);
-			labelTextureRect.OffsetTop = tileCenter.Y + 24;
-			labelTextureRect.Texture = cityLabel;
-		}
-
-		private void DrawTextOnLabel(Vector2I tileCenter, int cityNameAndGrowthWidth, int productionDescriptionWidth, City city, string cityNameAndGrowth, string productionDescription, int cityLabelWidth) {
-
-			//Destination for font is based on lower-left of baseline of font, not upper left as for blitted rectangles
-			int cityNameOffset = cityNameAndGrowthWidth / -2;
-			int prodDescriptionOffset = productionDescriptionWidth / -2;
-			if (!city.IsCapital()) {
+			int cityNameOffset = cityNameAndGrowthWidth / -2 - 8;
+			int prodDescriptionOffset = productionDescriptionWidth / -2 - 8;
+			if (!isCapital) {
 				cityNameOffset += 12;
 				prodDescriptionOffset += 12;
 			}
-
-			cityNameLabel.Theme = smallFontTheme;
 			cityNameLabel.Text = cityNameAndGrowth;
-			cityNameLabel.OffsetLeft = tileCenter.X + cityNameOffset;
-			cityNameLabel.OffsetTop = tileCenter.Y + 22;
+			cityNameLabel.OffsetLeft = cityNameOffset;
 
-			productionLabel.Theme = smallFontTheme;
 			productionLabel.Text = productionDescription;
-			productionLabel.OffsetLeft = tileCenter.X + prodDescriptionOffset;
-			productionLabel.OffsetTop = tileCenter.Y + 32;
+			productionLabel.OffsetLeft = prodDescriptionOffset;
 
-			//City pop size
-			string popSizeString = "" + city.size;
+			string popSizeString = citySize.ToString();
 			int popSizeWidth = (int)midSizedFont.GetStringSize(popSizeString).X;
 			int popSizeOffset = LEFT_RIGHT_BOXES_WIDTH / 2 - popSizeWidth / 2;
 
-			popSizeLabel.Theme = popSizeTheme;
-
-			if (city.TurnsUntilGrowth() < 0) {
+			if (turnsUntilGrowth < 0) {
 				popSizeLabel.Theme = popThemeRed;
 			}
 
 			popSizeLabel.Text = popSizeString;
-			popSizeLabel.OffsetLeft = tileCenter.X + cityLabelWidth / -2 + popSizeOffset;
-			popSizeLabel.OffsetTop = tileCenter.Y + 22;
+			popSizeLabel.OffsetLeft = cityLabelWidth / -2 + popSizeOffset;
+		}
+
+		public override void _Process(double delta) {
+			int turnsUntilGrowth = city.TurnsUntilGrowth();
+			int turnsUntilProductionFinished = city.TurnsUntilProductionFinished();
+			int citySize = city.size;
+			string productionName = city.itemBeingProduced.name;
+			bool isCaptial = city.IsCapital();
+
+			if (turnsUntilGrowth != lastTurnsUntilGrowth || turnsUntilProductionFinished != lastTurnsUntilProductFinished || citySize != lastCitySize || productionName != lastProductionName || isCaptial != wasCapital) {
+				lastTurnsUntilGrowth = turnsUntilGrowth;
+				lastTurnsUntilProductFinished = turnsUntilProductionFinished;
+				lastCitySize = citySize;
+				lastProductionName = productionName;
+				wasCapital = isCaptial;
+				resize(turnsUntilGrowth, turnsUntilProductionFinished, citySize, productionName, isCaptial);
+			}
 		}
 
 		private Image CreateLabelBackground(int cityLabelWidth, City city, int textAreaWidth)

C7/Map/CityLayer.cs

@@ -4,17 +4,17 @@
 using Serilog;
 
 namespace C7.Map {
-	public partial class CityScene : Node2D {
+	public partial class CityScene : Sprite2D {
 		private ILogger log = LogManager.ForContext<CityScene>();
 
 		private readonly Vector2 citySpriteSize;
 
 		private ImageTexture cityTexture;
-		private TextureRect cityGraphics = new TextureRect();
 		private CityLabelScene cityLabelScene;
 
-		public CityScene(City city, Tile tile, Vector2I tileCenter) {
-			cityLabelScene = new CityLabelScene(city, tile, tileCenter);
+		public CityScene(City city, Tile tile) {
+			ZIndex = 20;
+			cityLabelScene = new CityLabelScene(city, tile);
 
 			//TODO: Generalize, support multiple city types, etc.
 			Pcx pcx = Util.LoadPCX("Art/Cities/rMIDEAST.PCX");
@@ -23,18 +23,9 @@ public CityScene(City city, Tile tile, Vector2I tileCenter) {
 			cityTexture = Util.LoadTextureFromPCX("Art/Cities/rMIDEAST.PCX", 0, 0, width, height);
 			citySpriteSize = new Vector2(width, height);
 
-			cityGraphics.OffsetLeft = tileCenter.X - (float)0.5 * citySpriteSize.X;
-			cityGraphics.OffsetTop = tileCenter.Y - (float)0.5 * citySpriteSize.Y;
-			cityGraphics.MouseFilter = Control.MouseFilterEnum.Ignore;
-			cityGraphics.Texture = cityTexture;
+			Texture = cityTexture;
 
-			AddChild(cityGraphics);
 			AddChild(cityLabelScene);
 		}
-
-		public override void _Draw() {
-			base._Draw();
-			cityLabelScene._Draw();
-		}
 	}
 }

C7/Map/CityScene.cs

@@ -37,6 +37,7 @@ public void toggleGrid() {
 		private GameMap gameMap;
 
 		private Dictionary<MapUnit, UnitSprite> unitSprites = new Dictionary<MapUnit, UnitSprite>();
+		private Dictionary<City, CityScene> cityScenes = new Dictionary<City, CityScene>();
 		private CursorSprite cursor;
 
 		private UnitSprite spriteFor(MapUnit unit) {
@@ -55,6 +56,14 @@ private Vector2 getSpriteLocalPosition(Tile tile, MapUnit.Appearance appearance)
 			return position + offset;
 		}
 
+		public void addCity(City city, Tile tile) {
+			log.Debug($"adding city at tile ({tile.xCoordinate}, {tile.yCoordinate})");
+			CityScene scene = new CityScene(city, tile);
+			scene.Position = tilemap.MapToLocal(stackedCoords(tile));
+			AddChild(scene);
+			cityScenes.Add(city, scene);
+		}
+
 		private void animateUnit(Tile tile, MapUnit unit) {
 			// TODO: simplify AnimationManager and drawing animations it is unnecessarily complex
 			// - also investigate if the custom offset tracking and SetFrame can be replaced by

C7/Map/MapView.cs

@@ -44,4 +44,13 @@ public void centerOnTile(Tile tile,  MapView map) {
 		Vector2 target = map.tileToLocal(tile);
 		Position = target;
 	}
+
+	public bool isTileInView(Tile tile, MapView map) {
+		Rect2 visible = getVisibleWorld();
+		Vector2 target = map.tileToLocal(tile);
+		float size = 30;
+		target -= Vector2.One * (size / 2);
+		Rect2 boundingBox = new Rect2(target, size, size);
+		return visible.Encloses(boundingBox);
+	}
 }

C7/PlayerCamera.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using C7Engine.AI;
 
 namespace C7Engine
@@ -23,6 +22,7 @@ public static void BuildCity(int x, int y, string playerGuid, string name)
 			owner.cities.Add(newCity);
 			tileWithNewCity.cityAtTile = newCity;
 			tileWithNewCity.overlays.road = true;
+			new MsgCityBuilt(tileWithNewCity).send(); // UI will add city to the map view
 		}
 
 		public static void DestroyCity(int x, int y) {