base class for mesh builder views

Author: coryleach

Runtime/Utility/HexMeshUtility.cs

@@ -38,7 +38,7 @@ public HexMeshData(float radius, float border = 0.2f)
       this.border = Mathf.Clamp01(border);
 
       outerRadius = radius;
-      innerRadius = outerRadius * Mathf.Sqrt(3f) * 0.5f;
+      innerRadius = HexMeshUtility.GetInnerRadius(outerRadius);
       vertices = new List<Vector3>(); 
       triangles = new List<int>();
       colors = new List<Color>();
@@ -94,6 +94,12 @@ public Mesh CreateMesh()
 
   public static class HexMeshUtility
   {
+    //Calculates the inner radius from the outer radius
+    public static float GetInnerRadius(float outerRadius)
+    {
+      return outerRadius * Mathf.Sqrt(3f) * 0.5f;
+    }
+    
     public static HexDirection Previous(this HexDirection direction) 
     {
       return direction == HexDirection.NE ? HexDirection.NW : (direction - 1);

Runtime/WorldMap/Views/WoldMapTerrainMeshView.cs

@@ -5,7 +5,7 @@
 
 namespace Gameframe.Procgen
 {
-    public class WoldMapTerrainMeshView : MonoBehaviour, IWorldMapView
+    public class WoldMapTerrainMeshView : WorldMapView, IWorldMapView
     {
         [SerializeField] private MeshFilter _meshFilter = null;
 
@@ -24,7 +24,7 @@ private void Start()
         {
         }
 
-        public void DisplayMap(WorldMapData worldMapData)
+        public override void DisplayMap(WorldMapData worldMapData)
         {
             if (!enabled)
             {

Runtime/WorldMap/Views/WorldMapHexMeshView.cs

@@ -5,7 +5,7 @@
 namespace Gameframe.Procgen
 {
 
-  public class WorldMapHexMeshView : MonoBehaviour, IWorldMapView
+  public class WorldMapHexMeshView : WorldMapView, IWorldMapView
   {
     [SerializeField] private WorldMapViewChunk _prefab = null;
     [SerializeField] private float radius = 1f;
@@ -21,6 +21,9 @@ public class WorldMapHexMeshView : MonoBehaviour, IWorldMapView
     [SerializeField] private List<WorldMapViewChunk> chunkList = new List<WorldMapViewChunk>();
     private readonly Dictionary<Vector2, WorldMapViewChunk> _chunks = new Dictionary<Vector2, WorldMapViewChunk>();
 
+    private WorldMapData _mapData = null;
+    private float[] _heightMap = null;
+
     private void Start()
     {
       //This is here just to show the enable checkbox in editor
@@ -30,15 +33,29 @@ private void OnDisable()
     {
       ClearChunks();
     }
-    
-    public void DisplayMap(WorldMapData mapData)
+
+    public override Vector3 MapToWorldPosition(Vector2Int point)
+    {
+      var innerRadius = HexMeshUtility.GetInnerRadius(radius);
+      var xOffset = point.x + point.y * 0.5f - (int)(point.y / 2);
+      var pt = new Vector3
+      {
+        x = xOffset * innerRadius * 2,
+        y = _mapData == null || _heightMap == null ? 0 : GetElevation(_heightMap[point.y * _mapData.width + point.x]),
+        z = point.y * radius * 1.5f
+      };
+      return pt;
+    }
+
+    public override void DisplayMap(WorldMapData mapData)
     {
       if (!enabled)
       {
         return;
       }
-      
-      var heightMap = mapData.GetLayer<HeightMapLayerData>().heightMap;
+
+      _mapData = mapData;
+      _heightMap = _mapData.GetLayer<HeightMapLayerData>().heightMap;
 
       ClearChunks();
 
@@ -55,7 +72,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, border, 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);
         }
       }

Runtime/WorldMap/Views/WorldMapView.cs

@@ -0,0 +1,14 @@
+using UnityEngine;
+
+namespace Gameframe.Procgen
+{
+  public abstract class WorldMapView : MonoBehaviour, IWorldMapView
+  {
+    public virtual Vector3 MapToWorldPosition(Vector2Int point)
+    {
+      return new Vector3(point.x, 0, point.y);
+    }
+    
+    public abstract void DisplayMap(WorldMapData mapData);
+  }
+}

Runtime/WorldMap/Views/WorldMapView.cs.meta

@@ -6,7 +6,7 @@
 
 namespace Gameframe.Procgen
 {
-  public class WorldMapVoxelMeshView : MonoBehaviour, IWorldMapView
+  public class WorldMapVoxelMeshView : WorldMapView, IWorldMapView
   {
     [SerializeField] private TerrainTable _terrainTable;
 
@@ -36,7 +36,7 @@ private void OnDisable()
       ClearChunks();
     }
 
-    public void DisplayMap(WorldMapData mapData)
+    public override void DisplayMap(WorldMapData mapData)
     {
       if (!enabled)
       {