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

fix(chargen): Campaign CC CC6b-PRE review fix round — F1-F7 + F11 concession rewrite

Browse source 
F1 (BLOCKING, doc-only) — the idle-by-default rationale rested on an unsound
"uninitialized C++ member defaults to 0" argument (heap operator-new memory
is indeterminate, not zero). Verified and replaced with the real evidence:
gmCGAppearancePage::InitializePage @0x0047FDD0 writes an EXPLICIT
this->m_bZoomedIn = 0; at 0x004802C3, immediately after that same function
points the camera at the zoomed-IN per-heritage eye (0x00480286-0x0048029E).
Fixed in all three places: the register's TS-83 retirement clause,
ChargenPreviewAnimator's class doc, ChargenPreviewZoomController.IsZoomedIn's
doc. Recorded the retail quirk this implies: the character starts framed
close-up while not-zoomed-in, so the first Zoom In click (once mounted)
tweens close-eye->close-eye (visually null) while still freezing the
animation — the port reproduces this faithfully.

F2 — ChargenPreviewZoomController and ChargenPreviewAnimator kept
independent _zoomedIn bools synced only via a nullable animator parameter,
risking desync. Retail's m_bZoomedIn is a single field gating both camera
and animation, so the fix makes the animator the sole state owner:
ChargenPreviewZoomController now takes its ChargenPreviewAnimator as a
required constructor dependency, IsZoomedIn reads straight through to it,
and ZoomIn/ZoomOut no longer take a parameter at all — there is no second
bool left to disagree.

F3 — documented the DoRotation counter-clockwise branch's x87-stack
decompiler artifact (BN renders x87_r7_1 = x87_r6_3 at 0x0047CAEB, which
would store delta-degrees instead of the timestamp for CCW only); the port
already stores "now" in both branches, cited against
feedback_bn_decomp_field_names.md.

F4 — ChargenPreviewAnimator.ApplyIdleFrame now double-buffers two
List<MeshRef> instead of allocating fresh every 30fps tick.

F5 — filed docs/ISSUES.md #402 tracking the RetailAnimationCyclePlayback /
LiveEntityAnimationPresenter duplication as an owned post-CC follow-up,
referenced from the new type's own doc.

F6 — reworded the ChargenPreviewEntityBuilder.TryBuild "byte-identical"
claim to result-identical (TryBuildAnimated now also resolves the idle DID
and loads the idle Animation before the wrapper discards them).

