chore: singleton BiomeFactory, adding biomes into nodes in map grid

Server/Modules/MapGenerator/Models/Node.cs

@@ -1,23 +1,28 @@
-using Fracture.Server.Modules.Pathfinding.Models;
+using System.ComponentModel.DataAnnotations;
+using Fracture.Server.Modules.Pathfinding.Models;
 
 namespace Fracture.Server.Modules.MapGenerator.Models;
 
 public class Node : IPathfindingNode
 {
+    [Required]
     public int XId { get; set; }
+
+    [Required]
     public int YId { get; set; }
-    public Biome? Biome { get; set; }
 
-    public string? Color { get; set; }
-    public float NoiseValue { get; set; }
+    [Required]
+    public Biome Biome { get; set; }
 
+    [Required]
+    public float NoiseValue { get; set; }
     public int GCost { get; set; }
     public int HCost { get; set; }
     public int FCost => GCost + HCost;
     public bool Walkable { get; set; }
     public IPathfindingNode? PreviousNode { get; set; }
 
-    public Node(int xId, int yId, Biome? biome)
+    public Node(int xId, int yId, Biome biome)
     {
         XId = xId;
         YId = yId;

Server/Modules/MapGenerator/Services/BiomeFactory.cs

@@ -0,0 +1,51 @@
+using System.Drawing;
+using Fracture.Server.Modules.MapGenerator.Models;
+
+namespace Fracture.Server.Modules.MapGenerator.Services;
+
+public sealed class BiomeFactory
+{
+    private BiomeFactory() { }
+
+    private static List<Biome> biomes = new List<Biome>
+    {
+        CreateBiome(BiomeType.DeepOcean, "#21618C", 0.0f, 0.02f),
+        CreateBiome(BiomeType.ShallowWater, "#2E86C1", 0.02f, 0.2f),
+        CreateBiome(BiomeType.Beach, "#F9E79F", 0.2f, 0.4f),
+        CreateBiome(BiomeType.Grassland, "#28B463", 0.4f, 0.55f),
+        CreateBiome(BiomeType.Forest, "#1D8348", 0.55f, 0.7f),
+        CreateBiome(BiomeType.Mountains, "#616A6B", 0.7f, 0.85f),
+        CreateBiome(BiomeType.HighMountains, "#515A5A", 0.85f, 1.0f),
+    };
+    private static BiomeFactory _biomeFactory;
+
+    public static BiomeFactory GetBiomeFactory()
+    {
+        if (_biomeFactory == null)
+        {
+            _biomeFactory = new BiomeFactory();
+        }
+        return _biomeFactory;
+    }
+
+    public static List<Biome> GetBiomes()
+    {
+        return biomes;
+    }
+
+    private static Biome CreateBiome(
+        BiomeType type,
+        string colorHex,
+        float minHeight,
+        float maxHeight
+    )
+    {
+        return new Biome
+        {
+            BiomeType = type,
+            Color = ColorTranslator.FromHtml(colorHex),
+            MinHeight = minHeight,
+            MaxHeight = maxHeight,
+        };
+    }
+}

Server/Modules/MapGenerator/Services/MapGeneratorService.cs

@@ -1,4 +1,5 @@
-using System.Numerics;
+using System.Drawing;
+using System.Numerics;
 using Fracture.Server.Modules.MapGenerator.Models;
 using Fracture.Server.Modules.NoiseGenerator.Models;
 using Fracture.Server.Modules.NoiseGenerator.Services;
@@ -64,6 +65,7 @@ private MapData GenerateMap(NoiseParameters noiseParameters)
             Vector2.Zero
         );
 
+        var biomes = BiomeFactory.GetBiomes();
         for (int y = 0; y < height; y++)
         {
             for (int x = 0; x < width; x++)
@@ -87,45 +89,20 @@ private MapData GenerateMap(NoiseParameters noiseParameters)
                         );
                 }
 
-                grid[x, y] = new Node(x, y, null);
-                grid[x, y].NoiseValue = heightMap[x, y];
-                grid[x, y].Walkable = grid[x, y].NoiseValue > 0.2f && grid[x, y].NoiseValue < 0.7f;
-                HeightToColor(grid, heightMap, y, x);
+                var biome = biomes.FirstOrDefault(b =>
+                    heightMap[x, y] >= b.MinHeight && heightMap[x, y] < b.MaxHeight
+                ); //type biome in perlin range
+
+                grid[x, y] = new Node(x, y, biome)
+                {
+                    NoiseValue = heightMap[x, y],
+                    Walkable = !(biome.BiomeType is BiomeType.DeepOcean or BiomeType.ShallowWater),
+                };
+
+                //grid[x, y].Biome.Color = biome != null ? grid[x, y].Biome.Color = biome.Color : biome.Color = Color.White;
             }
         }
 
         return new MapData(grid);
     }
-
-    private static void HeightToColor(Node[,] grid, float[,] heightMap, int y, int x)
-    {
-        if (heightMap[x, y] < 0.02f)
-        {
-            grid[x, y].Color = "#21618C";
-        }
-        else if (heightMap[x, y] < 0.2f)
-        {
-            grid[x, y].Color = "#2E86C1";
-        }
-        else if (heightMap[x, y] < 0.40f)
-        {
-            grid[x, y].Color = "#F9E79F";
-        }
-        else if (heightMap[x, y] < 0.55f)
-        {
-            grid[x, y].Color = "#28B463";
-        }
-        else if (heightMap[x, y] < 0.7f)
-        {
-            grid[x, y].Color = "#1D8348";
-        }
-        else if (heightMap[x, y] < 0.85f)
-        {
-            grid[x, y].Color = "#616A6B";
-        }
-        else
-        {
-            grid[x, y].Color = "#515A5A";
-        }
-    }
 }

Server/Modules/MapGenerator/UI/MapView.razor

@@ -1,4 +1,5 @@
-@using Fracture.Server.Modules.MapGenerator.Models
+@using System.Drawing
+@using Fracture.Server.Modules.MapGenerator.Models
 @using Fracture.Server.Modules.MapGenerator.UI.Models
 @using Fracture.Server.Modules.Pathfinding.Models
 
@@ -56,9 +57,10 @@
 
     private string GetTileColor(Node node)
     {
-        if (MapDisplayData!.ShowColorMap)
-        {
-            return node.Color ?? string.Empty;
+        if (MapDisplayData!.ShowColorMap) {
+            Color color = node.Biome.Color;
+            string hex = $"#{color.R:X2}{color.G:X2}{color.B:X2}"; // rgb -> hex
+            return hex ?? string.Empty;
         }
 
         string hexValue = string.Format("{0:x}", (int)(node.NoiseValue * 255));