Add deterministic elbow-corner fallback for missed corner caps
- In wall pass2, when exact 8-bit corner mapping misses, derive corner bucket from elbow cardinals + elbow diagonal bit - Preserve strict behavior: no broad corner fallback; only exact or deterministic elbow mapping - Covers cases where valid corner cells were left as cardinal walls
This commit is contained in:
@@ -568,6 +568,15 @@ public class DungeonGeneratorVNext
|
||||
wallDef = SelectWallDefinitionForBucket(tileContext, exact8);
|
||||
}
|
||||
|
||||
if (wallDef == null)
|
||||
{
|
||||
string? derivedCornerBucket = ResolveElbowCornerBucket(mask4, mask8);
|
||||
if (!string.IsNullOrEmpty(derivedCornerBucket))
|
||||
{
|
||||
wallDef = SelectWallDefinitionForBucket(tileContext, derivedCornerBucket);
|
||||
}
|
||||
}
|
||||
|
||||
if (wallDef == null)
|
||||
{
|
||||
continue;
|
||||
@@ -936,6 +945,36 @@ public class DungeonGeneratorVNext
|
||||
return null;
|
||||
}
|
||||
|
||||
private static string? ResolveElbowCornerBucket(int mask4, int mask8)
|
||||
{
|
||||
// For elbow masks, use the elbow diagonal bit to pick inner vs diagonal corner bucket.
|
||||
// Bit order (mask8): N,NE,E,SE,S,SW,W,NW.
|
||||
return mask4 switch
|
||||
{
|
||||
// E + S, uses SE diagonal (bit 4)
|
||||
0b0110 => (mask8 & (1 << 4)) != 0
|
||||
? "WallInnerCornerDownRight"
|
||||
: "WallDiagonalCornerDownRight",
|
||||
|
||||
// S + W, uses SW diagonal (bit 2)
|
||||
0b0011 => (mask8 & (1 << 2)) != 0
|
||||
? "WallInnerCornerDownLeft"
|
||||
: "WallDiagonalCornerDownLeft",
|
||||
|
||||
// N + W, uses NW diagonal (bit 0)
|
||||
0b1001 => (mask8 & (1 << 0)) != 0
|
||||
? "WallInnerCornerDownRight"
|
||||
: "WallDiagonalCornerUpLeft",
|
||||
|
||||
// N + E, uses NE diagonal (bit 6)
|
||||
0b1100 => (mask8 & (1 << 6)) != 0
|
||||
? "WallInnerCornerDownLeft"
|
||||
: "WallDiagonalCornerUpRight",
|
||||
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
|
||||
private sealed record TileBuildContext(
|
||||
Dictionary<int, TileMapSheet> SheetsById,
|
||||
List<TileDefinition> FloorCandidates,
|
||||
|
||||
Reference in New Issue
Block a user