stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-21 19:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Auto-aligning textures now produces more intuitive results and is consistent between UDMF and non-UDMF maps

Browse source
This commit is contained in:
biwa 2019-10-19 00:29:14 +02:00
parent ba6dc546ba
commit 560d23894d
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -3913,6 +3913,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Get the align job to do // Get the align job to do
SidedefAlignJob j = todo.Pop(); SidedefAlignJob j = todo.Pop();
// Make sure to not align already aligned textures. This prevents unexpected
// results when aligning textures on circular shapes
if (j.sidedef.Marked)
continue;
DebugConsole.WriteLine("Aligning " + j.sidedef);
if(j.forward) if(j.forward)
{ {
// Apply alignment // Apply alignment
@ -3931,14 +3938,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(aligny) j.sidedef.OffsetY %= texture.Height; if(aligny) j.sidedef.OffsetY %= texture.Height;
} }
// Add sidedefs forward (connected to the right vertex)
Vertex v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texturehashes, false);
// Add sidedefs backward (connected to the left vertex) // Add sidedefs backward (connected to the left vertex)
v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End; Vertex v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texturehashes, false); AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texturehashes, false);
}
// Add sidedefs forward (connected to the right vertex)
v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texturehashes, false);
}
else else
{ {
// Apply alignment // Apply alignment
@ -3957,13 +3964,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(aligny) j.sidedef.OffsetY %= texture.Height; if(aligny) j.sidedef.OffsetY %= texture.Height;
} }
// Add sidedefs backward (connected to the left vertex)
Vertex v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texturehashes, false);
// Add sidedefs forward (connected to the right vertex) // Add sidedefs forward (connected to the right vertex)
v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start; Vertex v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texturehashes, false); AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texturehashes, false);
// Add sidedefs backward (connected to the left vertex)
v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texturehashes, false);
} }
} }
} }
@ -4093,8 +4100,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Get the align job to do // Get the align job to do
SidedefAlignJob j = todo.Pop(); SidedefAlignJob j = todo.Pop();
// Make sure to not align already aligned textures. This prevents unexpected
// results when aligning textures on circular shapes
if (j.sidedef.Marked)
continue;
//mxd. Get visual parts //mxd. Get visual parts
if(VisualSectorExists(j.sidedef.Sector)) if (VisualSectorExists(j.sidedef.Sector))
{ {
VisualSidedefParts parts = ((BaseVisualSector)GetVisualSector(j.sidedef.Sector)).GetSidedefParts(j.sidedef); VisualSidedefParts parts = ((BaseVisualSector)GetVisualSector(j.sidedef.Sector)).GetSidedefParts(j.sidedef);
VisualSidedefParts controlparts = (j.sidedef != j.controlSide ? ((BaseVisualSector)GetVisualSector(j.controlSide.Sector)).GetSidedefParts(j.controlSide) : parts); VisualSidedefParts controlparts = (j.sidedef != j.controlSide ? ((BaseVisualSector)GetVisualSector(j.controlSide.Sector)).GetSidedefParts(j.controlSide) : parts);