erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

feat(render): S2 chunk 2 - render statics borrow the registry's retail cell array

Browse source 
WalkProductionWorldData no longer floods; its indoor and outdoor static
sweeps read ShadowObjectRegistry.TryGetRetailCellArray (retail's
calc_cross_cells_static @0x00515160 -> AddPartsShadow @0x00517e40
CELLARRAY, computed once at registration). The App-owned render flood
(ResolveStaticRenderCells, its fingerprint cache, the primitive-Setup
special case) and Core's ComputeStaticRenderCells are deleted. The one
remaining fallback, an entity the physics publisher has not registered yet
while the projection journal already published it, buckets to the authored
parent cell and is counted per frame (UnregisteredStaticRenderFallbackCount)
for chunk 5 to judge on the connected route.

The Facility stair pin now registers at the projection's own entity id
(the old pure-function test never carried identity) and reads the retail
array; the installed-DAT comparator compares retail against collision.

Gates (run in the implementer's isolated worktree at identical content):
Release build 0/0; Core Physics 2,202/2,202; App hermetic 6,760/6,760 (the
two added WalkProductionWorldData tests); installed-DAT walk/flood/stair
family 24/24; Runtime 1,884/1,884.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-09-02 22:31:46 +02:00
parent 2b40c0bb38
commit 707d2803a4
10 changed files with 392 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

69
tests/AcDream.App.Tests/Physics/RetailCellArrayComparatorInstalledDatTests.cs
View file

@ -33,16 +33,19 @@ namespace AcDream.App.Tests.Physics;
/// <c>PublishStaticEntity</c> branches, plus the
/// <see cref="ShadowShapeBuilder.FromStaticRenderParts"/> part-array input —
/// against a registry backed by the real <see cref="PhysicsDataCache"/>, then
/// prints and compares three answers per fixture: retail's CELLARRAY
/// (<see cref="ShadowObjectRegistry.TryGetRetailCellArray"/>), today's
/// COLLISION cells (<see cref="ShadowObjectRegistry.GetOwnerCells"/>), and
/// today's OLD RENDER cells
/// (<see cref="ShadowObjectRegistry.ComputeStaticRenderCells"/> over the
/// SAME part array and seed). Chunk 1's ownership-map claim is that retail
/// and old-render share one primitive for a BSP-routed static, so this
/// asserts that equality; a retail-vs-collision difference is EXPECTED
/// evidence for chunk 3 (decorative, non-colliding parts) and is printed,
/// never asserted.
/// prints and compares two answers per fixture: retail's CELLARRAY
/// (<see cref="ShadowObjectRegistry.TryGetRetailCellArray"/>) and today's
/// COLLISION cells (<see cref="ShadowObjectRegistry.GetOwnerCells"/>). Chunk
/// 2 deleted the third "old render cells" column
/// (<c>ShadowObjectRegistry.ComputeStaticRenderCells</c>) along with its
/// only production consumer (<c>WalkProductionWorldData.ResolveStaticRenderCells</c>).
/// Every fixture here is BSP-bearing, and chunk 1's evidence
/// (`docs/research/2026-09-01-overhaul/s2-membership-ownership-map.md` §5)
/// found retail == collision == old-render exactly for all five as a
/// structural consequence of the shared bbox-route primitive — so this
/// asserts retail == collision directly; a genuine divergence (expected only
/// for a fixture mixing colliding and non-colliding parts, none of which
/// exist among these fixtures) remains chunk 3 evidence.
/// </summary>
[Trait("Lane", "InstalledDat")]
public sealed class RetailCellArrayComparatorInstalledDatTests
@ -118,11 +121,10 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
/// <summary>
/// Verbatim copy of <c>ShadowObjectRegistry.DeriveOutdoorSeed</c> (private
/// there) — needed here so the SAME resolved seed feeds both
/// <see cref="ShadowObjectRegistry.RegisterMultiPart"/> and the
/// independent <see cref="ShadowObjectRegistry.ComputeStaticRenderCells"/>
/// recompute below (that method requires a non-zero seed directly; it
/// does not derive one).
/// there) — needed here so an outdoor fixture with no explicit
/// <c>seedCellId</c> resolves the SAME seed
/// <see cref="ShadowObjectRegistry.RegisterMultiPart"/> would derive
/// internally, for printing alongside the registered result.
/// </summary>
private static uint DeriveOutdoorSeedForTest(
Vector3 worldPos, float worldOffsetX, float worldOffsetY, uint landblockId)
@ -141,7 +143,6 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
uint EntityId,
IReadOnlyList<uint> RetailCells,
IReadOnlyList<uint> CollisionCells,
IReadOnlyList<uint> OldRenderCells,
RetailCellArrayRoute Route,
int PartCount,
int BspShapeCount,
@ -154,7 +155,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
/// <c>LandblockPhysicsPublisher.PublishStaticEntity</c> uses — plus the
/// chunk-1b whole-part-array side product
/// (<see cref="ShadowShapeBuilder.FromStaticRenderParts"/>), then reads
/// back and prints all three comparator answers.
/// back and prints both comparator answers.
/// </summary>
private ComparatorOutcome RegisterAndCompare(
string label,
@ -232,20 +233,16 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
}
}
IReadOnlyList<uint> oldRenderCells = resolvedSeed != 0u && partArray.Count > 0
? engine.ShadowObjects.ComputeStaticRenderCells(resolvedSeed, worldPos, worldRot, partArray)
: Array.Empty<uint>();
engine.ShadowObjects.TryGetRetailCellArray(entityId, out IReadOnlyList<uint> retailCells);
IReadOnlyList<uint> collisionCells = engine.ShadowObjects.GetOwnerCells(entityId);
RetailCellArrayRoute route = engine.ShadowObjects.GetRetailCellArrayRoute(entityId);
PrintOutcome(
label, entityId, retailCells, collisionCells, oldRenderCells, route,
label, entityId, retailCells, collisionCells, route,
partArray.Count, bspShapes.Count, hasPhysicsBsp, registered, resolvedSeed);
return new ComparatorOutcome(
label, entityId, retailCells, collisionCells, oldRenderCells, route,
label, entityId, retailCells, collisionCells, route,
partArray.Count, bspShapes.Count, registered);
}
@ -254,7 +251,6 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
uint entityId,
IReadOnlyList<uint> retailCells,
IReadOnlyList<uint> collisionCells,
IReadOnlyList<uint> oldRenderCells,
RetailCellArrayRoute route,
int partCount,
int bspShapeCount,
@ -271,7 +267,6 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
$" parts={partCount} bspShapes={bspShapeCount} hasPhysicsBsp={hasPhysicsBsp} collisionRegistered={collisionRegistered} route={route}"));
_out.WriteLine($" retail n={retailCells.Count} {CellSet(retailCells)}");
_out.WriteLine($" collision n={collisionCells.Count} {CellSet(collisionCells)}");
_out.WriteLine($" oldRender n={oldRenderCells.Count} {CellSet(oldRenderCells)}");
foreach (uint cellId in retailCells)
{
@ -287,7 +282,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
if (retailOnly.Any() || collisionOnly.Any())
{
_out.WriteLine(
$" retail-vs-collision difference (EXPECTED evidence, not asserted): "
$" retail-vs-collision difference: "
+ $"retailOnly={CellSet(retailOnly)} collisionOnly={CellSet(collisionOnly)}");
}
}
@ -316,10 +311,10 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
worldPos, worldRot, worldOffsetX, worldOffsetY, landblockId, seedCellId);
}
private static void AssertSameCells(IReadOnlyList<uint> retail, IReadOnlyList<uint> oldRender)
private static void AssertSameCells(IReadOnlyList<uint> retail, IReadOnlyList<uint> collision)
{
Assert.Equal(
oldRender.OrderBy(id => id).ToArray(),
collision.OrderBy(id => id).ToArray(),
retail.OrderBy(id => id).ToArray());
}
@ -328,7 +323,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
// ---------------------------------------------------------------
[Fact]
public void FacilityHubStair_RetailCellArrayMatchesOldRenderCells()
public void FacilityHubStair_RetailCellArrayMatchesCollisionCells()
{
string? datDir = ResolveDatDir();
if (datDir is null) Assert.Fail(SkipMessage);
@ -366,7 +361,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
Assert.Contains(FacilityHub | 0x015Fu, outcome.RetailCells);
Assert.Contains(FacilityHub | 0x015Eu, outcome.RetailCells);
AssertSameCells(outcome.RetailCells, outcome.OldRenderCells);
AssertSameCells(outcome.RetailCells, outcome.CollisionCells);
}
// ---------------------------------------------------------------
@ -389,7 +384,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
}
[Fact]
public void CathedralRamp_RetailCellArrayMatchesOldRenderCells()
public void CathedralRamp_RetailCellArrayMatchesCollisionCells()
{
string? datDir = ResolveDatDir();
if (datDir is null) Assert.Fail(SkipMessage);
@ -434,7 +429,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
landblockId: Cathedral,
seedCellId: parentCellId);
AssertSameCells(outcome.RetailCells, outcome.OldRenderCells);
AssertSameCells(outcome.RetailCells, outcome.CollisionCells);
}
// ---------------------------------------------------------------
@ -442,7 +437,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
// ---------------------------------------------------------------
[Fact]
public void NeftetFormation_RetailCellArrayMatchesOldRenderCells()
public void NeftetFormation_RetailCellArrayMatchesCollisionCells()
{
string? datDir = ResolveDatDir();
if (datDir is null) Assert.Fail(SkipMessage);
@ -475,7 +470,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
landblockId: NeftetLandblock,
seedCellId: 0u);
AssertSameCells(outcome.RetailCells, outcome.OldRenderCells);
AssertSameCells(outcome.RetailCells, outcome.CollisionCells);
}
// ---------------------------------------------------------------
@ -490,7 +485,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
// square_length (#334) — the sphere is typically much looser (a first
// pass keyed on BoundingSphere.Radius picked the #334 Neftet formation
// itself, whose 69 m sphere radius crosses 0 m at its 63.78 m origin but
// whose real 96 m box does not — see NeftetFormation_RetailCellArrayMatchesOldRenderCells,
// whose real 96 m box does not — see NeftetFormation_RetailCellArrayMatchesCollisionCells,
// which already covers that object; this scan explicitly excludes it so
// fixture 4 stays independent of fixture 3).
// ---------------------------------------------------------------
@ -521,7 +516,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
}
[Fact]
public void OutdoorLandblockEdgeCrosser_RetailCellArrayMatchesOldRenderCells()
public void OutdoorLandblockEdgeCrosser_RetailCellArrayMatchesCollisionCells()
{
string? datDir = ResolveDatDir();
if (datDir is null) Assert.Fail(SkipMessage);
@ -574,7 +569,7 @@ public sealed class RetailCellArrayComparatorInstalledDatTests
$" cells in a NEIGHBOR landblock (edge-crossing evidence): "
+ $"[{string.Join(",", foreignLandblockCells.Select(id => FormattableString.Invariant($"0x{id:X8}")))}]");
AssertSameCells(outcome.RetailCells, outcome.OldRenderCells);
AssertSameCells(outcome.RetailCells, outcome.CollisionCells);
}
// ---------------------------------------------------------------