fix(physics): port retail's find_bbox_cell_list outdoor extent walk (#334)
acdream had never implemented retail's SECOND cell-membership algorithm.
CPhysicsObj::calc_cross_cells @0x00515230 tests HAS_PHYSICS_BSP_PS at
0x00515285 and jumps (0x0051528f jne 0x515305) to find_bbox_cell_list
@0x00510fc0 for a BSP-bearing object; everything below that jump is the
OTHER algorithm, CObjCell::find_cell_list, and that is all we had. Every
object, BSP-bearing or not, was routed through it.
That path's outdoor expansion is a HARD CAP of one cell in each direction.
CellTransit.AddAllOutsideCells computes minRad = radius, maxRad = 24 - radius
and adds at most the eight neighbours of the sphere's own cell, so for any
radius >= 12 m both boundary tests are unconditionally true and the result is
exactly 3x3. Widening the radius or adding a second sphere is mechanically
incapable of adding a tenth cell. The user's live probe measured the
consequence directly: standing inside a Neftet formation, inCell=2 exempt=2
reached=0 -- the geometry was not a candidate at all.
The port. AddAllOutsideCellsFromParts is CLandCell::add_all_outside_cells
@0x00533360 plus add_cell_block @0x005331d0: base landcell from the FIRST
part's own adjust_to_outside, baseX/baseY within-block, each part's authored
CGfxObj::gfx_bound_box re-fit through all eight corners
(BBox::LocalToGlobal @0x005b2120), floor(v / square_length) where
square_length = 0x7c920c = 24.0f, four accumulators seeded to zero, ONE
rectangle unioned across all parts, FILLED, in GLOBAL lcoords so it crosses
landblocks freely, clamped only to [0, 0x7f8).
BuildShadowCellSetFromParts is find_bbox_cell_list's worklist.
RegisterMultiPart dispatches on the same flag retail does, and
BuildFloodSpheres' BSP arm is deleted rather than left unreachable.
Disassembled from the PDB-paired 2013-09-06 binary, not read from Binary
Ninja: BN mis-renders four separate constructs inside add_all_outside_cells
alone -- a dropped `and eax,0xffff` on baseX, a neg/sbb/and select shown as
identically zero, a wrong get_landcell argument, and both x87 flag tests as
`unimplemented {test ah}`.
ShadowPartGeometry pairs the BSP root sphere with the authored box so no
resolver can answer one and leave the other call site to synthesize a
substitute -- the AP-156 invariant applied a second time, since that split is
what produced AP-156 and then this. The box comes from
FlatGfxObjVisualBounds, already computed by exactly CGfxObj::init_end's
algorithm and already in the prepared package: no bake change, no DAT re-read.
Cost, measured over the installed DATs before any code was written: 1,258
physics-BSP GfxObjs, cells/object p50 4, p90 4, p99 12, max 49. The port is
CHEAPER than the old 3x3 = 9 for 98.97% of them. Row totals (shapes x cells)
over all 1,031 landblocks with BSP owners fall 97,173 -> 15,607 (0.161x);
dense Arwic 0xC6A9 falls 342 -> 43. One landblock more than doubles.
Precondition confirmed before pinning any expected cell set: 0x010046D8's box
is 96 m x 96 m about cell (2,2) = 0x87640013, which independently corroborates
the 3x3-centred-there diagnosis, and its rectangle does contain 0x87640011 and
0x87640019 -- the two cells the probe measured empty.
Register: AP-156's outdoor half CLOSED and its risk column CORRECTED (it read
"extra broadphase candidates, never a missed one", which generalised the indoor
direction to the whole row and is why #334 sat inside it unnoticed). AP-159 +
issue #335 file the unported indoor arm; AD-49 records the seed-time rectangle.
Issue #336 files a fourth load-sensitive test flake seen once during the gate.
Ten tests, every one sabotage-verified in both directions across eight
mutations (dispatch, 8-corner refit, floor-vs-truncation, union-vs-per-part,
map clamp, adjust guard, landblock clamp, box-path-for-everything). The
strongest is an installed-DAT replay of the user's own probe evidence.
Suite 11,208 -> 11,218 passed / 4 skipped / 0 failed; the +10 is exactly the
new tests.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
f0588725cf
commit
13fcf38138
19 changed files with 2186 additions and 137 deletions
|
|
@ -94,21 +94,25 @@ public static class ShadowShapeBuilder
|
|||
/// index and pose, but reads PhysicsBSP from the installed replacement.
|
||||
/// Null or short lists fall back to the Setup identity.</param>
|
||||
/// <param name="physicsBspBounds">The part GfxObj's physics-BSP ROOT
|
||||
/// bounding sphere — retail's <c>CGfxObj::physics_sphere</c>, which is
|
||||
/// literally <c>BSPTREE::GetSphere(physics_bsp)</c> @0x005397e0. Supplies
|
||||
/// BOTH the emitted <see cref="ShadowShape.Radius"/> and its
|
||||
/// <see cref="ShadowShape.BoundsCenter"/>, from one call, so the sphere's
|
||||
/// size can never be carried while its position is dropped. Null (or a
|
||||
/// null result) falls back to the loose-but-safe 2 m placeholder at the
|
||||
/// part origin — a fixture-only configuration; production always supplies
|
||||
/// it (<c>LiveEntityCollisionBuilder</c>).</param>
|
||||
/// bounding sphere AND its authored vertex-array box — retail's
|
||||
/// <c>CGfxObj::physics_sphere</c> (<c>BSPTREE::GetSphere(physics_bsp)</c>
|
||||
/// @0x005397e0) and <c>CGfxObj::gfx_bound_box</c>
|
||||
/// (<c>CPhysicsPart::GetBoundingBox</c> @0x0050d600), as ONE
|
||||
/// <see cref="ShadowPartGeometry"/>. Supplies the emitted
|
||||
/// <see cref="ShadowShape.Radius"/>, <see cref="ShadowShape.BoundsCenter"/>
|
||||
/// and <see cref="ShadowShape.LocalBoundsMin"/>/<c>Max</c> from one call,
|
||||
/// so no part of the flood geometry can be carried while another is
|
||||
/// dropped (AP-156, then #334). Null (or a null result) falls back to the
|
||||
/// loose-but-safe 2 m placeholder at the part origin — a fixture-only
|
||||
/// configuration; production always supplies it
|
||||
/// (<c>LiveEntityCollisionBuilder</c>).</param>
|
||||
public static IReadOnlyList<ShadowShape> FromSetup(
|
||||
Setup setup,
|
||||
float entScale,
|
||||
Func<uint, bool> hasPhysicsBsp,
|
||||
IReadOnlyList<Frame>? partPoseOverride = null,
|
||||
IReadOnlyList<uint>? effectivePartGfxObjIds = null,
|
||||
Func<uint, FlatCollisionSphere?>? physicsBspBounds = null)
|
||||
Func<uint, ShadowPartGeometry?>? physicsBspBounds = null)
|
||||
{
|
||||
if (setup is null) throw new ArgumentNullException(nameof(setup));
|
||||
if (hasPhysicsBsp is null) throw new ArgumentNullException(nameof(hasPhysicsBsp));
|
||||
|
|
@ -210,17 +214,27 @@ public static class ShadowShapeBuilder
|
|||
// supplies both so one cannot be taken without the other.
|
||||
// Absent bounds keep the loose-but-safe 2 m placeholder, centred
|
||||
// on the part origin because nothing better is known.
|
||||
// ShadowShape.Bsp scales radius and centre together.
|
||||
FlatCollisionSphere bounds =
|
||||
// ShadowShape.Bsp scales radius, centre and box together.
|
||||
//
|
||||
// #334: the SAME resolver also supplies the authored vertex-array
|
||||
// box. Retail's outdoor cell membership
|
||||
// (CLandCell::add_all_outside_cells @0x00533360, reached from
|
||||
// find_bbox_cell_list @0x00510fc0) divides that box — never the
|
||||
// sphere — by square_length to build its cell rectangle, so a
|
||||
// resolver that answered only the sphere would leave that walk
|
||||
// with nothing to walk.
|
||||
ShadowPartGeometry geometry =
|
||||
physicsBspBounds?.Invoke(gfxId)
|
||||
?? new FlatCollisionSphere(Vector3.Zero, 2f);
|
||||
?? ShadowPartGeometry.Create(
|
||||
new FlatCollisionSphere(Vector3.Zero, 2f),
|
||||
null);
|
||||
|
||||
result.Add(ShadowShape.Bsp(
|
||||
gfxObjId: gfxId,
|
||||
localPosition: new Vector3(partFrame.Origin.X, partFrame.Origin.Y, partFrame.Origin.Z) * entScale,
|
||||
localRotation: partFrame.Orientation,
|
||||
scale: entScale,
|
||||
localBounds: bounds));
|
||||
localGeometry: geometry));
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
@ -308,12 +322,21 @@ public static class ShadowShapeBuilder
|
|||
phys.BoundingSphere?.Origin ?? Vector3.Zero,
|
||||
phys.BoundingSphere?.Radius ?? 1f);
|
||||
|
||||
// #334: the same cached record carries the authored vertex-array
|
||||
// box (CGfxObj::gfx_bound_box), which retail's outdoor extent walk
|
||||
// — CLandCell::add_all_outside_cells @0x00533360 — divides by
|
||||
// square_length. Landblock-baked part arrays are exactly the
|
||||
// population whose extent exceeds one 24 m land cell, so the
|
||||
// sphere alone cannot describe their membership.
|
||||
ShadowPartGeometry geometry =
|
||||
ShadowPartGeometry.Create(localBounds, phys.VisualBounds);
|
||||
|
||||
shapes.Add(ShadowShape.Bsp(
|
||||
gfxObjId: meshRef.GfxObjId,
|
||||
localPosition: pPos,
|
||||
localRotation: pRot,
|
||||
scale: partScale,
|
||||
localBounds: localBounds));
|
||||
localGeometry: geometry));
|
||||
}
|
||||
|
||||
return shapes;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue