terrain generation fixes and cleanup

Author: coryleach

Runtime/Utility/TerrainMeshUtility.cs

@@ -10,20 +10,23 @@ public static MeshData GenerateMesh(float[] heightMap, int width, int height, in
     float topLeftZ = (height - 1) / 2f;
 
     int lodIncrement = Mathf.Max(1, levelOfDetail * 2);
-    int vertsPerLine = (width - 1) / lodIncrement + 1;
+    int vertsPerLine = (width-1) / lodIncrement + 1;
+    int vertsPerColumn = (height-1) / lodIncrement + 1;
 
-    var meshData = new MeshData(vertsPerLine,vertsPerLine);
+    var meshData = new MeshData(vertsPerLine,vertsPerColumn);
     int vertIndex = 0;
-
     int triangleIndex = 0;
-    for (int y = 0; y < height; y += lodIncrement)
+    for (int i = 0; i < vertsPerColumn; i++)
     {
-      for (int x = 0; x < width; x += lodIncrement)
+      for (int j = 0; j < vertsPerLine; j++)
       {
+        int x = j * lodIncrement;
+        int y = i * lodIncrement;
+        
         meshData.vertices[vertIndex] = new Vector3(topLeftX + x,heightMap[y*width + x], topLeftZ - y);
         meshData.uv[vertIndex] = new Vector2(x/(float)width, y/(float)height);
-        
-        if (x < width - 1 && y < height - 1)
+
+        if (j < (vertsPerLine-1) && i < (vertsPerColumn-1))
         {
           triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex, vertIndex + vertsPerLine + 1, vertIndex + vertsPerLine);
           triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex + vertsPerLine + 1, vertIndex, vertIndex + 1);
@@ -32,6 +35,20 @@ public static MeshData GenerateMesh(float[] heightMap, int width, int height, in
         vertIndex++;
       }
     }
+    
+    /*for (int y = 0; y < height; y += lodIncrement)
+    {
+      for (int x = 0; x < width; x += lodIncrement)
+      {
+        if (x < width - 1 && y < height - 1)
+        {
+          //triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex, vertIndex + vertsPerLine, vertIndex + 1);
+          //triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex + 1, vertIndex + vertsPerLine + 1, vertIndex + vertsPerLine);
+          triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex, vertIndex + vertsPerLine + 1, vertIndex + vertsPerLine);
+          triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex + vertsPerLine + 1, vertIndex, vertIndex + 1);
+        }
+      }
+    }*/
 
     return meshData;
   }
@@ -50,11 +67,12 @@ public MeshData(Vector3[] vertices, int[] triangles, Vector2[] uv)
     this.uv = uv;
   }
 
-  public MeshData(int width, int height)
+  public MeshData(int vertsWide, int vertsHigh)
   {
-    vertices = new Vector3[width * height];
-    uv = new Vector2[width * height];
-    triangles = new int[(width - 1) * (height - 1) * 6];
+    vertices = new Vector3[vertsWide * vertsHigh];
+    uv = new Vector2[vertsWide * vertsHigh];
+    triangles = new int[(vertsWide-1) * (vertsHigh-1) * 6];
+    
   }
 
   //Add the triangle and return the next index

Runtime/WorldMap/Layers/RegionMapLayerGenerator.cs

