[otwarty teren] wydzielenie generowania ze skryptow unity part 3

Assets/Common/Map.cs

@@ -21,8 +21,8 @@ namespace Assets.Common
             }
         }
 
-        public Mesh Mesh { get; set; }
-        
+        public Graph<Point> Boundaries { get; set; }
+
         public readonly Metadata Metadata = new Metadata();
 
         public Map(int seed)

Assets/Common/MapSite.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Assets.Common
 {
@@ -6,7 +7,16 @@ namespace Assets.Common
     public class MapSite
     {
         public readonly Metadata Metadata = new Metadata();
-        
+
+        public MapSite(Point center, IEnumerable<Point> boundary)
+        {
+            Center = center;
+            Boundary = boundary;
+        }
+
+        public Point Center { get; set; }
+        public IEnumerable<Point> Boundary { get; set; }
+
         [field: NonSerialized]
         public Map Map { get; internal set; }
     }

Assets/Scripts/AnnotationPass.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 32fcc0d2a1b24d48b9525945a88ec3a2
+timeCreated: 1573389130

Assets/Scripts/AnnotationPass/LocationsPass.cs

@@ -0,0 +1,12 @@
+using Assets.Common;
+
+namespace Assets.AnnotationPass
+{
+    public class LocationsPass : IAnnotationPass
+    {
+        public void Annotate(Map map)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

Assets/Scripts/AnnotationPass/LocationsPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dbe0bf7461994dc6b4754a5d7927bc04
+timeCreated: 1573389159

Assets/Scripts/IAnnotationPass.cs

@@ -0,0 +1,9 @@
+using Assets.Common;
+
+namespace Assets
+{
+    public interface IAnnotationPass
+    {
+        void Annotate(Map map);
+    }
+}

Assets/Scripts/IAnnotationPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f29f3a8ef63c47e4acb0f0fe114e7cda
+timeCreated: 1573323034

Assets/Scripts/IGridGenerator.cs

@@ -0,0 +1,9 @@
+using Assets.Common;
+
+namespace Assets
+{
+    public interface IGridGenerator
+    {
+        Map CreateGrid(double width, double height);
+    }
+}

Assets/Scripts/IGridGenerator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bbbede9954254e208a6e9701f51a6d9b
+timeCreated: 1573323655

Assets/Scripts/IRenderPass.cs

@@ -0,0 +1,10 @@
+using Assets.Common;
+using UnityEngine;
+
+namespace Assets
+{
+    public interface IRenderPass
+    {
+        void Render(Map map, Component component);
+    }
+}

Assets/Scripts/IRenderPass.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f18534dae89f40afa4fceb93555d1d4f
+timeCreated: 1573323220

Assets/Scripts/LandmassGenerator.cs

@@ -51,7 +51,7 @@ namespace Assets
     [ExecuteInEditMode]
     public class LandmassGenerator : MonoBehaviour
     {
-        private PoissonDiskSampler _sampler;
+        private IPointDistribution _sampler;
         private Random _random;
         
         private VoronoiGenerator  _voronoiGenerator;
@@ -83,26 +83,17 @@ namespace Assets
         void Start()
         {
             Reset();
-        }
+       }
 
         public void Reset()
         {
-            _random = new Random(seed);
+            _random  = new Random(seed);
+            _sampler = new PoissonDiskSampler(radius) { Generator = _random };
+            _points  = new List<Vector3>();
             
-            _sampler = new PoissonDiskSampler(radius);
-            _sampler.Generator = _random;
-        
-            _points = new List<Vector3>();
-            _points.Add(new Vector3(-size.x/8, size.y / 2 + 0.1f));
-            _points.Add(new Vector3(size.x * 1.125f, size.y / 2 - 0.1f));
-            _points.Add(new Vector3(size.x / 2 - 0.1f, -size.y/8));
-            _points.Add(new Vector3(size.x / 2 + 0.1f, size.y * 1.125f));
-            
-            _points.AddRange(_sampler.Generate(size.x, size.y).Select(x => new Vector3((float)x.x, (float)x.y)));
-
             Stage = GenerationStage.Voronoi;
-            
-            _voronoiGenerator  = new VoronoiGenerator(_points.Select(x => new Point(x.x, x.y)).ToList());
+
+            _voronoiGenerator  = null;
             _locationGenerator = null;
             _locationGraph     = null;
 
@@ -113,11 +104,19 @@ namespace Assets
         public void Generate()
         {
             var stopwatch = new Stopwatch();
-            
             stopwatch.Start();
             
             debug.generationTime = 0;
 
+            _points = new List<Vector3>();
+            _points.Add(new Vector3(-size.x/8, size.y / 2 + 0.1f));
+            _points.Add(new Vector3(size.x * 1.125f, size.y / 2 - 0.1f));
+            _points.Add(new Vector3(size.x / 2 - 0.1f, -size.y/8));
+            _points.Add(new Vector3(size.x / 2 + 0.1f, size.y * 1.125f));
+            
+            _points.AddRange(_sampler.Generate(size.x, size.y).Select(x => new Vector3((float)x.x, (float)x.y)));
+            
+
             while (Stage != GenerationStage.Done)
             {
                 Step();

Assets/Scripts/MapGenerator.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Assets.Common;
+
+namespace Assets
+{
+    public class MapGenerator
+    {
+        private IGridGenerator _gridGenerator;
+        private ICollection<IAnnotationPass> _annotationPasses = new List<IAnnotationPass>();
+        private Map _result;
+
+        public IEnumerable<IAnnotationPass> AnnotationPasses => _annotationPasses.AsEnumerable();
+        public Map Result => _result;
+        public bool IsDone => _result != null;
+
+        public MapGenerator(IGridGenerator gridGenerator)
+        {
+            _gridGenerator = gridGenerator;
+        }
+
+        public void AddAnnotationPass(IAnnotationPass pass)
+        {
+            _annotationPasses.Add(pass);
+        }
+
+        public Map Generate(double width, double height)
+        {
+            if (_result != null)
+                return _result;
+
+            _result = _gridGenerator.CreateGrid(width, height);
+            foreach (var pass in _annotationPasses)
+                pass.Annotate(_result);
+
+            return _result;
+        }
+    }
+}

Assets/Scripts/MapGenerator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fcd81ef2365c437e82657a21efe03131
+timeCreated: 1573387486

Assets/Scripts/PointDistribution/IPointDistribution.cs

@@ -5,6 +5,6 @@ namespace Assets.PointDistribution
 {
     public interface IPointDistribution
     {
-        IEnumerable<Point> Generate(float width, float height);
+        IEnumerable<Point> Generate(double width, double height);
     }
 }

Assets/Scripts/PointDistribution/PoissonDiskSampler.cs

@@ -13,9 +13,9 @@ namespace Assets.PointDistribution
         private int k;
         private float r;
 
-        private float Random(float max, float min = 0)
+        private double Random(double max, double min = 0)
         {
-            return (float)Generator.NextDouble() * (max - min) + min;
+            return Generator.NextDouble() * (max - min) + min;
         }
         
         public PoissonDiskSampler(float r, int k = 30)
@@ -24,7 +24,7 @@ namespace Assets.PointDistribution
             this.r = r;
         }
 
-        public IEnumerable<Point> Generate(float width, float height)
+        public IEnumerable<Point> Generate(double width, double height)
         {
             var size = r / Mathf.Sqrt(2);
 
@@ -79,7 +79,7 @@ namespace Assets.PointDistribution
 
             while (active.Count > 0 && watchdog-- > 0)
             {
-                var current = Mathf.FloorToInt(Random(active.Count));
+                var current = (int)Math.Floor(Random(active.Count));
                 var point = active[current];
 
                 var i = 0;

Assets/Scripts/PointDistribution/RandomDistribution.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using Assets.Common;
+
+namespace Assets.PointDistribution
+{
+    public class RandomDistribution : IPointDistribution
+    {
+        public readonly int N;
+        public readonly Random Random;
+
+        public RandomDistribution(int n, Random random)
+        {
+            Random = random ?? new Random();
+            N = n;
+        }
+
+        public IEnumerable<Point> Generate(double width, double height)
+        {
+            for (int x = 0; x < N; x++)
+                    yield return new Point(Random.NextDouble() * width, Random.NextDouble());
+        }
+    }
+}

Assets/Scripts/PointDistribution/RandomDistribution.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6f13b49c7b224b778fdc727d6edfc0a6
+timeCreated: 1573309049

Assets/Scripts/PointDistribution/RegularDistribution.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Assets.Common;
+
+namespace Assets.PointDistribution
+{
+    public class RegularDistribution : IPointDistribution
+    {
+        public readonly float Radius;
+
+        public RegularDistribution(float radius)
+        {
+            Radius = radius;
+        }
+
+        public IEnumerable<Point> Generate(double width, double height)
+        {
+            int xMax = (int)Math.Ceiling(width / Radius);
+            int yMax = (int)Math.Ceiling(height / Radius);
+            
+            for (int x = 0; x < xMax + 1; x++)
+                for (int y = 0; y < yMax + 1; y++)
+                    yield return new Point(x * width / xMax, y * height / yMax);
+        }
+    }
+}

Assets/Scripts/PointDistribution/RegularDistribution.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ed0e523b34b34c5e8b57af43b0ca65cb
+timeCreated: 1573308219

Assets/Scripts/VoronoiGridGenerator.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using Assets.Common;
+using Assets.PointDistribution;
+using Assets.Voronoi;
+
+namespace Assets
+{
+    public class VoronoiGridGenerator : IGridGenerator
+    {
+        public const string VoronoiSiteProperty = "VoronoiSite";
+        
+        private readonly int _seed;
+        private readonly IPointDistribution _sampler;
+
+        public VoronoiGridGenerator(int seed, IPointDistribution sampler)
+        {
+            _seed = seed;
+            _sampler = sampler;
+        }
+
+        public Map CreateGrid(double width, double height)
+        {
+            Map result = new Map(_seed);
+
+            var points = GeneratePoints(width, height);
+            var generator = new VoronoiGenerator(points);
+            
+            generator.Generate();
+
+            result.Boundaries = (Graph<Point>)generator.Voronoi.Clone();
+            result.Sites = generator.Delaunay.Morph(s =>
+            {
+                var site = new MapSite(s.Point, new List<Point>());
+                
+                site.Metadata.SetProperty(VoronoiSiteProperty, s);
+
+                return site;
+            });
+
+            return result;
+        }
+
+        private List<Point> GeneratePoints(double width, double height)
+        {
+            var points = new List<Point>
+            {
+                new Point(-width / 8, height / 2 + 0.1f),
+                new Point(width * 1.125f, height / 2 - 0.1f),
+                new Point(width / 2 - 0.1f, -height / 8),
+                new Point(width / 2 + 0.1f, height * 1.125f)
+            };
+
+            points.AddRange(_sampler.Generate(width, height));
+            
+            return points;
+        }
+    }
+}

Assets/Scripts/VoronoiGridGenerator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e233e6fb732c448bbbbc9980e8e67b80
+timeCreated: 1573324130