Patch up the city painter a little, add the final town hall island

City painter needs a lot of work, especially in terms of performance.

TSOClient/tso.client/Rendering/City/Plugins/MapPainterPlugin.cs

@@ -124,6 +124,15 @@ public class MapPainterPlugin : AbstractCityPlugin
             new Color(255, 255, 255), //snow
             new Color(255, 255, 0) //sand
         };
+
+        public byte[] TerrainTypeIndices = new byte[] {
+            0, //grass
+            4, //water
+            2, //rock
+            3, //snow
+            1 //sand
+        };
+
         public string[] TerrainTypeNames = new string[] {
             "Grass",
             "Water",
@@ -292,7 +301,11 @@ public override void TileHover(Vector2? tile)
                         {
                             BrushFunc(BrushSize, (x, y, strength) =>
                             {
-                                if (strength > 0) City.MapData.TerrainTypeColorData[newPt.X+x + (newPt.Y+y) * 512] = TerrainTypes[SelectedModifier];
+                                if (strength > 0)
+                                {
+                                    City.MapData.TerrainTypeColorData[newPt.X + x + (newPt.Y + y) * 512] = TerrainTypes[SelectedModifier];
+                                    City.MapData.TerrainType[newPt.X + x + (newPt.Y + y) * 512] = TerrainTypeIndices[SelectedModifier];
+                                }
                             });
 
                             AddChange(new Rectangle(newPt.X - (1+BrushSize), newPt.Y - (1+BrushSize), 3+BrushSize*2, 3+BrushSize*2));

TSOClient/tso.client/Rendering/City/Terrain.cs

@@ -300,7 +300,21 @@ public void GenerateCityMesh(GraphicsDevice gd, Rectangle? range)
             Geometry.MapData = Content.MapData;
             SubdivGeometry.MapData = Content.MapData;
             Foliage.MapData = Content.MapData;
-            Geometry.RegenMeshVerts(gd, range);
+
+            if (range == null)
+            {
+                Geometry.RegenMeshVerts(gd, range);
+            }
+            else
+            {
+                var pos = Camera.CalculateR();
+                var slicex = Math.Max(0, Math.Min(30, (int)Math.Round(pos.X / 16f) - 1));
+                var slicey = Math.Max(0, Math.Min(30, (int)Math.Round(pos.Y / 16f) - 1));
+                var slice = slicex + slicey * 32;
+
+                //Geometry.RegenMeshVerts(gd, range);
+                SubdivGeometry.SubRegenMeshVerts(m_GraphicsDevice, new Rectangle(slicex * 16, slicey * 16, 32, 32), 4, slice);
+            }
         }
 
         private Vector3 GetNormalAt(int x, int y)