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

3D Floor Mode: fixed a problem where creating 3D floors failed. Fixes #945

Browse source
This commit is contained in:
biwa 2023-08-15 20:45:30 +02:00
parent fbfd4dc0af
commit 1fca52ef08
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/Plugins/3DFloorMode/ControlSectorArea.cs
View file

@ -261,7 +261,6 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode
{
case Highlight.Body:
Vector2D diff = GridSetup.SnappedToGrid(pos, gridsize, gridsizeinv) - GridSetup.SnappedToGrid(lastpos, gridsize, gridsizeinv);
Debug.WriteLine("diff: " + (diff).ToString());
outerleft += diff.x;
outerright += diff.x;
outertop += diff.y;
@ -389,7 +388,7 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode
/// <returns>true if there's an intersection, false if there isn't</returns>
private bool SectorInNewControlSectorSpace(int x, int y, Sector sector)
{
RectangleF rect = new RectangleF(x + 1, y - 1, gridsize - 2, gridsize - 2);
int margin = (int)((gridsize - sectorsize) / 2);
HashSet<Vertex> sectorvertices = new HashSet<Vertex>();
// Any of the sector's sidedef's linedef's vertices inside the new control sector's space?
@ -400,16 +399,16 @@ namespace CodeImp.DoomBuilder.ThreeDFloorMode
}
foreach (Vertex v in sectorvertices)
if (rect.Contains((float)v.Position.x, (float)v.Position.y))
if (v.Position.x >= x + margin && v.Position.x <= x + margin + sectorsize && v.Position.y <= y - margin && v.Position.y >= y - margin - sectorsize)
return true;
// Any of the new vertex positions in the sector?
Vector2D[] points = new Vector2D[]
{
new Vector2D(x + 1, y - 1),
new Vector2D(x + gridsize - 1, y - 1),
new Vector2D(x + gridsize - 1, y + gridsize + 1),
new Vector2D(x + 1, y + gridsize + 1)
new Vector2D(x + margin, y - margin),
new Vector2D(x + margin + sectorsize, y - margin -sectorsize),
new Vector2D(x + margin + sectorsize, y - margin - sectorsize),
new Vector2D(x + margin, y -margin)
};
foreach (Vector2D v in points)