Fixes to map & minimap drawing

Current implementation of map drawing with _offsets in BaseGameView in some cases didn't work well (e.g. zoomed out round maps), so I introduced an additional xShift parameter. It should also make it easier to understand what's going on in code.

A bunch of fixes for minimap panel, which should also be working now for long flat/round maps.

I also added an option to show grid on map.

Author: axx0

Civ2Gold/Civ2GoldInterface.cs

@@ -259,7 +259,7 @@ public override void Initialize()
                 new MenuElement("Max Zoom Out|Ctrl+X", new Shortcut(KeyboardKey.X, ctrl: true),
                     KeyboardKey.Null, commandId: MaxZoomOut),
                 new MenuElement("Show Map Grid|Ctrl+G", new Shortcut(KeyboardKey.G, ctrl: true),
-                    KeyboardKey.Null),
+                    KeyboardKey.Null, commandId: ShowMapGrid),
                 new MenuElement("Arrange Windows", Shortcut.None, KeyboardKey.Null),
                 new MenuElement("Show Hidden Terrain|t", new Shortcut(KeyboardKey.T), KeyboardKey.T),
                 new MenuElement("&Center View|c", new Shortcut(KeyboardKey.C), KeyboardKey.C)

Civ2TOT/TestOfTimeInterface.cs

@@ -341,7 +341,7 @@ public override void Initialize()
                 new MenuElement("Max Zoom Out|Ctrl+X", new Shortcut(KeyboardKey.X, ctrl: true),
                     KeyboardKey.Null, commandId: MaxZoomOut),
                 new MenuElement("Show Map Grid|Ctrl+G", new Shortcut(KeyboardKey.G, ctrl: true),
-                    KeyboardKey.Null),
+                    KeyboardKey.Null, commandId: ShowMapGrid),
                 new MenuElement("Arrange Windows", Shortcut.None, KeyboardKey.Null),
                 new MenuElement("Show Hidden Terrain|t", new Shortcut(KeyboardKey.T), KeyboardKey.T),
                 new MenuElement("&Center View|c", new Shortcut(KeyboardKey.C), KeyboardKey.C),

Engine/src/Utils.cs

