fix issue where getVisibleWorld initially uses invalid GlobalCanvasTransform value

Author: pcen

C7/Map/MapView.cs

@@ -217,8 +217,8 @@ private void initializeTileMap() {
 
 			setHorizontalWrap(HorizontalWrapState.Right); // just put it somewhere
 
-			tilemap.ZIndex = 10; // need to figure out a good way to order z indices
-			wrappingTilemap.ZIndex = 10;
+			tilemap.ZIndex = MapZIndex.Tiles; // need to figure out a good way to order z indices
+			wrappingTilemap.ZIndex = MapZIndex.Tiles;
 			AddChild(tilemap);
 			AddChild(wrappingTilemap);
 			AddChild(terrainTilemap);
@@ -297,7 +297,7 @@ public MapView(Game game, GameData data) {
 			// TODO in the future convert civ3 coordinates to stacked
 			// coordinates when reading from the civ3 save so Tile has
 			// stacked coordinates
-			foreach (C7GameData.Tile t in gameMap.tiles) {
+			foreach (Tile t in gameMap.tiles) {
 				Vector2I coords = stackedCoords(t);
 				terrain[coords.X, coords.Y] = t.baseTerrainTypeKey;
 			}

C7/Map/MapViewCamera.cs

@@ -18,10 +18,18 @@ public partial class MapViewCamera : Camera2D {
 		private int wrapEdgeTileMargin = 2; // margin in number of tiles to trigger map wrapping
 		private HorizontalWrapState hwrap = HorizontalWrapState.None;
 
-		public void attachToMapView(MapView map) {
+		public async void attachToMapView(MapView map) {
 			this.map = map;
 			wrapEdgeMargin = wrapEdgeTileMargin * map.tileSize.X;
 			map.updateAnimations();
+
+			// Awaiting a 0 second timer is a workaround to force GlobalCanvasTransform to be updated.
+			// This is necessary when the camera's starting position is close to the edge of the map.
+			// Without it, the GlobalCanvasTransform will not be updated until the camera is moved,
+			// resulting in broken map wrapping. I tried awaiting "process_frame" but it does not seem
+			// to work, although I believe that is what we want to do here. GPT-4 suggested waiting for
+			// a 0 second timer, which seems to work.
+			await ToSignal(GetTree().CreateTimer(0), "timeout");
 			checkWorldWrap();
 		}
 
@@ -63,7 +71,6 @@ private HorizontalWrapState currentHwrap(Rect2 v) {
 		//   to give the illusion of true wrapping tilemap
 		// - teleport the camera one world-width to the left or right when
 		//   only the "wrap" tilemap is in view
-
 		private void checkWorldWrap() {
 			if (map is null || !map.wrapHorizontally) {
 				// TODO: for maps that do not wrap horizontally restrict movement
@@ -94,10 +101,9 @@ public override void _UnhandledInput(InputEvent @event) {
 			}
 		}
 
-		public Rect2 getVisibleWorld() {
-			Transform2D vpToGlobal = (GetViewport().GlobalCanvasTransform * GetCanvasTransform()).AffineInverse();
-			return vpToGlobal * GetViewportRect();
-		}
+		private Transform2D viewportToGlobalTransform => (GetViewport().GlobalCanvasTransform * GetCanvasTransform()).AffineInverse();
+
+		public Rect2 getVisibleWorld() => viewportToGlobalTransform * GetViewportRect();
 
 		public void centerOnTile(Tile tile, MapView map) {
 			Vector2 target = map.tileToLocal(tile);