F7 — added the missing clockwise >360 clamp test (readable decomp
polarity, unlike F3's CCW artifact).

ALSO — rewrote the CC6b ledger row's m_alternateSetupID MUST-COVER note per
the reviewer's F11 concession: all five write sites belong to gmBarberUI
(the post-creation barber shop), not gmCGAppearancePage, which has no
option-checkbox-equivalent field at all. Added the enclosing-function
citations and an explicit directive that CC6b-mount must NOT build a
crown/no-flame checkbox on the Appearance page.

Tests: ChargenPreviewRotationControllerTests +1 (10 total),
ChargenPreviewZoomControllerTests +2 and every case rewritten for the
required-animator constructor (9 total). Core.Tests 4786/1 skip (unchanged),
Content.Tests 147/0, App.Tests 5152/6 skips (+3) — zero failures in
isolation, full solution Release build green. Two pre-existing flakes
observed across repeated full-solution runs, neither caused by this round
and neither reproducing standalone: Core.Net.Tests' NakEmissionTests loss
soak, and Content.Tests' DecodedTextureCacheTests concurrency race.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-15 19:32:48 +02:00
parent 8dfee1118f
commit 1ba22a01a8
10 changed files with 195 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/AcDream.App.Tests/Rendering/ChargenPreviewRotationControllerTests.cs
View file

@ -103,6 +103,24 @@ public sealed class ChargenPreviewRotationControllerTests
Assert.Equal(120f, controller.HeadingDegrees, 3);
}
/// <summary>
/// F7: exercises the <c>&gt;360 -&gt; -360</c> clamp arm (pseudo-C
/// ~0x0047cb1e-0x0047cb31), the one with readable decomp polarity —
/// unlike the CCW-branch FPU-stack artifact F3 documents, this branch's
/// test/subtract shape is unambiguous. One large clockwise tick pushes
/// heading past 360 in a single call.
/// </summary>
[Fact]
public void Tick_ClockwiseAdvancePast360_ClampsBackBySubtracting360()
{
var controller = new ChargenPreviewRotationController();
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Tick(10.0); // seeds lastRotateTime = 10, zero delta.
controller.Tick(10.0 + 3.5); // 3.5s at 3s/rev = 420 deg -> 420, clamped to 60.
Assert.Equal(60f, controller.HeadingDegrees, 3);
}
[Fact]
public void ToOrientation_AtZeroHeading_IsIdentity()
{

66
tests/AcDream.App.Tests/Rendering/ChargenPreviewZoomControllerTests.cs
View file

@ -13,7 +13,11 @@ namespace AcDream.App.Tests.Rendering;
/// — the port of <c>gmCGAppearancePage::ZoomIn</c>/<c>ZoomOut</c>/
/// <c>DoZoomAnimation</c> (<c>0x0047CF00</c>/<c>0x0047D050</c>/<c>0x0047C960</c>)
/// including its immediate wiring into <see cref="ChargenPreviewAnimator"/>'s
/// idle-loop ↔ rest-pose swap.
/// idle-loop ↔ rest-pose swap. Fix round F2: the controller now takes its
/// <see cref="ChargenPreviewAnimator"/> as a required constructor dependency
/// and owns no independent zoom-state bool of its own — every test here
/// builds a real (hand-fixture) animator rather than exercising a
/// camera-only path that no longer exists.
/// </summary>
public sealed class ChargenPreviewZoomControllerTests
{
@ -53,14 +57,38 @@ public sealed class ChargenPreviewZoomControllerTests
return new ChargenPreviewAnimator(build);
}
[Fact]
public void Constructor_NullAnimator_Throws()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
Assert.Throws<ArgumentNullException>(
() => new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, animator: null!));
}
[Fact]
public void IsZoomedIn_ReadsThroughToTheAnimator_NoIndependentState()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
var animator = MakeAnimator();
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, animator);
Assert.False(controller.IsZoomedIn);
// Flip the animator's OWN state directly (bypassing the controller
// entirely) — since the controller now reads straight through, there
// is nothing to desync.
animator.SetZoomedIn(true);
Assert.True(controller.IsZoomedIn);
}
[Fact]
public void ZoomIn_StartsATweenTowardTheDefaultEye_AndMarksZoomedIn()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
camera.Eye = ChargenPreviewCamera.ResolveZoomedOutEye((uint)ChargenHeritageGroup.Aluvian);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, MakeAnimator());
controller.ZoomIn(animator: null);
controller.ZoomIn();
Assert.True(controller.IsZoomedIn);
// Tween in progress — eye hasn't jumped yet (Tick hasn't run).
@ -72,13 +100,13 @@ public sealed class ChargenPreviewZoomControllerTests
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
camera.Eye = ChargenPreviewCamera.ResolveZoomedOutEye((uint)ChargenHeritageGroup.Aluvian);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
controller.ZoomIn(animator: null); // real tween: zoomed-out eye -> default eye.
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, MakeAnimator());
controller.ZoomIn(); // real tween: zoomed-out eye -> default eye.
controller.Tick(10.0);
controller.Tick(10.0 + ChargenPreviewCamera.ZoomTweenDurationSeconds + 1.0); // fully complete it.
Vector3 eyeAfterCompletion = camera.Eye;
controller.ZoomIn(animator: null); // second call — retail's own early-return guard.
controller.ZoomIn(); // second call — retail's own early-return guard.
controller.Tick(9999.0); // if ZoomIn wrongly armed a tween, this would move the eye.
Assert.Equal(eyeAfterCompletion, camera.Eye);
@ -89,9 +117,9 @@ public sealed class ChargenPreviewZoomControllerTests
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
Vector3 startEye = camera.Eye;
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, MakeAnimator());
controller.ZoomOut(animator: null);
controller.ZoomOut();
Assert.False(controller.IsZoomedIn);
Assert.Equal(startEye, camera.Eye);
@ -102,10 +130,10 @@ public sealed class ChargenPreviewZoomControllerTests
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
Vector3 startEye = camera.Eye; // ctor default == the zoomed-IN eye.
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
controller.ZoomIn(animator: null); // reach the "zoomed in" state (zero-distance tween — Eye already there).
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, MakeAnimator());
controller.ZoomIn(); // reach the "zoomed in" state (zero-distance tween — Eye already there).
Vector3 targetEye = ChargenPreviewCamera.ResolveZoomedOutEye((uint)ChargenHeritageGroup.Aluvian);
controller.ZoomOut(animator: null); // NOW arms a real tween: default eye -> zoomed-out eye.
controller.ZoomOut(); // NOW arms a real tween: default eye -> zoomed-out eye.
controller.Tick(100.0); // seeds the tween's own start time (first tick of a fresh -0.1 sentinel).
controller.Tick(100.0 + ChargenPreviewCamera.ZoomTweenDurationSeconds / 2.0);
@ -120,10 +148,10 @@ public sealed class ChargenPreviewZoomControllerTests
public void Tick_PastTheFullDuration_ClampsExactlyToTheTargetEye_AndStopsAnimating()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
controller.ZoomIn(animator: null); // reach "zoomed in" (zero-distance).
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, MakeAnimator());
controller.ZoomIn(); // reach "zoomed in" (zero-distance).
Vector3 targetEye = ChargenPreviewCamera.ResolveZoomedOutEye((uint)ChargenHeritageGroup.Aluvian);
controller.ZoomOut(animator: null); // arms the real tween toward targetEye.
controller.ZoomOut(); // arms the real tween toward targetEye.
controller.Tick(0.0);
controller.Tick(100.0); // way past the 0.6s duration.
@ -139,10 +167,10 @@ public sealed class ChargenPreviewZoomControllerTests
public void ZoomIn_ImmediatelyFreezesTheAnimatorToTheRestPose_BeforeTheTweenCompletes()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
var animator = MakeAnimator();
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, animator);
controller.ZoomIn(animator);
controller.ZoomIn();
// No Tick() call at all — retail's ZoomIn calls StopAnimation
// synchronously, before the camera tween has advanced a single frame.
@ -154,11 +182,11 @@ public sealed class ChargenPreviewZoomControllerTests
public void ZoomOut_ImmediatelyResumesTheAnimatorsIdleLoop()
{
var camera = new ChargenPreviewCamera((uint)ChargenHeritageGroup.Aluvian);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera);
var animator = MakeAnimator();
controller.ZoomIn(animator);
var controller = new ChargenPreviewZoomController((uint)ChargenHeritageGroup.Aluvian, camera, animator);
controller.ZoomIn();
controller.ZoomOut(animator);
controller.ZoomOut();
Assert.False(animator.IsZoomedIn);
Assert.Equal(new Vector3(1f, 0f, 0f), animator.Entity.MeshRefs[0].PartTransform.Translation);