Modified HightMapLayerGenerator to use Simplex 2D fractal noise.

Author: Cory Leach

Runtime/Utility/Noise.cs

@@ -16,75 +16,17 @@ public static class Noise
     /// <param name="persistence"></param>
     /// <param name="lacunarity"></param>
     /// <returns></returns>
-    public static float[,] GenerateNoiseMap(int mapWidth, int mapHeight, int seed, Vector2 offset, float scale, int octaves = 4, float persistence = 0.5f, float lacunarity = 2f, float[,] falloffMap = null)
+    public static float[,] GenerateNoiseMap(int mapWidth, int mapHeight, uint seed, Vector2 offset, float frequency, int octaves = 4, float persistence = 0.5f, float lacunarity = 2f, float[,] falloffMap = null)
     {
       var noiseMap = new float[mapWidth, mapHeight];
 
       //Generate some random offsets based on the seed
-      var rng = new System.Random(seed);
-      var octaveOffsets = new Vector2[octaves];
-      for (int i = 0; i < octaves; i++)
-      {
-        octaveOffsets[i] = new Vector2
-        {
-          x = rng.Next(-100000, 100000) + offset.x,
-          y = rng.Next(-100000, 100000) + offset.y
-        };
-      }
-
-      scale = Mathf.Max(scale, 0.0000001f);
-
-      var maxNoiseHeight = float.MinValue;
-      var minNoiseHeight = float.MaxValue;
-
-      var halfWidth = mapWidth * 0.5f;
-      var halfHeight = mapHeight * 0.5f;
-
-      for (int y = 0; y < mapHeight; y++)
-      {
-        for (int x = 0; x < mapWidth; x++)
-        {
-          float amplitude = 1;
-          float frequency = 1;
-          float noiseHeight = 0;
-
-          for (int i = 0; i < octaves; i++)
-          {
-            var sampleX = (x-halfWidth) / scale * frequency + octaveOffsets[i].x;
-            var sampleY = (y-halfHeight) / scale * frequency + octaveOffsets[i].y;
-
-            //Multiply by 2 and subtract one to create values in the range range -1 to 1
-            //We can come back and normalize values later
-            var perlinValue = Mathf.PerlinNoise(sampleX, sampleY) * 2 - 1;
-            noiseHeight += perlinValue * amplitude;
-            amplitude *= persistence;
-            frequency *= lacunarity;
-          }
-
-          //Track min and max values to normalize values later
-          if (noiseHeight > maxNoiseHeight)
-          {
-            maxNoiseHeight = noiseHeight;
-          }
-          else if (noiseHeight < minNoiseHeight)
-          {
-            minNoiseHeight = noiseHeight;
-          }
-
-          noiseMap[x, y] = noiseHeight;
-        }
-      }
-
-      //Normalize Noise Map so all values are in range 0 to 1
       for (int y = 0; y < mapHeight; y++)
       {
         for (int x = 0; x < mapWidth; x++)
         {
-          noiseMap[x, y] = Mathf.InverseLerp(minNoiseHeight, maxNoiseHeight, noiseMap[x, y]);
-          if (falloffMap != null)
-          {
-            noiseMap[x, y] = Mathf.Clamp01(noiseMap[x, y] - falloffMap[x,y]);
-          }
+          var sample = SimplexGradientNoise.FractalGradient2D(x + offset.x, y + offset.y, seed, frequency, octaves, lacunarity, persistence);
+          noiseMap[x, y] = sample.value * (1f - falloffMap[x, y]);
         }
       }
 

Runtime/Visualizers/NoiseVisualizer2D.cs

@@ -21,8 +21,6 @@ public class NoiseVisualizer2D : MonoBehaviour
 
         private Texture2D _texture;
 
-        private float minValue = float.MaxValue;
-        private float maxValue = float.MinValue;
 
         [ContextMenu("ResetMinMax")]
         public void ResetMinMax()
@@ -53,6 +51,12 @@ public enum Dimension
 
         [SerializeField] private Vector3 offset;
 
+        [SerializeField]
+        private float minValue = float.MaxValue;
+        [SerializeField]
+        private float maxValue = float.MinValue;
+
+
         private void OnEnable()
         {
             Generate();
@@ -128,8 +132,7 @@ private void Generate()
                                 persistence);
                             break;
                         case Dimension.Perlin3D:
-                            v = PerlinGradientNoise.Fractal3D(point.x, point.y, point.z, seed, frequency, octaves,
-                                lacunarity, persistence);
+                            v = PerlinGradientNoise.Fractal3D(point.x, point.y, point.z, seed, frequency, octaves, lacunarity, persistence);
                             break;
                         case Dimension.SamplePerlin2D:
                             v = PerlinGradientNoise.FractalSample2D(point.x, point.y, seed, frequency, octaves, lacunarity, persistence).value;

Runtime/Visualizers/SurfaceMeshVisualizer.cs

@@ -101,8 +101,10 @@ private void OnDrawGizmosSelected()
             }
         }
 
