Skip to content

Guard single-corner geometry smoothing against missing portal neighbors #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 9 commits into
base: develop
Choose a base branch
from
+18 −3
Open

Guard single-corner geometry smoothing against missing portal neighbors #1200

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e222ab
Initial plan
Copilot Apr 19, 2026
0457fef
Guard corner smoothing against missing sectors
Copilot Apr 19, 2026
9e88185
Apply review feedback for corner smoothing guard
Copilot Apr 19, 2026
20964b4
Clarify null-safe corner smoothing loop
Copilot Apr 19, 2026
b87e1ee
Use Array.Fill for missing corner fallback
Copilot Apr 19, 2026
40bb720
Extract corner height comparison helper
Copilot Apr 19, 2026
06e1d04
Use PascalCase for local corner helper
Copilot Apr 19, 2026
d7f6ff9
Make corner helper inputs explicit
Copilot Apr 19, 2026
f166289
Clarify null-safe corner helper name
Copilot Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions TombEditor/EditorActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,25 @@ void smoothEdit(RoomSectorPair pair, SectorEdge edge)
case ArrowType.CornerNW: origin = SectorEdge.XnZp; break;
case ArrowType.CornerSE: origin = SectorEdge.XpZn; break;
}

var originSector = room.GetSectorTryThroughPortal(startCoord);
var originHeight = originSector.Sector.GetHeight(vertical, origin) + originSector.Room.Position.Y;
for (int i = 0; i < 4; i++)
corners[i] = originHeight == cornerSectors[i].Sector.GetHeight(vertical, (SectorEdge)i) + cornerSectors[i].Room.Position.Y;
if (originSector.Sector == null || originSector.Room == null)
Array.Fill(corners, false);
else
{
var originHeight = originSector.Sector.GetHeight(vertical, origin) + originSector.Room.Position.Y;

bool IsCornerValidAndAtSameHeight(RoomSectorPair cornerSector, SectorEdge edge, SectorVerticalPart cornerVertical, int referenceHeight)
{
if (cornerSector.Sector == null || cornerSector.Room == null)
return false;

return referenceHeight == cornerSector.Sector.GetHeight(cornerVertical, edge) + cornerSector.Room.Position.Y;
}

for (int i = 0; i < 4; i++)
corners[i] = IsCornerValidAndAtSameHeight(cornerSectors[i], (SectorEdge)i, vertical, originHeight);
}
}

// Smoothly change sectors on the corners
Expand Down