PG/inz-00
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added fixing city roads density

Browse Source
This commit is contained in:
veniti 2019-09-26 19:18:49 +02:00
parent ceb20fcba1
commit c33de4afa2
5 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Common/Point.cs
View File

@ -7,6 +7,7 @@ namespace Assets.Common
{
public double x;
public double y;
public double Length => Math.Sqrt(x*x+y*y);
public Point(double x, double y)
{
@ -27,11 +28,14 @@ namespace Assets.Common
return hashCode;
}
public static Point operator +(Point a, Point b) => new Point(a.x + b.x, a.y + b.y);
public static Point operator +(Point a) => a;
public static Point operator -(Point a, Point b) => new Point(a.x - b.x, a.y - b.y);
public static Point operator -(Point a) => new Point(-a.x, -a.y);
public static Point operator *(Point a, double b) => new Point(a.x * b, a.y * b);
public static Point operator /(Point a, double b) => new Point(a.x / b, a.y / b);
}
}

9
Assets/Common/PointUtils.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
namespace Assets.Common
@ -20,6 +21,14 @@ namespace Assets.Common
return result;
}
public static double AngleBetween(Point center, Point a, Point b)
{
a = a - center;
b = b - center;
return Math.Acos((a.x*b.x+a.y*b.y)/(a.Length * b.Length));
}
public static bool IsClockwise(Point center, Point a, Point b)
{
var xa = a.x - center.x;

10
Assets/Common/UnityPointExtensions.cs
View File

@ -19,5 +19,15 @@ namespace Assets.Common
var count = collection.Count();
return collection.ElementAt(generator.Next(count));
}
public static IEnumerable<T> RotateRight<T>(this IEnumerable<T> collection, int count = 1)
{
var diff = collection.Count() - count;
var head = collection.Take(diff);
var tail = collection.Skip(diff).Take(count);
return tail.Concat(head);
}
}
}

67
Assets/Scripts/CityGenerator.cs
View File

@ -46,7 +46,7 @@ namespace Assets.Scripts
public List<CityField> fields = new List<CityField>();
public List<(int, int)> edges;
public City(Graph<Site> startGraph)
{
this.startGraph = startGraph;
@ -69,7 +69,7 @@ namespace Assets.Scripts
private void FixBoundaryEdges(Site site)
{
var a = edges;
var b = site.Edges.Select(x => x.Item1 < x.Item2 ? x : (x.Item2, x.Item1));
var b = site.Edges.Select(x => x.Item1 < x.Item2 ? x : (x.Item2, x.Item1));
edges = a.Union(b).Except(a.Intersect(b)).ToList();
}
@ -77,7 +77,7 @@ namespace Assets.Scripts
public void CreateRoadGraph(IList<Point> points)
{
var pointsForRoads = sites.SelectMany(site => site.Vertices.Select(i => (i, points[i])).Append((-1, site.Point))).Distinct().ToList();
var mapping = pointsForRoads.Select((x, i) => x.Item1 == -1 ? (-1, -1) : (i, x.Item1)).Where(x => x.Item1 != -1).ToDictionary(x => x.Item2, x => x.Item1);
var mapping = pointsForRoads.Select((x, i) => x.Item1 == -1 ? (-1, -1) : (i, x.Item1)).Where(x => x.Item1 != -1).ToDictionary(x => x.Item2, x => x.Item1);
VoronoiGenerator generator = new VoronoiGenerator(pointsForRoads.Select(x => x.Item2));
generator.Generate();
@ -109,8 +109,12 @@ namespace Assets.Scripts
private Graph<Site> _basicGraph;
private List<int> verticesForRoads;
private List<int> verticesForCitites;
public GraphGeneratorDebug debug;
public double minimumAngle = 0.25;
public List<City> cities = new List<City>();
Graph<Site> roads = new Graph<Site>();
Graph<Point> mainRoads = new Graph<Point>();
@ -168,6 +172,7 @@ namespace Assets.Scripts
}
ConnectPointsIntoRoads(newCity);
FixRoadsDensity(newCity, minimumAngle);
CreateFieldBoundaries(newCity);
return newCity;
@ -216,8 +221,64 @@ namespace Assets.Scripts
{
foreach (var (a, b) in city.roads.Edges)
city.fieldBoundaries.AddEdge(a, b);
var deadEnds = city.fieldBoundaries.Vertices.Select((_, i) => i).Where(i => city.fieldBoundaries.Neighbours(i).Count() == 1);
foreach (var deadEnd in deadEnds)
{
var neighbour = city.fieldBoundaries.Neighbours(deadEnd).First();
var closest = city.fieldBoundaries.Vertices
.Select((_, i) => i)
.OrderBy(i => Point.Dist(city.fieldBoundaries[i], city.fieldBoundaries[deadEnd]))
.Skip(1)
.First(c => c != neighbour);
city.fieldBoundaries.AddEdge(deadEnd, closest);
city.roads.AddEdge(deadEnd, closest);
}
}
private void FixRoadsDensity(City city, double angle = 0.25f)
{
// dla każdego punktu w grafie dróg
// chyba że ma 2 to pomiń?
// wyznacz punkt 0
// oblicz odległości kątowe do wszystkich punktów
// posortuj je
// między wszystkimiu parami oblicz kąt
// potem według jakiegoś parametru usuń te, które są za bliskie
for (int i = 0; i < city.roads.Vertices.Count(); i++)
{
var p = city.roads[i];
if (city.roads.Neighbours(i).Count() <= 2)
continue;
var reference = new Point(p.x, p.y + 30);
var orderedNeighours = city.roads.Neighbours(i)
.Select(n => (Vertex: n, Point: city.roads[n]))
.Select(x => (Vertex: x.Vertex, Angle: PointUtils.AngleBetween(p, reference, x.Point)))
.OrderBy(x => x.Angle)
.Select(x => x.Vertex);
foreach (var (a, b) in orderedNeighours.RotateRight(1).Zip(orderedNeighours, (a, b) => (a, b)))
{
if( PointUtils.AngleBetween(p, city.roads[a], city.roads[b]) < angle)
{
city.roads.DeleteEdge(i, a);
}
}
}
}
void CreateWorldRoadGraph()
{
roads.Vertices = verticesForCitites.Select(i => _basicGraph.Vertices[i]).ToList();

4
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2019.3.0a8
m_EditorVersionWithRevision: 2019.3.0a8 (8ea4afdbfa47)
m_EditorVersion: 2019.2.0f1
m_EditorVersionWithRevision: 2019.2.0f1 (20c1667945cf)