Script and demo updates

Author: coryleach

Demo/Demo-URP.unitypackage

@@ -1,4 +1,6 @@
-using UnityEngine;
+using System;
+using UnityEditor.SceneManagement;
+using UnityEngine;
 
 namespace Gameframe.Procgen
 {
@@ -7,7 +9,7 @@ public static class TerrainMeshUtility
   {
     private const int mapChunkSize = 241;
 
-    public static MeshData GenerateMesh(float[] heightMap, int width, int height, int levelOfDetail)
+    public static MeshData GenerateMesh(float[] heightMap, int width, int height, int levelOfDetail, Func<float,float> stepFunction, Func<float,Color> colorFunction = null)
     {
       float topLeftX = (width - 1) / -2f;
       float topLeftZ = (height - 1) / 2f;
@@ -16,7 +18,7 @@ public static MeshData GenerateMesh(float[] heightMap, int width, int height, in
       int vertsPerLine = (width - 1) / lodIncrement + 1;
       int vertsPerColumn = (height - 1) / lodIncrement + 1;
 
-      var meshData = new MeshData(vertsPerLine, vertsPerColumn);
+      var meshData = new MeshData(vertsPerLine, vertsPerColumn, colorFunction != null);
       int vertIndex = 0;
       int triangleIndex = 0;
       for (int i = 0; i < vertsPerColumn; i++)
@@ -26,9 +28,14 @@ public static MeshData GenerateMesh(float[] heightMap, int width, int height, in
           int x = j * lodIncrement;
           int y = i * lodIncrement;
 
-          meshData.vertices[vertIndex] = new Vector3(topLeftX + x, heightMap[y * width + x], topLeftZ - y);
+          meshData.vertices[vertIndex] = new Vector3(topLeftX + x, stepFunction.Invoke(heightMap[y * width + x]), topLeftZ - y);
           meshData.uv[vertIndex] = new Vector2(x / (float) width, y / (float) height);
 
+          if (colorFunction != null)
+          {
+            meshData.colors[vertIndex] = colorFunction.Invoke(heightMap[y * width + x]);
+          }//*/
+          
           if (j < (vertsPerLine - 1) && i < (vertsPerColumn - 1))
           {
             triangleIndex = meshData.AddTriangle(triangleIndex, vertIndex, vertIndex + vertsPerLine + 1,
@@ -39,30 +46,47 @@ public static MeshData GenerateMesh(float[] heightMap, int width, int height, in
           vertIndex++;
         }
       }
-
+      
       return meshData;
     }
+    
+    public static MeshData GenerateMesh(float[] heightMap, int width, int height, float heightScale, int levelOfDetail)
+    {
+      return GenerateMesh(heightMap, width, height, levelOfDetail, x => heightScale * x);
+    }
   }
 
   public class MeshData
   {
     public readonly Vector3[] vertices;
     public readonly int[] triangles;
     public readonly Vector2[] uv;
+    public readonly Color[] colors;
 
     public MeshData(Vector3[] vertices, int[] triangles, Vector2[] uv)
     {
       this.vertices = vertices;
       this.triangles = triangles;
       this.uv = uv;
     }
+    
+    public MeshData(Vector3[] vertices, int[] triangles, Vector2[] uv, Color[] colors)
+    {
+      this.vertices = vertices;
+      this.triangles = triangles;
+      this.uv = uv;
+      this.colors = colors;
+    }
 
-    public MeshData(int vertsWide, int vertsHigh)
+    public MeshData(int vertsWide, int vertsHigh, bool vertexColors = false)
     {
       vertices = new Vector3[vertsWide * vertsHigh];
       uv = new Vector2[vertsWide * vertsHigh];
       triangles = new int[(vertsWide - 1) * (vertsHigh - 1) * 6];
-
+      if (vertexColors)
+      {
+        colors = new Color[vertsWide * vertsHigh];
+      }
     }
 
     //Add the triangle and return the next index
@@ -82,6 +106,12 @@ public Mesh CreateMesh()
         triangles = triangles,
         uv = uv
       };
+
+      if (colors != null)
+      {
+        mesh.colors = colors;
+      }
+      
       mesh.RecalculateNormals();
       return mesh;
     }

Runtime/Utility/TerrainMeshUtility.cs

@@ -16,7 +16,7 @@ public Color GetColor(float value)
       {
         if (value <= regions[i].Threshold)
         {
-          return regions[i].HighColor;
+          return regions[i].ColorGradient.Evaluate(1);
         }
       }
 
@@ -40,8 +40,8 @@ private Color GetGradiatedColor(float value)
 
     public static Color GetGradiatedColor(TerrainType region, float value)
     {
-      var intensity = Mathf.InverseLerp(region.Threshold, region.Floor, value);
-      return Color.Lerp(region.HighColor, region.LowColor, intensity);
+      var intensity = Mathf.InverseLerp(region.Floor, region.Threshold, value);
+      return region.ColorGradient.Evaluate(intensity);
     }
 
     public TerrainType GetTerrainType(float value)
@@ -86,7 +86,7 @@ public static Color[] GetColorMap(float[,] noiseMap, TerrainType[,] terrainMap,
         for (int x = 0; x < width; x++)
         {
           var index = y * width + x;
-          colorMap[index] = gradiate ? GetGradiatedColor(terrainMap[x, y], noiseMap[x, y]) : terrainMap[x, y].HighColor;
+          colorMap[index] = gradiate ? GetGradiatedColor(terrainMap[x, y], noiseMap[x, y]) : terrainMap[x, y].ColorGradient.Evaluate(1);
         }
       }
 
@@ -98,7 +98,7 @@ public static Color[] GetColorMap(float[] noiseMap, TerrainType[] terrainMap, bo
       var colorMap = new Color[noiseMap.Length];
       for (int i = 0; i < colorMap.Length; i++)
       {
-        colorMap[i] = gradiate ? GetGradiatedColor(terrainMap[i], noiseMap[i]) : terrainMap[i].HighColor;
+        colorMap[i] = gradiate ? GetGradiatedColor(terrainMap[i], noiseMap[i]) : terrainMap[i].ColorGradient.Evaluate(1);
       }
 
       return colorMap;
@@ -116,7 +116,7 @@ public static Color[] GetColorMap(float[,] noiseMap, TerrainType[] terrainMap, b
         {
           var index = y * width + x;
           colorMap[index] =
-            gradiate ? GetGradiatedColor(terrainMap[index], noiseMap[x, y]) : terrainMap[index].HighColor;
+            gradiate ? GetGradiatedColor(terrainMap[index], noiseMap[x, y]) : terrainMap[index].ColorGradient.Evaluate(1);
         }
       }
 

Runtime/WorldMap/Terrain/TerrainTable.cs

@@ -38,11 +38,15 @@ public float Threshold
     private float _elevation;
     public float Elevation => _elevation;
 
-    [SerializeField] private Color _lowColor = Color.black;
+    /*[SerializeField] private Color _lowColor = Color.black;
     public Color LowColor => _lowColor;
 
     [FormerlySerializedAs("_color")] [SerializeField]
     private Color _highColor = Color.white;
-    public Color HighColor => _highColor;
+    public Color HighColor => _highColor;*/
+
+    [SerializeField]
+    private Gradient gradient;
+    public Gradient ColorGradient => gradient;
   }
 }

Runtime/WorldMap/Terrain/TerrainType.cs

@@ -10,6 +10,10 @@ public class WoldMapTerrainMeshView : MonoBehaviour, IWorldMapView
         [SerializeField] private MeshFilter _meshFilter = null;
 
         [SerializeField, Range(0,6)] private int levelOfDetail;
+
+        [SerializeField] private float heightScale = 1;
+
+        [SerializeField] private TerrainTable terrainTable = null;
 
         //This is here just to get the enabled checkbox in editor
         private void Start()
@@ -23,8 +27,20 @@ public void DisplayMap(WorldMapData worldMapData)
                 return;
             }
             var heightMap = worldMapData.GetLayer<HeightMapLayerData>().heightMap;
-            var meshData = TerrainMeshUtility.GenerateMesh(heightMap,worldMapData.width,worldMapData.height,levelOfDetail);
-            _meshFilter.mesh = meshData.CreateMesh();
+
+            if (terrainTable == null)
+            {
+                var meshData = TerrainMeshUtility.GenerateMesh(heightMap,worldMapData.width,worldMapData.height,heightScale,levelOfDetail);
+                _meshFilter.mesh = meshData.CreateMesh();
+            }
+            else
+            {
+                var meshData = TerrainMeshUtility.GenerateMesh(heightMap,worldMapData.width,worldMapData.height,levelOfDetail,
+                    x => terrainTable.GetTerrainType(x).Elevation * heightScale, 
+                    x => terrainTable.GetTerrainType(x).ColorGradient.Evaluate(1));
+                _meshFilter.mesh = meshData.CreateMesh();
+            }
+            
         }
     }
 }