@@ -7,6 +7,8 @@ namespace Civ2engine
 {
     public static class Utils
     {
+        public static int WrapNumber(int number, int range) => (number % range + range) % range;
+
         public static int GreatestCommonFactor(int a, int b)
         {
             while (b != 0)

Model/Core/Mapping/Tile.cs

@@ -17,7 +17,7 @@ public class Tile : IMapItem
         private bool[] _visibility;
         public int X { get; }
         public int Y { get; }
-        
+
         public int Z { get;}
 
         public int Odd { get; }

Model/Events/MapEventArgs.cs

@@ -10,25 +10,12 @@ public class MapEventArgs : EventArgs
         public MapEventType EventType { get; }
         public List<Tile> TilesChanged { get; set; }
 
-        public int[] CentrXy, MapStartXy, MapDrawSq;
-        public int Zoom;
+        public int[] MapStartXy, MapDrawSq;
+        public int Zoom, Xshift;
 
         public MapEventArgs(MapEventType eventType)
         {
             EventType = eventType;
         }
-
-        public MapEventArgs(MapEventType eventType, int[] centrXy)
-        {
-            EventType = eventType;
-            CentrXy = centrXy;
-        }
-
-        public MapEventArgs(MapEventType eventType, int[] mapStartXy, int[] mapDrawSq)
-        {
-            EventType = eventType;
-            MapStartXy = mapStartXy;
-            MapDrawSq = mapDrawSq;
-        }
     }
 }

Model/Menu/CommandIds.cs

@@ -15,6 +15,7 @@ public static class CommandIds
     public const string StandardZoom = "STANDARD_ZOOM";
     public const string MediumZoomOut = "MEDIUM_ZOOM_OUT";
     public const string MaxZoomOut = "MAX_ZOOM_OUT";
+    public const string ShowMapGrid = "SHOW_MAP_GRID";
     public const string MapLayoutToggle = "MAP_LAYOUT";
 
     public const string WaitOrder = "UNIT_ORDER_WAIT";

RaylibUI/RunGame/Commands/ShowMapGrid.cs

@@ -0,0 +1,37 @@
+using Civ2engine;
+using Model;
+using Model.Dialog;
+using Model.Images;
+using Model.Menu;
+using Raylib_CSharp.Interact;
+
+namespace RaylibUI.RunGame.Commands;
+
+public class ShowMapGrid : IGameCommand
+{
+    private readonly GameScreen _gameScreen;
+
+    public ShowMapGrid(GameScreen gameScreen)
+    {
+        _gameScreen = gameScreen;
+    }
+    
+    public string Id => CommandIds.ShowMapGrid;
+    public Shortcut[] ActivationKeys { get; set; } = { new(KeyboardKey.G, ctrl: true) };
+    public CommandStatus Status => CommandStatus.Normal;
+
+    public bool Update()
+    {
+        return true;
+    }
+
+    public void Action()
+    {
+        _gameScreen.ShowMapGrid();
+    }
+
+    public MenuCommand? Command { get; set; }
+    public string ErrorDialog { get; } = string.Empty;
+    public DialogImageElements? ErrorImage { get; } = null;
+    public string? Name { get; }
+}

RaylibUI/RunGame/GameControls/Mapping/MapControl.cs

@@ -124,7 +124,7 @@ private void SetDimensions()
         {
             _backgroundImage.Value.Unload();
         }
-        _backgroundImage = ImageUtils.PaintDialogBase(_gameScreen.Main.ActiveInterface, Width, Height, _padding, noWallpaper:true);
+        _backgroundImage = ImageUtils.PaintDialogBase(_active, Width, Height, _padding, noWallpaper:true);
 
         if (!_gameScreen.ToTPanelLayout)
         {
@@ -187,8 +187,8 @@ private void OnClick(object? sender, MouseEventArgs mouseEventArgs)
 
         var map = _gameScreen.CurrentMap;
         var dim = _gameScreen.TileCache.GetDimensions(map, _gameScreen.Zoom);
-        var clickedTilePosition = clickPosition - new Vector2(_padding.Left + _padding.Right, _padding.Top) + _currentView.Offsets;
-        var y = Math.DivRem((int)(clickedTilePosition.Y), dim.HalfHeight, out var yRemainder);
+        var clickedTilePosition = clickPosition - new Vector2(_padding.Left, _padding.Top) + _currentView.Offsets;
+        var y = Math.DivRem((int)clickedTilePosition.Y, dim.HalfHeight, out var yRemainder);
         var odd = y % 2 == 1;
         var clickX = (int)(odd ? clickedTilePosition.X - dim.HalfWidth : clickedTilePosition.X);
         if (clickX < 0)
@@ -256,6 +256,7 @@ private void OnClick(object? sender, MouseEventArgs mouseEventArgs)
 
         if (0 <= y && y < map.Tile.GetLength(1))
         {
+            x = Utils.WrapNumber(2 * x + _currentView.Xshift, 2 * map.XDim) / 2;
             return map.Tile[x, y];
         }
 
@@ -276,6 +277,7 @@ private void MapEventTriggered(object sender, MapEventArgs e)
         {
             case MapEventType.MinimapViewChanged:
                 {
+                    ForceRedraw = true;
                     if (_currentView.IsDefault)
                     {
                         if (_gameScreen.ActiveMode != _gameScreen.ViewPiece)
@@ -322,7 +324,7 @@ public override void Draw(bool pulse)
         }
 
         var paddedLoc = new Vector2(Location.X + _padding.Left, Location.Y + _padding.Top);
-        Graphics.DrawTextureEx(_currentView.BaseImage, paddedLoc, 0f,1f,
+        Graphics.DrawTextureEx(_currentView.BaseImage, paddedLoc, 0f, 1f,
             Color.White);
 
         var cityDetails = new List<CityData>();
@@ -368,6 +370,7 @@ public override void Draw(bool pulse)
 
         if (_backgroundImage != null)
             Graphics.DrawTextureEx(_backgroundImage.Value, Location, 0f, 1f, Color.White);
+
         if (!_gameScreen.ToTPanelLayout)
         {
             _headerLabel.Draw(pulse);