@@ -6,8 +6,9 @@
 public class RegionMapLayerGenerator : ScriptableObject
 {
   public int regionCount = 5;
+  public float waterLevel = 0.2380952f;
 
-  public void AddToWorld(WorldMapData mapData, float waterLevel)
+  public void AddToWorld(WorldMapData mapData)
   {
     var rng = new System.Random(mapData.seed);
     var regionLayer = new RegionMapLayerData();

Runtime/WorldMap/Views/WorldMapTextureView.cs

@@ -6,19 +6,13 @@
 
 public class WorldMapTextureView : MonoBehaviour, IWorldMapView
 {
-    [SerializeField] 
-    private Renderer _renderer = null;
-
-    [SerializeField] 
-    private DrawMode _drawMode = DrawMode.Color;
-
-    [SerializeField] 
-    private TerrainTable _terrainTable = null;
-
-    [SerializeField] 
-    private bool scaleRenderer = false;
+    [SerializeField] private Renderer _renderer = null;
+    [SerializeField] private bool mainTexture = false;
+    [SerializeField] private string texturePropertyName = "_BaseMap";
+    
+    [SerializeField] private TerrainTable _terrainTable = null;
 
-    [SerializeField] private FilterMode filterMode = FilterMode.Point;
+    [SerializeField] private bool scaleRenderer = false;
 
     [SerializeField] private bool gradiate = false;
 
@@ -27,63 +21,12 @@ public class WorldMapTextureView : MonoBehaviour, IWorldMapView
     [SerializeField] private bool drawSpawnPoints = false;
     [SerializeField] private bool drawPoissonPoints = false;
 
+    [SerializeField,Range(0f,1f)] private float borderAlpha = 0.5f;
+    [SerializeField,Range(0,1f)] private float regionFillAlpha = 0.2f;
     [SerializeField] private Color[] regionColors = new Color[0];
+    [SerializeField] private FilterMode filterMode = FilterMode.Point;
 
-    public enum DrawMode
-    {
-        Greyscale,
-        Color
-    }
-
-    public bool applyRegions = false;
-    public int regions = 50;
-    public int seed = 100;
-    public int minimumRegionSize = 50;
-    public bool remapSmallRegions = false;
-    
-    [Range(0f,1f)]
-    public float borderAlpha = 0.5f;
-    
-    [Range(0,1f)]
-    public float regionFillAlpha = 0.2f;
-    
-    public void DisplayMap(WorldMapData mapData)
-    {
-        if (applyRegions)
-        {
-            DisplayMapWithRegions(mapData);
-            return;
-        }
-        
-        var heightMap = mapData.GetLayer<HeightMapLayerData>().heightMap;
-        
-        if (_renderer == null)
-        {
-            return;
-        }
-
-        Texture2D texture = null;
-        if (_drawMode == DrawMode.Greyscale || _terrainTable == null)
-        {
-            texture = TextureUtility.GetHeightMap(heightMap,mapData.width,mapData.height);
-        }
-        else
-        {
-            var terrainMap = _terrainTable.GetTerrainMap(heightMap);
-            var colorMap = TerrainTable.GetColorMap(heightMap,terrainMap,gradiate);
-            texture = TextureUtility.GetColorMap(colorMap,mapData.width,mapData.height);
-        }
-
-        texture.filterMode = filterMode;
-        SetTexture(texture);
-
-        if (scaleRenderer)
-        {
-            _renderer.transform.localScale = new Vector3(mapData.width,mapData.height,1);
-        }
-    }
-
-    public void DisplayMapWithRegions(WorldMapData worldMapData)
+    public void DisplayMap(WorldMapData worldMapData)
     {
         var heightMapLayer = worldMapData.GetLayer<HeightMapLayerData>();
         var regionMapLayer = worldMapData.GetLayer<RegionMapLayerData>();
@@ -98,7 +41,7 @@ public void DisplayMapWithRegions(WorldMapData worldMapData)
         var terrainMap = _terrainTable.GetTerrainMap(heightMap);
         var colorMap = TerrainTable.GetColorMap(heightMap, terrainMap, gradiate);
 
-        if (fillRegions)
+        if (fillRegions && regionColors.Length > 0)
         {
             for (int i = 0; i < colorMap.Length; i++)
             {
@@ -107,13 +50,13 @@ public void DisplayMapWithRegions(WorldMapData worldMapData)
                 {
                     continue;
                 }
-                var regionColor = regionColors[regionIndex - 1];
+                var regionColor = regionColors[(regionIndex - 1) % regionColors.Length];
                 var alpha = Mathf.Clamp01(regionColor.a * regionFillAlpha);
                 colorMap[i] =  regionColor * alpha + (1 - alpha) * colorMap[i];
             }
         }
 
-        if (drawBorders)
+        if (drawBorders && regionColors.Length > 0)
         {
             foreach (var region in regions)
             {
@@ -153,157 +96,25 @@ public void DisplayMapWithRegions(WorldMapData worldMapData)
         }
 
         var texture = TextureUtility.GetColorMap(colorMap,width,height);
-        SetTexture(texture);
-        
-        if (scaleRenderer)
-        {
-            _renderer.transform.localScale = new Vector3(width,height,1);
-        }
-    }
-    
-    public void DisplayMapWithRegions(float[,] noiseMap)
-    {
-        if (_renderer == null)
-        {
-            return;
-        }
-        
-        var width = noiseMap.GetLength(0);
-        var height = noiseMap.GetLength(1);
-
-        //Generate Regions
-        var voronoiData = Voronoi.Create(width, height, regions, seed);
-        var regionColors = Voronoi.GenerateColors(voronoiData.regionCount);
-        
-        Texture2D texture = null;
-        if (_drawMode == DrawMode.Greyscale || _terrainTable == null)
-        {
-            texture = TextureUtility.GetHeightMap(noiseMap);
-        }
-        else
-        {
-            var terrainMap = _terrainTable.GetSingleDimensionTerrainMap(noiseMap);
-            var colorMap = TerrainTable.GetColorMap(noiseMap, terrainMap, gradiate);
-
-            //We only want non-water regions
-            var regionMask = new int[terrainMap.Length];
-            for (var i = 0; i < terrainMap.Length; i++)
-            {
-                regionMask[i] = terrainMap[i].Elevation > 0 ? 1 : 0;
-            }
-
-            if (remapSmallRegions)
-            {
-                for (int i = 0; i < 20; i++)
-                {
-                    Debug.Log($"Combine Step {i}");
-                    if (CombineSmallRegions(regionMask, ref voronoiData.regionData, minimumRegionSize, width, height))
-                    {
-                        break;
-                    }
-                } 
-            }
-            
-            Debug.Log("Colorizing Map");
-            for (int i = 0; i < colorMap.Length; i++)
-            {
-                if (regionMask[i] != 0)
-                {
-                    var regionIndex = voronoiData.regionData[i];
-                    colorMap[i] *= regionColors[regionIndex];
-                }
-            }
-
-            texture = TextureUtility.GetColorMap(colorMap,width,height);
-        }
-
         texture.filterMode = filterMode;
         SetTexture(texture);
-
+        
         if (scaleRenderer)
         {
             _renderer.transform.localScale = new Vector3(width,height,1);
         }
     }
 
-    [SerializeField] private bool URP = false;
-    private static readonly int BaseMap = Shader.PropertyToID("_BaseMap");
-
     private void SetTexture(Texture2D texture)
     {
-        if (URP)
+        if (!mainTexture)
         {
-            //_renderer.sharedMaterial.SetTexture("BaseMap",texture);
-            _renderer.sharedMaterial.SetTexture(BaseMap,texture);
+            _renderer.sharedMaterial.SetTexture(texturePropertyName,texture);
         }
         else
         {
             _renderer.sharedMaterial.mainTexture = texture;
         }
     }
 
-    private static bool CombineSmallRegions(int[] regionMask, ref int[] regionData, int minSize, int width, int height)
-    {
-        //Get Region Sizes
-        var regionSizes = Voronoi.GetRegionSizes(regionMask, regionData);
-        var adjacencies = Voronoi.GetAdjacentRegions(regionMask, regionData, width, height);
-
-        /*foreach (var pair in regionSizes)
-        {
-            Debug.Log($"*{pair.Key} = {pair.Value} < {minSize}");
-        }*/
-        
-        var smallList = new List<int>();
-        foreach (var pair in regionSizes)
-        {
-            if (pair.Value < minSize)
-            {
-                smallList.Add(pair.Key);
-            }
-        }
-
-        if (smallList.Count == 0)
-        {
-            return true;
-        }
-
-        var msg = $"{smallList.Count} small regions";
-        foreach (var idx in smallList)
-        {
-            msg += $" {idx},";
-        }
-        Debug.Log(msg);
-
-        int count = 0;
-        //Remap Small Regions to larger adjacent ones
-        foreach (var smallRegionIndex in smallList)
-        {
-            if (!adjacencies.TryGetValue(smallRegionIndex, out var adjacentList))
-            {
-                //Debug.Log($"{smallRegionIndex} has no adjacent regions");
-                continue;
-            }
-            //Pick a region to remap to
-            var adjacentIndex = adjacentList[0];
-            //Debug.Log($"Remapping {smallRegionIndex} to {adjacentButNotSmallIndex}");
-            int replaceCout = 0;
-            for (int i = 0; i < regionData.Length; i++)
-            {
-                if (regionData[i] == smallRegionIndex)
-                {
-                    regionData[i] = adjacentIndex;
-                    replaceCout++;
-                }
-            }
-            
-            //Debug.Log($"Replaced {smallRegionIndex} ({replaceCout} pixels) with {adjacentIndex}");
-
-            count++;
-        }
-        Debug.Log($"Remapped {count}");
-        
-        return false;
-    }
-
-    
 }

Runtime/WorldMap/WorldMapGenerator.cs

@@ -17,9 +17,6 @@ public class WorldMapGenerator : MonoBehaviour
 
     [SerializeField] 
     private PoissonMapLayerGenerator poissonMapGenerator;
-    
-    [SerializeField] 
-    private float waterLevel = 0.2380952f;
 
     [SerializeField] private int seed = 100;
 
@@ -38,7 +35,7 @@ public void GenerateMap()
             height = mapHeight
         };
         heightMapGenerator.AddToWorld(worldData);
-        regionMapGenerator.AddToWorld(worldData,waterLevel);
+        regionMapGenerator.AddToWorld(worldData);
         poissonMapGenerator.AddToWorld(worldData);
         DisplayMap(worldData);
     }