-        float minSample = float.MaxValue;
-        float maxSample = float.MinValue;
+        [SerializeField]
+        private float minSample = float.MaxValue;
+        [SerializeField]
+        private float maxSample = float.MinValue;
 
         [ContextMenu("ResetMinMax")]
         public void ResetMinMax()
@@ -143,7 +145,7 @@ private void Refresh()
                 }
             }
 
-            Debug.Log($"Min: {minSample} Max:{maxSample}");
+            //Debug.Log($"Min: {minSample} Max:{maxSample}");
 
             mesh.vertices = vertices;
             mesh.normals = normals;

Runtime/WorldMap/Layers/HeightMapLayerGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace Gameframe.Procgen
 {
@@ -16,10 +17,10 @@ public enum MapType
         [SerializeField] private bool step = false;
 
         [SerializeField] private int stepCount = 10;
-        
+
         [SerializeField] private Vector2 offset = Vector2.zero;
 
-        [SerializeField] private float noiseScale = 1;
+        [FormerlySerializedAs("noiseScale")] [SerializeField] private float frequency = 1;
 
         [SerializeField] private int octaves = 4;
 
@@ -33,23 +34,22 @@ public enum MapType
 
         [SerializeField] private MapType mapType = MapType.Noise;
 
-        public HeightMapLayerData Generate(int width, int height, int seed)
+        public HeightMapLayerData Generate(int width, int height, uint seed)
         {
             float[,] noiseMap;
 
             switch (mapType)
             {
                 case MapType.Noise:
-                    noiseMap = Noise.GenerateNoiseMap(width, height, seed, offset, noiseScale, octaves,
+                    noiseMap = Noise.GenerateNoiseMap(width, height, seed, offset, frequency, octaves,
                         persistence, lacunarity);
                     break;
                 case MapType.Falloff:
                     noiseMap = Noise.GenerateFalloffMap(width, height, falloffA, falloffB);
                     break;
                 case MapType.NoiseWithFalloff:
                     var falloffMap = Noise.GenerateFalloffMap(width, height, falloffA, falloffB);
-                    noiseMap = Noise.GenerateNoiseMap(width, height, seed, offset, noiseScale, octaves,
-                        persistence, lacunarity, falloffMap);
+                    noiseMap = Noise.GenerateNoiseMap(width, height, seed, offset, frequency, octaves, persistence, lacunarity, falloffMap);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -66,11 +66,11 @@ public HeightMapLayerData Generate(int width, int height, int seed)
                     {
                         val = Mathf.RoundToInt(val * stepCount) / (float)stepCount;
                     }
-                    
+
                     heightMap[y * width + x] = val;
                 }
             }
-            
+
             return new HeightMapLayerData
             {
                 heightMap = heightMap
@@ -79,7 +79,7 @@ public HeightMapLayerData Generate(int width, int height, int seed)
 
         public override void AddToWorld(WorldMapData worldMapData)
         {
-            worldMapData.layers.Add(Generate(worldMapData.width,worldMapData.height,worldMapData.seed));
+            worldMapData.layers.Add(Generate(worldMapData.width,worldMapData.height,(uint)worldMapData.seed));
         }
 
         private void OnValidate()
@@ -96,4 +96,3 @@ private void OnValidate()
     }
 
 }
-

Runtime/WorldMap/WorldMapData.cs

@@ -49,4 +49,4 @@ public object GetLayer(System.Type type)
             return null;
         }
     }
-}
+}