Hex Map updates

Author: coryleach

Demo/Demo-URP.unitypackage

@@ -21,6 +21,7 @@ public class HexMeshData
     public List<Vector3> vertices;
     public List<int> triangles;
     public List<Color> colors;
+    public List<Vector2> uv;
     public Vector3[] corners;
 
     private float border = 0.25f;
@@ -41,6 +42,7 @@ public HexMeshData(float radius, float border = 0.2f)
       vertices = new List<Vector3>(); 
       triangles = new List<int>();
       colors = new List<Color>();
+      uv = new List<Vector2>();
       corners = new [] {
         new Vector3(0f, 0f, outerRadius),
         new Vector3(innerRadius, 0f, 0.5f * outerRadius),
@@ -83,6 +85,7 @@ public Mesh CreateMesh()
       mesh.vertices = vertices.ToArray();
       mesh.triangles = triangles.ToArray();
       mesh.colors = colors.ToArray();
+      mesh.uv = uv.ToArray();
       mesh.RecalculateNormals();
       return mesh;
     }
@@ -163,9 +166,9 @@ public static int GetNeighbor(int index, HexDirection hexDirection, int mapWidth
       return y * mapWidth + x;
     }
 
-    public static Mesh GenerateHexagonMesh(float radius, int startX, int startY, int chunkWidth, int chunkHeight, int mapWidth, int mapHeight, float[] heightMap, Func<float,Color> colorFunction, Func<float,float> elevationFunction)
+    public static Mesh GenerateHexagonMesh(float radius, float border, int startX, int startY, int chunkWidth, int chunkHeight, int mapWidth, int mapHeight, float[] heightMap, Func<float,Color> colorFunction, Func<float,float> elevationFunction)
     {
-      var meshData = new HexMeshData(radius, 0.3f);
+      var meshData = new HexMeshData(radius, border);
 
       for (int dy = 0; dy < chunkHeight && (startY + dy) < mapHeight; dy++)
       {
@@ -207,7 +210,8 @@ public static Mesh GenerateHexagonMesh(float radius, int startX, int startY, int
             center.y = elevation;
 
             var color = colorFunction?.Invoke(heightMap[index]) ?? Color.white;
-            AddTriangle(meshData, center, neighborElevation, previousNeighborElevation, nextNeighborElevation, (HexDirection)direction, color);
+            var uv = new Vector2(x / (float)mapWidth, y / (float)mapHeight);
+            AddTriangle(meshData, center, uv, neighborElevation, previousNeighborElevation, nextNeighborElevation, (HexDirection)direction, color);
           }
 
         }
@@ -216,33 +220,33 @@ public static Mesh GenerateHexagonMesh(float radius, int startX, int startY, int
       return meshData.CreateMesh();
     }
 
-    private static void AddTriangle(HexMeshData meshData, Vector3 center, float neighborElevation, float previousElevation, float nextElevation, HexDirection direction, Color color)
+    private static void AddTriangle(HexMeshData meshData, Vector3 center, Vector3 uv, float neighborElevation, float previousElevation, float nextElevation, HexDirection direction, Color color)
     {
       var v1 = center;
       var v2 = center + meshData.GetFirstSolidCorner(direction);
       var v3 = center + meshData.GetSecondSolidCorner(direction);
 
       //Add inner solid triangle
-      AddTriangle(meshData, v1, v2, v3, color);
+      AddTriangle(meshData, v1, v2, v3, color, uv);
 
       //Add Quad To Fill Border Gap
       var v4 = v2 + meshData.GetBridge(direction);
       v4.y = neighborElevation;
       var v5 = v3 + meshData.GetBridge(direction);
       v5.y = neighborElevation;
-      AddQuad(meshData, v2, v3, v4, v5, color);
+      AddQuad(meshData, v2, v3, v4, v5, color, uv);
 
       //Add Triangles to fill gap on sides of quad
       var v6 = center + meshData.GetFirstCorner(direction);
       v6.y = Mathf.Min(neighborElevation,previousElevation);
-      AddTriangle(meshData,v2, v6, v4, color);
+      AddTriangle(meshData,v2, v6, v4, color, uv);
 
       var v7 = center + meshData.GetSecondCorner(direction);
       v7.y = Mathf.Min(neighborElevation,nextElevation);
-      AddTriangle(meshData,v3, v5, v7, color);
+      AddTriangle(meshData, v3, v5, v7, color, uv);
     }
 
-    private static void AddTriangle(HexMeshData meshData, Vector3 v1, Vector3 v2, Vector3 v3, Color color)
+    private static void AddTriangle(HexMeshData meshData, Vector3 v1, Vector3 v2, Vector3 v3, Color color, Vector3 uv)
     {
       var vertexIndex = meshData.vertices.Count;
 
@@ -254,12 +258,16 @@ private static void AddTriangle(HexMeshData meshData, Vector3 v1, Vector3 v2, Ve
       meshData.colors.Add(color);
       meshData.colors.Add(color);
 
+      meshData.uv.Add(uv);
+      meshData.uv.Add(uv);
+      meshData.uv.Add(uv);
+
       meshData.triangles.Add(vertexIndex);
       meshData.triangles.Add(vertexIndex + 1);
       meshData.triangles.Add(vertexIndex + 2);
     }
 
-    private static void AddQuad(HexMeshData meshData, Vector3 v1, Vector3 v2, Vector3 v3, Vector3 v4, Color color)
+    private static void AddQuad(HexMeshData meshData, Vector3 v1, Vector3 v2, Vector3 v3, Vector3 v4, Color color, Vector3 uv)
     {
       var vertexIndex = meshData.vertices.Count;
 
@@ -273,6 +281,11 @@ private static void AddQuad(HexMeshData meshData, Vector3 v1, Vector3 v2, Vector
       meshData.colors.Add(color);
       meshData.colors.Add(color);
 
+      meshData.uv.Add(uv);
+      meshData.uv.Add(uv);
+      meshData.uv.Add(uv);
+      meshData.uv.Add(uv);
+      
       meshData.triangles.Add(vertexIndex);
       meshData.triangles.Add(vertexIndex + 2);
       meshData.triangles.Add(vertexIndex + 1);

Images/Sample_01.PNG

@@ -15,9 +15,11 @@ public class WorldMapHexMeshView : MonoBehaviour, IWorldMapView
     [SerializeField] private int chunkHeight = 16;
     [SerializeField] private float heightScale = 1;
     [SerializeField] private bool smooth = false;
+
+    [SerializeField, Range(0,1f)] private float border = 0.25f;
 
     [SerializeField] private List<WorldMapViewChunk> chunkList = new List<WorldMapViewChunk>();
-    private Dictionary<Vector2, WorldMapViewChunk> _chunks = new Dictionary<Vector2, WorldMapViewChunk>();
+    private readonly Dictionary<Vector2, WorldMapViewChunk> _chunks = new Dictionary<Vector2, WorldMapViewChunk>();
 
     private void Start()
     {
@@ -53,7 +55,7 @@ public void DisplayMap(WorldMapData mapData)
           var startY = chunkY * chunkHeight;
           var chunkView = GetChunk(new Vector2Int(chunkX,chunkY));
           chunkView.transform.localPosition = new Vector3(0,0,0);
-          var mesh = HexMeshUtility.GenerateHexagonMesh(radius, startX, startY, chunkWidth, chunkHeight, mapData.width, mapData.height, heightMap, GetColor, GetElevation);
+          var mesh = HexMeshUtility.GenerateHexagonMesh(radius, border, startX, startY, chunkWidth, chunkHeight, mapData.width, mapData.height, heightMap, GetColor, GetElevation);
           chunkView.SetMesh(mesh);
         }
       }
@@ -102,7 +104,8 @@ private WorldMapViewChunk GetChunk(Vector2Int chunkPt)
       return chunk;
     }
 
-    private void ClearChunks()
+    [ContextMenu("Clear Chunks")]
+    public void ClearChunks()
     {
       foreach (var chunk in chunkList)
       {

Runtime/Utility/HexMeshUtility.cs

@@ -24,9 +24,19 @@ public class WorldMapTextureView : MonoBehaviour, IWorldMapView
 
         [SerializeField] private bool scaleTexture = false;
         [SerializeField] private float textureScale = 2f;
+
+        private void Start()
+        {
+            //This is here just to show the enabled checkbox in the unity inspector
+        }
 
         public async void DisplayMap(WorldMapData worldMapData)
         {
+            if (!enabled)
+            {
+                return;
+            }
+            
             var heightMapLayer = worldMapData.GetLayer<HeightMapLayerData>();
             var regionMapLayer = worldMapData.GetLayer<RegionMapLayerData>();
 

Runtime/WorldMap/Views/WorldMapHexMeshView.cs

@@ -1,7 +1,9 @@
 //Ignore those dumb 'never assigned to' warnings cuz this is Unity and our fields are serialized 
 #pragma warning disable CS0649
 
+using System;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 namespace Gameframe.Procgen
 {
@@ -11,6 +13,8 @@ public class WorldMapGenController : MonoBehaviour
 
         [SerializeField] private int seed = 100;
 
+        [SerializeField] private bool randomizeSeed = false;
+
         [SerializeField, HideInInspector] private WorldMapData _mapData;
 
         private void Start()
@@ -21,6 +25,10 @@ private void Start()
         [ContextMenu("GenerateMap")]
         public void GenerateMap()
         {
+            if (randomizeSeed)
+            {
+                seed = Random.Range(int.MinValue, Int32.MaxValue);
+            }
             _mapData = _generator.GenerateMap(seed);
             DisplayMap(_mapData);
         }