Triage step from the plan at C:\Users\erikn\.claude\plans\ i-did-some-work-sharded-acorn.md. Four sessions on issue #98 left the worktree dirty with ~1352 LOC of mixed work. This commit splits the work into "keep" (defensible + diagnostic) and "drop" (failed experiments), then commits the keep set with the drops removed. Plan asked for three commits (diag / fix / revert); consolidated to one because the diagnostic emits in TransitionTypes.cs are tightly interleaved with the multi-sphere CellTransit calls and the CellId switch. Hunk-level splitting in those files for marginal bisect granularity didn't justify the misclick risk. Reverted entirely (failed experiments per slice 7 handoff): - src/AcDream.Core/Physics/PhysicsDataCache.cs — neg-poly storage fields (Stippling, PosSurface, NegSurface, HasNegativeSide, IsNegativeSide, NegativeSide). - src/AcDream.Core/Physics/ShadowObjectRegistry.cs — isBuilding flag propagation through Register / ShadowEntry. - tests/AcDream.Core.Tests/Physics/BSPQueryTests.cs — 165 lines of PolygonWithNegativeSide_* tests. - tests/AcDream.Core.Tests/Physics/ShadowObjectRegistryTests.cs — isBuilding propagation tests. - src/AcDream.Core/World/WorldEntity.cs — IsLandblockBuilding field (no consumer once ShadowObjectRegistry.isBuilding is gone). - src/AcDream.Core/World/LandblockLoader.cs — IsLandblockBuilding=true setter on building entities (kept BuildBuildingTerrainCells). - src/AcDream.App/Rendering/GameWindow.cs — isBuilding: arg passed to ShadowObjects.Register. - src/AcDream.Core/Physics/BSPQuery.cs — TryAdjustWalkableSide / IsWalkableAt helpers, their callers, the Path 5 / Path 6 neg-poly branch split, the BldgCheck-tied clearCell conditional, and the neg-poly ResolveCellPolygons writes. - src/AcDream.Core/Physics/PhysicsDiagnostics.cs — neg-poly fields in the poly-dump format. - src/AcDream.Core/Physics/TransitionTypes.cs — SpherePath.BldgCheck + SpherePath.HitsInteriorCell fields and every consumer, the savedBldgCheck try/finally around FindCollisions, and the neg-poly format additions to the dump-on-error helper. - src/AcDream.Core/Physics/CellTransit.cs — FindCellSet overloads with hitsInteriorCell out-param and the BuildCellSetAndPickContaining out-param threading. Kept (defensible correctness fixes + diagnostic infrastructure): - src/AcDream.App/Rendering/GameWindow.cs — render-vs-physics cell origin split: the 0.02m render lift no longer leaks into physics BSP caching. lb.BuildingTerrainCells threaded into LandblockMesh.Build. - src/AcDream.Core/World/LoadedLandblock.cs — BuildingTerrainCells record field. - src/AcDream.Core/World/LandblockLoader.cs — BuildBuildingTerrainCells (cy*8+cx from LandBlockInfo.Buildings). - src/AcDream.Core/Terrain/LandblockMesh.cs — hiddenTerrainCells param that collapses owned-cell triangles to a zero-area degenerate. - src/AcDream.App/Streaming/{GpuWorldState,LandblockStreamer}.cs — mechanical BuildingTerrainCells threading through LoadedLandblock reconstructions. - src/AcDream.Core/Physics/CellTransit.cs — multi-sphere FindTransitCellsSphere variant + multi-sphere AddAllOutsideCells + FindCellSet(IReadOnlyList<Sphere>, …) overload + the BSPQuery.SphereIntersectsCellBsp call for loaded neighbours. Matches retail CObjCell::find_cell_list / CEnvCell::find_transit_cells. - src/AcDream.Core/Physics/TransitionTypes.cs — multi-sphere FindCellSet call site, retail-faithful CellId switch after CheckOtherCells, the outdoor-landcell terrain-walkable fallback in CheckOtherCells, and the full diagnostic suite ([step-walk], [walkable-nearest], [issue98-walkable-detail], [cell-set-summary], LastBspHitPoly emits). - src/AcDream.Core/Physics/PhysicsDiagnostics.cs — ProbeStepWalkEnabled gate (ACDREAM_PROBE_STEP_WALK=1) + LogStepWalk helper + FormatVector / FormatPlane utilities. All emit-gated. - src/AcDream.Core/Physics/BSPQuery.cs — diagnostic emits to LastBspHitPoly at four sites in SphereIntersectsPolyInternal / the placement adjustment path. - Test files for the kept work: CellTransitFindCellSetTests, CellTransitFindTransitCellsSphereTests, PhysicsDiagnosticsTests, TransitionCheckOtherCellsTests, LandblockMeshTests, LandblockLoaderTests. Verification: - dotnet build: green, 0 errors, 3 pre-existing warnings. - dotnet test: 1156 passed + 8 failed (baseline was 1148 + 8 pre- existing; the +8 passing are the new tests for the kept defensible work). Same 8 pre-existing failures, no new regressions. Backup of pre-triage worktree state in stash@{0}. A6.P3 #98 is still open; this is the apparatus-prep step, not a fix. Next: cell-dump probe (Step 2 of the plan).
120 lines
4.7 KiB
C#
120 lines
4.7 KiB
C#
using DatReaderWriter;
|
|
using DatReaderWriter.DBObjs;
|
|
|
|
namespace AcDream.Core.World;
|
|
|
|
public static class LandblockLoader
|
|
{
|
|
private const uint GfxObjMask = 0x01000000u;
|
|
private const uint SetupMask = 0x02000000u;
|
|
private const uint TypeMask = 0xFF000000u;
|
|
|
|
/// <summary>
|
|
/// Load a single landblock (heightmap + static objects) from the dats.
|
|
/// </summary>
|
|
/// <returns>Null if the landblock is missing from the cell dat.</returns>
|
|
public static LoadedLandblock? Load(DatCollection dats, uint landblockId)
|
|
{
|
|
var block = dats.Get<LandBlock>(landblockId);
|
|
if (block is null)
|
|
return null;
|
|
|
|
var info = dats.Get<LandBlockInfo>((landblockId & 0xFFFF0000u) | 0xFFFEu);
|
|
var entities = info is null
|
|
? Array.Empty<WorldEntity>()
|
|
: BuildEntitiesFromInfo(info, landblockId);
|
|
var buildingTerrainCells = info is null
|
|
? null
|
|
: BuildBuildingTerrainCells(info);
|
|
|
|
return new LoadedLandblock(landblockId, block, entities, buildingTerrainCells);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Map LandBlockInfo.Buildings to 8x8 terrain mesh cells (cy * 8 + cx).
|
|
/// Retail attaches each CBuildingObj to its outside landcell during
|
|
/// CLandBlock::init_buildings; keep this signal separate from stabs so
|
|
/// ordinary static props do not punch holes in terrain.
|
|
/// </summary>
|
|
public static IReadOnlySet<int> BuildBuildingTerrainCells(LandBlockInfo info)
|
|
{
|
|
var result = new HashSet<int>();
|
|
foreach (var building in info.Buildings)
|
|
{
|
|
int cx = Math.Clamp((int)(building.Frame.Origin.X / 24f), 0, 7);
|
|
int cy = Math.Clamp((int)(building.Frame.Origin.Y / 24f), 0, 7);
|
|
result.Add(cy * 8 + cx);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Pure mapping from a parsed LandBlockInfo to a list of WorldEntity.
|
|
/// Each Stab and BuildingInfo becomes one entity. Unsupported id types
|
|
/// (neither GfxObj 0x01xxxxxx nor Setup 0x02xxxxxx) are silently skipped.
|
|
/// MeshRefs is left empty at this stage — Task 5 populates it.
|
|
/// </summary>
|
|
public static IReadOnlyList<WorldEntity> BuildEntitiesFromInfo(LandBlockInfo info, uint landblockId = 0)
|
|
{
|
|
var result = new List<WorldEntity>(info.Objects.Count + info.Buildings.Count);
|
|
|
|
// When landblockId is non-zero, namespace stab Ids globally:
|
|
// 0xC0XXYY00 + n, where XX = lbX byte, YY = lbY byte
|
|
// matching the scenery (0x80XXYY00) and interior (0x40XXYY00) patterns
|
|
// in GameWindow.cs. The 0xC0 top byte distinguishes stabs from those.
|
|
//
|
|
// Pre-Tier-1 callers (existing tests) pass landblockId=0 and get the
|
|
// legacy starting-from-1 monotonic Ids — compatible with their assertions
|
|
// which check uniqueness within a single landblock.
|
|
//
|
|
// Latent: if a landblock has >256 stabs (rare), nextId overflows the
|
|
// low byte and bleeds into the lbY byte → cross-LB collision. Same
|
|
// pattern + same limitation as scenery/interior. Document but don't
|
|
// fix in this commit — out of scope for the Tier 1 cache bug fix.
|
|
uint stabIdBase = landblockId == 0
|
|
? 0u
|
|
: 0xC0000000u | ((landblockId >> 24) & 0xFFu) << 16 | ((landblockId >> 16) & 0xFFu) << 8;
|
|
uint nextId = stabIdBase == 0 ? 1u : stabIdBase + 1u;
|
|
|
|
foreach (var stab in info.Objects)
|
|
{
|
|
if (!IsSupported(stab.Id))
|
|
continue;
|
|
var stabEntity = new WorldEntity
|
|
{
|
|
Id = nextId++,
|
|
SourceGfxObjOrSetupId = stab.Id,
|
|
Position = stab.Frame.Origin,
|
|
Rotation = stab.Frame.Orientation,
|
|
MeshRefs = Array.Empty<MeshRef>(),
|
|
};
|
|
stabEntity.RefreshAabb(); // A.5 T18: populate cached AABB at construction
|
|
result.Add(stabEntity);
|
|
}
|
|
|
|
foreach (var building in info.Buildings)
|
|
{
|
|
if (!IsSupported(building.ModelId))
|
|
continue;
|
|
var buildingEntity = new WorldEntity
|
|
{
|
|
Id = nextId++,
|
|
SourceGfxObjOrSetupId = building.ModelId,
|
|
Position = building.Frame.Origin,
|
|
Rotation = building.Frame.Orientation,
|
|
MeshRefs = Array.Empty<MeshRef>(),
|
|
};
|
|
buildingEntity.RefreshAabb(); // A.5 T18: populate cached AABB at construction
|
|
result.Add(buildingEntity);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
private static bool IsSupported(uint id)
|
|
{
|
|
var type = id & TypeMask;
|
|
return type == GfxObjMask || type == SetupMask;
|
|
}
|
|
}
|