stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed a problem with geometry drawing

Browse source
This commit is contained in:
codeimp 2009-01-14 08:29:26 +00:00
parent d08150ba80
commit dd973ef0cb
1 changed files with 79 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
Source/Geometry/Tools.cs
View file

@ -929,15 +929,64 @@ namespace CodeImp.DoomBuilder.Geometry
// First and last vertex stitch with geometry? // First and last vertex stitch with geometry?
if(points[0].stitch && points[points.Count - 1].stitch) if(points[0].stitch && points[points.Count - 1].stitch)
{ {
// Find out where they will stitch List<LinedefSide> startpoints = new List<LinedefSide>();
List<LinedefSide> endpoints = new List<LinedefSide>();
// Find out where the start will stitch and create test points
Linedef l1 = MapSet.NearestLinedefRange(oldlines, firstline.Start.Position, MapSet.STITCH_DISTANCE); Linedef l1 = MapSet.NearestLinedefRange(oldlines, firstline.Start.Position, MapSet.STITCH_DISTANCE);
if(l1 != null)
{
startpoints.Add(new LinedefSide(l1, true));
startpoints.Add(new LinedefSide(l1, false));
}
else
{
// Not stitched with a linedef, so check if it will stitch with a vertex
Vertex v = MapSet.NearestVertexSquareRange(nonmergeverts, firstline.Start.Position, MapSet.STITCH_DISTANCE);
if((v != null) && (v.Linedefs.Count > 0))
{
// Now we take the two linedefs with adjacent angles to the drawn line
List<Linedef> lines = new List<Linedef>(v.Linedefs);
lines.Sort(new LinedefAngleSorter(firstline, true, firstline.End));
startpoints.Add(new LinedefSide(lines[0], true));
startpoints.Add(new LinedefSide(lines[0], false));
lines.Sort(new LinedefAngleSorter(firstline, false, firstline.End));
startpoints.Add(new LinedefSide(lines[0], true));
startpoints.Add(new LinedefSide(lines[0], false));
}
}
// Find out where the end will stitch and create test points
Linedef l2 = MapSet.NearestLinedefRange(oldlines, lastline.End.Position, MapSet.STITCH_DISTANCE); Linedef l2 = MapSet.NearestLinedefRange(oldlines, lastline.End.Position, MapSet.STITCH_DISTANCE);
if((l1 != null) && (l2 != null)) if(l1 != null)
{
endpoints.Add(new LinedefSide(l2, true));
endpoints.Add(new LinedefSide(l2, false));
}
else
{
// Not stitched with a linedef, so check if it will stitch with a vertex
Vertex v = MapSet.NearestVertexSquareRange(nonmergeverts, lastline.End.Position, MapSet.STITCH_DISTANCE);
if((v != null) && (v.Linedefs.Count > 0))
{
// Now we take the two linedefs with adjacent angles to the drawn line
List<Linedef> lines = new List<Linedef>(v.Linedefs);
lines.Sort(new LinedefAngleSorter(firstline, true, lastline.Start));
endpoints.Add(new LinedefSide(lines[0], true));
endpoints.Add(new LinedefSide(lines[0], false));
lines.Sort(new LinedefAngleSorter(firstline, false, lastline.Start));
endpoints.Add(new LinedefSide(lines[0], true));
endpoints.Add(new LinedefSide(lines[0], false));
}
}
// Found any start and end points?
if((startpoints.Count > 0) && (endpoints.Count > 0))
{ {
List<LinedefSide> shortestpath = null; List<LinedefSide> shortestpath = null;
// Same line? // Same line?
if(l1 == l2) if((l1 == l2) && (l1 != null))
{ {
// Then just connect the two // Then just connect the two
shortestpath = new List<LinedefSide>(); shortestpath = new List<LinedefSide>();
@ -945,35 +994,39 @@ namespace CodeImp.DoomBuilder.Geometry
} }
else else
{ {
// Find the shortest, closest path between these lines // Find the shortest, closest path between start and end points
List<List<LinedefSide>> paths = new List<List<LinedefSide>>(8); foreach(LinedefSide startp in startpoints)
paths.Add(Tools.FindClosestPath(l1, true, l2, true, true)); {
paths.Add(Tools.FindClosestPath(l1, true, l2, false, true)); foreach(LinedefSide endp in endpoints)
paths.Add(Tools.FindClosestPath(l1, false, l2, true, true)); {
paths.Add(Tools.FindClosestPath(l1, false, l2, false, true)); List<LinedefSide> p;
paths.Add(Tools.FindClosestPath(l2, true, l1, true, true)); p = Tools.FindClosestPath(startp.Line, startp.Front, endp.Line, endp.Front, true);
paths.Add(Tools.FindClosestPath(l2, true, l1, false, true)); if((p != null) && ((shortestpath == null) || (p.Count < shortestpath.Count))) shortestpath = p;
paths.Add(Tools.FindClosestPath(l2, false, l1, true, true)); p = Tools.FindClosestPath(endp.Line, endp.Front, startp.Line, startp.Front, true);
paths.Add(Tools.FindClosestPath(l2, false, l1, false, true)); if((p != null) && ((shortestpath == null) || (p.Count < shortestpath.Count))) shortestpath = p;
}
foreach(List<LinedefSide> p in paths) }
if((p != null) && ((shortestpath == null) || (p.Count < shortestpath.Count))) shortestpath = p;
} }
// Found a path? // Found a path?
if(shortestpath != null) if(shortestpath != null)
{ {
// Check which direction the path goes in // Check which direction the path goes in
if(shortestpath[0].Line == l1) bool pathforward = false;
foreach(LinedefSide startp in startpoints)
{ {
// Begin at start if(shortestpath[0].Line == startp.Line)
{
pathforward = true;
break;
}
}
// Begin at first vertex in path
if(pathforward)
v1 = firstline.Start; v1 = firstline.Start;
}
else else
{
// Begin at end
v1 = lastline.End; v1 = lastline.End;
}
// Go for all vertices in the path to make additional lines // Go for all vertices in the path to make additional lines
for(int i = 1; i < shortestpath.Count; i++) for(int i = 1; i < shortestpath.Count; i++)
@ -999,18 +1052,10 @@ namespace CodeImp.DoomBuilder.Geometry
// Make the final line // Make the final line
Linedef lld; Linedef lld;
if(pathforward)
// Check which direction the path goes in
if(shortestpath[0].Line == l1)
{
// Path stops at end
lld = map.CreateLinedef(v1, lastline.End); lld = map.CreateLinedef(v1, lastline.End);
}
else else
{
// Path stops at begin
lld = map.CreateLinedef(v1, firstline.Start); lld = map.CreateLinedef(v1, firstline.Start);
}
// Setup line // Setup line
lld.Marked = true; lld.Marked = true;