feat(chargen): Campaign CC slice CC6b-MOUNT — Appearance page + preview mount

The page-mount half CC6b-PRE deferred: CharacterCreationAppearancePage
(gender buttons, Face/Clothes sub-tabs, nine spin controls with retail's
decrement/increment/select-as-current-part OnClickAt zones, nine color
swatches, shade scrollbar, zoom/rotate wiring) plus ChargenPreviewController,
which bridges the ChargenPreviewRenderer/ChargenPreviewZoomController
camera-injection gap CC6a/CC6b-PRE left open and mounts as the third private
creature viewport beside paperdoll/creature-appraisal.

Color-wheel scouting (campaign risk item 4): live-DAT probe found every
color-wheel-family id resolves through existing DatWidgetFactory mappings
(Button/Scrollbar/generic fallback) — no new widget type needed.

The @140355 gender-flip-on-init oddity (risk item 5): resolved via decomp
alone — gmCharGenMainUI's own ctor calls CharGenState::RandomizeCharacter
before any page constructs, so retail's chargen screen is never actually
blank on open; the Appearance page's gender-flip code always fires against
a real, randomly-rolled gender. Filed AP-214 (acdream doesn't port
RandomizeCharacter this round, so it opens honestly blank instead) and
AP-215 (two narrow visual substitutions: swatch .Selected highlight vs
retail's separate overlay, ordinal labels vs retail's icon-only spins).

AD-101 retired: the Heritage page's auto-gender-select interim default is
deleted now that the Appearance page's real gender buttons exist. TS-82
narrowed to Summary-only.

Scope addendum: ChargenPreviewRotationController's parameterless-constructor
default changes from 0f to a new RetailDefaultHeadingDegrees=180f constant
(retail's InitializePage override, not the ctor's raw 0) — every real
gmCG3DView owner converges on 180 before its first frame, so a controller
defaulting to 0 was a trap for future consumers.

Runtime 1713/0, Core 4786/1 skip, Content 147/0, App 5220/3 skips (Release,
ACDREAM_PROBE_LIVE_MOUNT=1) — zero failures across two clean full-solution
runs; the one Core.Net.Tests NakEmissionTests flake observed on a third run
is the same pre-existing, previously-documented timing flake (zero files
under src/AcDream.Core.Net/ touched, passes 100% in isolation).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-15 21:00:10 +02:00
parent 11374484dc
commit 34c6fceab0
20 changed files with 2109 additions and 57 deletions

View file

@ -0,0 +1,283 @@
using System.Numerics;
using AcDream.App.Rendering;
using AcDream.Content;
using AcDream.Content.CharGen;
using AcDream.Content.Vfx;
using AcDream.Core.CharGen;
using AcDream.Core.Physics.Motion;
using AcDream.Core.World;
using DatReaderWriter;
using DatReaderWriter.Options;
using Xunit;
using Xunit.Abstractions;
namespace AcDream.App.Tests.Rendering;
/// <summary>
/// Campaign CC slice CC6b-MOUNT — installed-DAT gate for
/// <see cref="ChargenPreviewController"/>'s rebuild/render logic, using fake
/// <see cref="IChargenPreviewRenderer"/>/<see cref="IChargenPreviewFrameView"/>
/// implementations (no live GPU device needed — mirrors
/// <c>PaperdollFramePresenterTests</c>'s recording-fake pattern) against a
/// REAL dat-backed <see cref="ChargenOptions"/>/<see cref="ChargenAppearanceCatalog"/>
/// so <c>ChargenAppearanceFactory.TryCompose</c> and
/// <c>ChargenPreviewEntityBuilder.TryBuildAnimated</c> actually run.
/// </summary>
public sealed class ChargenPreviewControllerTests
{
private readonly ITestOutputHelper _out;
public ChargenPreviewControllerTests(ITestOutputHelper output) => _out = output;
private const uint AluvianId = 1u;
private const uint GearknightId = 6u;
[Fact]
public void Rebuild_SameSelectionTwice_IsANoOpSecondTime()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView();
var controller = new ChargenPreviewController(
renderer, new ChargenPreviewCamera(), view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
ChargenAppearanceSelection selection = DefaultSelection(options, AluvianId, 1);
Assert.True(controller.Rebuild(options, AluvianId, 1, selection));
Assert.True(controller.Rebuild(options, AluvianId, 1, selection));
Assert.Equal(1, renderer.SetPreviewCallCount);
}
}
[Fact]
public void Rebuild_HeritageChange_ResetsCameraToTheNewHeritagesDefaultEye()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView();
var camera = new ChargenPreviewCamera();
var controller = new ChargenPreviewController(
renderer, camera, view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
Assert.True(controller.Rebuild(
options, AluvianId, 1, DefaultSelection(options, AluvianId, 1)));
// Poke the SAME camera instance the controller shares (this is
// exactly the injection seam ChargenPreviewController's own doc
// comment describes) — simulates the camera having drifted away
// from the heritage default (e.g. mid zoom-out tween).
camera.Eye = new Vector3(0f, -99f, 99f);
if (!options.TryGetHeritage(GearknightId, out ChargenHeritageOptions? gearknight)
|| gearknight!.GendersByKey.Count == 0)
{
_out.WriteLine("SKIP: installed dat has no Gearknight gender to switch to.");
return;
}
int gearknightGender = gearknight.GendersByKey.Keys.First();
Assert.True(controller.Rebuild(
options, GearknightId, gearknightGender,
DefaultSelection(options, GearknightId, gearknightGender)));
Assert.Equal(ChargenPreviewCamera.ResolveDefaultEye(GearknightId), controller.CameraEye);
}
}
/// <summary>
/// Decomp-cited (<c>gmCGAppearancePage::Update</c>'s two confirmed direct
/// call sites — <c>InitializePage</c> and the gender-button handlers —
/// vs the narrower <c>SetSelection</c>/<c>SetColor</c>/<c>SetShade</c>
/// every spin/color/shade change goes through instead): a rebuild that
/// changes ONLY the appearance selection (same heritage, same gender)
/// must NOT snap the camera back to the heritage default.
/// </summary>
[Fact]
public void Rebuild_AppearanceOnlyChange_LeavesTheCameraUntouched()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView();
var camera = new ChargenPreviewCamera();
var controller = new ChargenPreviewController(
renderer, camera, view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
ChargenAppearanceSelection first = DefaultSelection(options, AluvianId, 1);
Assert.True(controller.Rebuild(options, AluvianId, 1, first));
var pokedEye = new Vector3(0f, -99f, 99f);
camera.Eye = pokedEye;
ChargenAppearanceSelection second = first with { SkinShade = 0.9 };
Assert.True(controller.Rebuild(options, AluvianId, 1, second));
Assert.Equal(pokedEye, controller.CameraEye);
}
}
[Fact]
public void Rebuild_PreservesZoomState_AcrossAnAppearanceOnlyChange()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView();
var controller = new ChargenPreviewController(
renderer, new ChargenPreviewCamera(), view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
ChargenAppearanceSelection first = DefaultSelection(options, AluvianId, 1);
Assert.True(controller.Rebuild(options, AluvianId, 1, first));
controller.ZoomIn();
Assert.True(controller.IsZoomedIn);
// A DIFFERENT selection, same heritage/gender — retail's
// gmCGAppearancePage::Update only resets the camera POSITION on
// heritage/gender change; m_bZoomedIn is untouched by spin/color/
// shade edits.
ChargenAppearanceSelection second = first with { SkinShade = 0.9 };
Assert.True(controller.Rebuild(options, AluvianId, 1, second));
Assert.True(controller.IsZoomedIn);
}
}
[Fact]
public void Rebuild_ThenRender_SeedsTheEntityHeadingToTheRetailDefault180Degrees()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView();
var controller = new ChargenPreviewController(
renderer, new ChargenPreviewCamera(), view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
Assert.True(controller.Rebuild(
options, AluvianId, 1, DefaultSelection(options, AluvianId, 1)));
Assert.NotNull(renderer.LastEntity);
controller.Render();
Quaternion expected = MoveToMath.SetHeading(
Quaternion.Identity, ChargenPreviewRotationController.RetailDefaultHeadingDegrees);
Quaternion actual = renderer.LastEntity!.Rotation;
Assert.Equal(expected.X, actual.X, 4);
Assert.Equal(expected.Y, actual.Y, 4);
Assert.Equal(expected.Z, actual.Z, 4);
Assert.Equal(expected.W, actual.W, 4);
}
}
[Fact]
public void Render_WhilePageInvisible_SkipsRenderAndTexturePublication()
{
if (!TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter))
return;
using (dats)
using (adapter)
{
(ChargenOptions options, ChargenAppearanceCatalog catalog) = LoadFixture(adapter!);
var renderer = new FakeChargenRenderer();
var view = new FakeChargenView { Visible = false };
var controller = new ChargenPreviewController(
renderer, new ChargenPreviewCamera(), view,
adapter!, new RetailAnimationLoader(adapter!), catalog, catalog, new object());
Assert.True(controller.Rebuild(
options, AluvianId, 1, DefaultSelection(options, AluvianId, 1)));
controller.Render();
Assert.Equal(0, renderer.RenderCallCount);
Assert.Null(view.LastTextureHandle);
}
}
private static ChargenAppearanceSelection DefaultSelection(
ChargenOptions options, uint heritageId, int genderKey)
{
Assert.True(options.TryGetHeritage(heritageId, out ChargenHeritageOptions? heritage));
Assert.True(heritage!.GendersByKey.TryGetValue(genderKey, out ChargenGenderOptions? gender));
return ChargenAppearanceSelection.Default with
{
HairStyle = gender!.HairStyles.Count > 0 ? 0u : ChargenAppearanceSelection.Unset,
SkinShade = 0.5,
};
}
private static (ChargenOptions, ChargenAppearanceCatalog) LoadFixture(IDatReaderWriter dats) =>
(ChargenTableReader.Load(dats), new ChargenAppearanceCatalog(dats));
private bool TryOpen(out DatCollection? dats, out DatCollectionAdapter? adapter)
{
string? datDir = CornerFloodReplayTests.ResolveDatDir();
if (datDir is null)
{
_out.WriteLine("SKIP: dats unavailable");
dats = null;
adapter = null;
return false;
}
dats = new DatCollection(datDir, DatAccessType.Read);
adapter = new DatCollectionAdapter(dats);
return true;
}
private sealed class FakeChargenRenderer : IChargenPreviewRenderer
{
public WorldEntity? LastEntity { get; private set; }
public int SetPreviewCallCount { get; private set; }
public int RenderCallCount { get; private set; }
public void SetPreview(WorldEntity? entity)
{
LastEntity = entity;
SetPreviewCallCount++;
}
public uint Render(int width, int height)
{
RenderCallCount++;
return 42u;
}
}
private sealed class FakeChargenView : IChargenPreviewFrameView
{
public bool Visible { get; set; } = true;
public int Width { get; set; } = 128;
public int Height { get; set; } = 128;
public uint? LastTextureHandle { get; private set; }
public bool TryGetVisibleSize(out int width, out int height)
{
width = Width;
height = Height;
return Visible;
}
public void SetTextureHandle(uint textureHandle) => LastTextureHandle = textureHandle;
}
}

View file

@ -11,10 +11,32 @@ namespace AcDream.App.Tests.Rendering;
/// </summary>
public sealed class ChargenPreviewRotationControllerTests
{
/// <summary>
/// CC6b-MOUNT: retail's OPERATIVE starting heading is 180, not the ctor's
/// raw 0 — <c>gmCGAppearancePage::gmCGAppearancePage @0x0047CDAC</c> sets
/// <c>m_fCurHeading = 0f</c>, but <c>InitializePage @0x0047FDD0</c> always
/// runs immediately afterward (before the page is ever visible) and
/// overrides it to <c>180f</c> at <c>0x00480235</c>, pushed via
/// <c>SetPlayerHeading</c> at <c>0x0048023F</c>. No player-visible chargen
/// Appearance frame is ever rendered at 0°. This is the seam a real mount
/// site experiences (the parameterless constructor), pinned here so a
/// future consumer can't silently regress to facing the character away
/// from the camera. See <see cref="ChargenPreviewRotationController.RetailDefaultHeadingDegrees"/>
/// for the full citation, including the cross-confirming
/// <c>gmCGSummaryPage</c>/<c>gmBarberUI</c> sibling call sites.
/// </summary>
[Fact]
public void DefaultConstructor_StartsAtRetailsOperative180DegreeHeading()
{
var controller = new ChargenPreviewRotationController();
Assert.Equal(180f, controller.HeadingDegrees);
}
[Fact]
public void Toggle_StartsRotatingInTheGivenDirection()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
Assert.True(controller.IsRotating);
@ -24,7 +46,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Toggle_SameDirectionWhileRotating_Stops()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Toggle(ChargenRotateDirection.Clockwise);
@ -34,7 +56,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Toggle_OppositeDirectionWhileRotating_SwitchesDirectionAndKeepsRotating()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Toggle(ChargenRotateDirection.CounterClockwise);
@ -45,7 +67,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Tick_WhileNotRotating_IsANoOp()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Tick(100.0);
Assert.Equal(0f, controller.HeadingDegrees);
@ -57,7 +79,7 @@ public sealed class ChargenPreviewRotationControllerTests
// Rotate() invalidates m_dLastRotateTime so the very first DoRotation
// tick resets it to "now" rather than computing a huge jump from a
// stale/never-set timestamp.
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Tick(1000.0);
@ -71,8 +93,10 @@ public sealed class ChargenPreviewRotationControllerTests
// Seed "now" nonzero (0.0 collides with the <= 0 reset-if-invalid
// guard, same as retail's own sentinel check would if Timer::cur_time
// could ever read exactly zero — never in practice, so tests avoid
// it too).
var controller = new ChargenPreviewRotationController();
// it too). Explicit 0f baseline keeps the relative-delta assertion
// below simple; the retail-default seam has its own dedicated test
// above.
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Tick(10.0); // seeds lastRotateTime = 10, zero delta.
controller.Tick(11.5); // half a revolution at 3 s/rev.
@ -83,7 +107,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Tick_CounterClockwiseAdvance_SubtractsAndWrapsPositive()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.CounterClockwise);
controller.Tick(10.0);
controller.Tick(11.5); // would go to -180, wraps to +180.
@ -94,7 +118,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Tick_AccumulatesAcrossMultipleTicks()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
controller.Toggle(ChargenRotateDirection.Clockwise);
controller.Tick(10.0);
controller.Tick(10.5); // +60 deg.
@ -113,7 +137,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void Tick_ClockwiseAdvancePast360_ClampsBackBySubtracting360()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
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.
@ -124,7 +148,7 @@ public sealed class ChargenPreviewRotationControllerTests
[Fact]
public void ToOrientation_AtZeroHeading_IsIdentity()
{
var controller = new ChargenPreviewRotationController();
var controller = new ChargenPreviewRotationController(0f);
Quaternion orientation = controller.ToOrientation();
Assert.Equal(Quaternion.Identity.X, orientation.X, 4);

View file

@ -1,4 +1,5 @@
using System.IO;
using System.Linq;
using AcDream.App.UI;
using AcDream.App.UI.Layout;
using AcDream.Content;
@ -314,6 +315,131 @@ public sealed class CharacterCreationLiveDatTests
}
}
/// <summary>
/// Campaign CC slice CC6b-MOUNT — the Appearance page's full authored
/// widget catalog. Pins the campaign plan's risk item 4 finding (the
/// color-wheel/gradient family resolves through EXISTING
/// <c>DatWidgetFactory</c> mappings; no new widget type was needed —
/// see <see cref="CharacterCreationAppearancePage"/>'s own class doc)
/// against the real installed DAT: gender/Face/Clothes buttons, all
/// nine spins, all nine color swatches, the shade scrollbar, and the
/// viewport.
/// </summary>
[InstalledDatFact]
public void AppearancePage_HasGenderChoiceSpinsSwatchesShadeAndViewport()
{
using var dats = new DatCollection(DatDirectory, DatAccessType.Read);
uint layoutId = RetailDataIdResolver.Resolve(
dats, CharacterCreationUiController.RootEnum, 5u);
ImportedLayout screen = BuildSelected(
dats, layoutId, CharacterCreationUiController.RootElementId);
UiElement appearanceRoot = Assert.IsAssignableFrom<UiElement>(
screen.FindElement(CharacterCreationUiController.AppearancePageElementId));
AssertButton(appearanceRoot, CharacterCreationAppearancePage.FemaleButtonId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.MaleButtonId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.FaceButtonId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.ClothesButtonId);
Assert.IsAssignableFrom<UiElement>(
UiElement.FindDescendant(appearanceRoot, CharacterCreationAppearancePage.FaceChoicesId));
Assert.IsAssignableFrom<UiElement>(
UiElement.FindDescendant(appearanceRoot, CharacterCreationAppearancePage.ClothesChoicesId));
foreach (uint spinId in new[]
{
CharacterCreationAppearancePage.HairSpinId,
CharacterCreationAppearancePage.EyesSpinId,
CharacterCreationAppearancePage.NoseSpinId,
CharacterCreationAppearancePage.MouthSpinId,
CharacterCreationAppearancePage.SkinSpinId,
CharacterCreationAppearancePage.HeadgearSpinId,
CharacterCreationAppearancePage.ShirtSpinId,
CharacterCreationAppearancePage.TrousersSpinId,
CharacterCreationAppearancePage.FootwearSpinId,
})
{
AssertButton(appearanceRoot, spinId);
}
// Every color-wheel-family id resolves through EXISTING
// DatWidgetFactory mappings (Button=1, Scrollbar=0xB, the generic
// Type-3 fallback) — the risk-item-4 scouting result, pinned.
foreach (uint swatchId in CharacterCreationAppearancePage.SwatchIds)
AssertButton(appearanceRoot, swatchId);
Assert.IsType<UiScrollbar>(
UiElement.FindDescendant(appearanceRoot, CharacterCreationAppearancePage.ShadeScrollId));
Assert.IsType<UiDatElement>(
UiElement.FindDescendant(appearanceRoot, CharacterCreationAppearancePage.GradCircleId));
AssertButton(appearanceRoot, CharacterCreationAppearancePage.RotateClockwiseId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.RotateCounterClockwiseId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.ZoomInId);
AssertButton(appearanceRoot, CharacterCreationAppearancePage.ZoomOutId);
Assert.IsType<UiViewport>(
UiElement.FindDescendant(appearanceRoot, CharacterCreationAppearancePage.ViewportId));
}
/// <summary>
/// Live-DAT-measured arrow geometry the page's spin OnClickAt zones are
/// built from — every one of the nine spins is uniformly 200px wide
/// with the two locally-reused arrow child ids
/// (<c>0x1000030a</c> decrement / <c>0x1000030b</c> increment) at the
/// SAME local positions. If a future DAT revision changes this shared
/// template's geometry, this test (not a silent behavior change) is
/// where it shows up.
/// </summary>
[InstalledDatFact]
public void AppearancePage_SpinArrowGeometryIsUniformAcrossAllNineSpins()
{
using var dats = new DatCollection(DatDirectory, DatAccessType.Read);
uint layoutId = RetailDataIdResolver.Resolve(
dats, CharacterCreationUiController.RootEnum, 5u);
ElementInfo rootInfo = Assert.IsType<ElementInfo>(
LayoutImporter.ImportInfos(
dats, layoutId, CharacterCreationUiController.RootElementId));
ElementInfo? appearanceInfo = FindInfo(
rootInfo, CharacterCreationUiController.AppearancePageElementId);
Assert.NotNull(appearanceInfo);
foreach (uint spinId in new[]
{
CharacterCreationAppearancePage.HairSpinId,
CharacterCreationAppearancePage.EyesSpinId,
CharacterCreationAppearancePage.NoseSpinId,
CharacterCreationAppearancePage.MouthSpinId,
CharacterCreationAppearancePage.SkinSpinId,
CharacterCreationAppearancePage.HeadgearSpinId,
CharacterCreationAppearancePage.ShirtSpinId,
CharacterCreationAppearancePage.TrousersSpinId,
CharacterCreationAppearancePage.FootwearSpinId,
})
{
ElementInfo? spin = FindInfo(appearanceInfo!, spinId);
Assert.NotNull(spin);
Assert.Equal(200f, spin!.Width);
ElementInfo? decrement = spin.Children.FirstOrDefault(c => c.Id == 0x1000030Au);
ElementInfo? increment = spin.Children.FirstOrDefault(c => c.Id == 0x1000030Bu);
Assert.NotNull(decrement);
Assert.NotNull(increment);
Assert.Equal(80f, decrement!.X);
Assert.Equal(127f, increment!.X);
}
}
private static ElementInfo? FindInfo(ElementInfo node, uint id)
{
if (node.Id == id) return node;
foreach (ElementInfo child in node.Children)
{
ElementInfo? found = FindInfo(child, id);
if (found is not null) return found;
}
return null;
}
private static RetailDialogFactory MakeDialogFactory(IDatReaderWriter dats, UiRoot host)
{
uint dialogDid = RetailDataIdResolver.Resolve(dats, 2u, 5u);
@ -331,6 +457,9 @@ public sealed class CharacterCreationLiveDatTests
private static void AssertButton(ImportedLayout layout, uint elementId) =>
Assert.IsType<UiButton>(layout.FindElement(elementId));
private static void AssertButton(UiElement root, uint elementId) =>
Assert.IsType<UiButton>(UiElement.FindDescendant(root, elementId));
private static ImportedLayout BuildSelected(
IDatReaderWriter dats,
uint layoutDid,

View file

@ -167,10 +167,12 @@ public sealed class CharacterCreationUiControllerTests
}
/// <summary>gmCGHeritagePage::ListenToElementMessage @ 0x00483860's
/// per-button SetHeritageGroup literal, plus CC4's interim
/// auto-gender-select seam (register AD-100).</summary>
/// per-button SetHeritageGroup literal. AD-101 RETIRED at CC6b-MOUNT:
/// a heritage click no longer auto-selects a gender — the Appearance
/// page's real gender buttons are the only gender-selection path now
/// (see <see cref="AppearanceGenderButton_SelectsGender"/>).</summary>
[Fact]
public void HeritageButton_SelectsHeritage_AndAutoSelectsFirstGender()
public void HeritageButton_SelectsHeritage_WithNoGenderSideEffect()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
@ -178,7 +180,7 @@ public sealed class CharacterCreationUiControllerTests
environment.Button(0x100003BFu).OnClick!(); // Aluvian
Assert.Equal(AluvianId, environment.Runtime.LastSelectedHeritage);
Assert.Equal(GenderKey, environment.Runtime.LastSelectedGender);
Assert.Equal(0u, environment.Runtime.LastSelectedGender);
}
/// <summary>gmCharGenMainUI::SetProgressState @ 0x004e7a10's Olthoi
@ -491,6 +493,251 @@ public sealed class CharacterCreationUiControllerTests
Assert.Null(environment.Host.FixedCanvasSize);
}
// ── Campaign CC slice CC6b-MOUNT: Appearance page ───────────────────
[Fact]
public void AppearanceGenderButton_SelectsGender()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
environment.Runtime.SelectHeritageDirect(AluvianId);
environment.TabButton(CharacterCreationUiController.AppearanceTabElementId).OnClick!();
environment.Button(CharacterCreationAppearancePage.MaleButtonId).OnClick!();
Assert.Equal(1u, environment.Runtime.LastSelectedGender);
environment.Button(CharacterCreationAppearancePage.FemaleButtonId).OnClick!();
Assert.Equal(2u, environment.Runtime.LastSelectedGender);
}
/// <summary>Spin arrow geometry (live-DAT-measured, see
/// <see cref="CharacterCreationAppearancePage"/>'s own class doc):
/// x=[80,127) is the decrement child, x=[127,174) is the increment
/// child.</summary>
[Fact]
public void AppearanceSpin_IncrementZoneClick_CyclesStyleForwardFromUnset()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
environment.Button(CharacterCreationAppearancePage.HairSpinId).OnClickAt!(150, 10);
Assert.Equal(ChargenAppearanceSlot.HairStyle, environment.Runtime.LastAppearanceSlot);
Assert.Equal(0u, environment.Runtime.LastAppearanceIndex);
}
[Fact]
public void AppearanceSpin_DecrementZoneClick_FromUnset_StartsAtStyleZero()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
// Non-headgear spins have no decomp-observable Unset-cycling case
// (retail always has a real 0-based index by the time the user can
// click — CycleIndex's own citation) — a first click from Unset in
// EITHER direction just starts cycling at style 0, not a ring.
environment.Button(CharacterCreationAppearancePage.HairSpinId).OnClickAt!(100, 10);
Assert.Equal(ChargenAppearanceSlot.HairStyle, environment.Runtime.LastAppearanceSlot);
Assert.Equal(0u, environment.Runtime.LastAppearanceIndex);
}
/// <summary>CharGenState::SetHeadgearStyle's decomp-derived
/// (count+1)-position ring: incrementing from Unset lands on style 0;
/// decrementing FROM style 0 lands back on Unset. Headgear is the ONLY
/// spin with this ring — see <see cref="CharacterCreationAppearancePage.CycleIndex"/>'s
/// own citation.</summary>
[Fact]
public void AppearanceHeadgearSpin_RingIncludesTheUnsetPosition()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
environment.TabButton(CharacterCreationUiController.AppearanceTabElementId).OnClick!();
environment.Button(CharacterCreationAppearancePage.ClothesButtonId).OnClick!();
environment.Button(CharacterCreationAppearancePage.HeadgearSpinId).OnClickAt!(150, 10); // increment
Assert.Equal(ChargenAppearanceSlot.HeadgearStyle, environment.Runtime.LastAppearanceSlot);
Assert.Equal(0u, environment.Runtime.LastAppearanceIndex);
environment.Button(CharacterCreationAppearancePage.HeadgearSpinId).OnClickAt!(100, 10); // decrement
Assert.Equal(RuntimeCharacterCreationAppearance.Unset, environment.Runtime.LastAppearanceIndex);
}
/// <summary>Pure wrap-semantics unit tests for
/// <see cref="CharacterCreationAppearancePage.CycleIndex"/> — the
/// decomp-derived arithmetic every spin's OnClickAt zone drives.
/// </summary>
[Theory]
[InlineData(0u, +1, 3, false, 1u)]
[InlineData(2u, +1, 3, false, 0u)] // plain wrap forward past the end.
[InlineData(1u, -1, 3, false, 0u)]
[InlineData(0u, -1, 3, false, 2u)] // plain wrap backward past the start.
[InlineData(RuntimeCharacterCreationAppearance.Unset, +1, 3, false, 0u)]
[InlineData(RuntimeCharacterCreationAppearance.Unset, -1, 3, false, 0u)]
[InlineData(0u, -1, 3, true, RuntimeCharacterCreationAppearance.Unset)] // headgear ring: 0 -> Unset.
[InlineData(RuntimeCharacterCreationAppearance.Unset, +1, 3, true, 0u)] // headgear ring: Unset -> 0.
[InlineData(2u, +1, 3, true, RuntimeCharacterCreationAppearance.Unset)] // headgear ring: last -> Unset.
[InlineData(RuntimeCharacterCreationAppearance.Unset, -1, 3, true, 2u)] // headgear ring: Unset -> last.
public void CycleIndex_MatchesRetailsDecompDerivedWrap(
uint current, int delta, int count, bool allowUnset, uint expected)
{
Assert.Equal(
expected,
CharacterCreationAppearancePage.CycleIndex(current, delta, count, allowUnset));
}
/// <summary>Skin has no style index — retail disables its arrow
/// children (SetAttribute_Bool(...,0xd,1)). Every click on the skin
/// spin only selects it as the current part.</summary>
[Fact]
public void AppearanceSkinSpin_Click_NeverCallsSetAppearanceIndex()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
environment.Button(CharacterCreationAppearancePage.SkinSpinId).OnClickAt!(100, 10);
environment.Button(CharacterCreationAppearancePage.SkinSpinId).OnClickAt!(150, 10);
Assert.Equal(0, environment.Runtime.AppearanceIndexCallCount);
}
/// <summary>gmCGAppearancePage::Update's heritage 6/0xc/0xd gate: the
/// Clothes sub-tab and the Nose/Mouth spins all hide.</summary>
[Fact]
public void OlthoiHeritage_HidesClothesButtonAndNoseMouthSpins()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
environment.Runtime.SelectHeritageDirect(OlthoiId);
environment.TabButton(CharacterCreationUiController.AppearanceTabElementId).OnClick!();
Assert.False(environment.Button(CharacterCreationAppearancePage.ClothesButtonId).Visible);
Assert.False(environment.Button(CharacterCreationAppearancePage.NoseSpinId).Visible);
Assert.False(environment.Button(CharacterCreationAppearancePage.MouthSpinId).Visible);
}
/// <summary>Fixture's Hair color list has 3 entries (indices 0-2) — a
/// swatch beyond that never reaches SetAppearanceIndex, matching
/// retail's own <c>iNumColors &gt; N</c> gate.</summary>
[Fact]
public void AppearanceSwatch_WithinColorCount_SetsColorForTheCurrentPart()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
// Part defaults to Hair on construction — no extra click needed.
environment.Button(CharacterCreationAppearancePage.SwatchIds[1]).OnClick!();
Assert.Equal(ChargenAppearanceSlot.HairColor, environment.Runtime.LastAppearanceSlot);
Assert.Equal(1u, environment.Runtime.LastAppearanceIndex);
}
[Fact]
public void AppearanceSwatch_BeyondColorCount_IsANoOp()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
environment.Button(CharacterCreationAppearancePage.SwatchIds[^1]).OnClick!(); // index 8, count 3.
Assert.Equal(0, environment.Runtime.AppearanceIndexCallCount);
}
[Fact]
public void AppearanceShadeScroll_ScalarChanged_SetsShadeForTheCurrentPart()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
environment.ShadeScroll().ScalarChanged!(0.75f);
Assert.Equal(ChargenShadeSlot.Hair, environment.Runtime.LastShadeSlot);
Assert.Equal(0.75, environment.Runtime.LastShadeValue, 3);
}
/// <summary>Nose/Mouth/Skin all route the shade scroll to SKIN shade —
/// SetShade's cases 2/3/4 share one body in the decompiled switch.
/// </summary>
[Fact]
public void AppearanceShadeScroll_ForNoseOrMouth_RoutesToSkinShade()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
SelectAluvianMale(environment);
// Select Nose as the current part: click its body (outside the
// arrow zones), which never changes the style index.
environment.Button(CharacterCreationAppearancePage.NoseSpinId).OnClickAt!(10, 10);
environment.ShadeScroll().ScalarChanged!(0.5f);
Assert.Equal(ChargenShadeSlot.Skin, environment.Runtime.LastShadeSlot);
}
[Fact]
public void AppearanceZoomAndRotateButtons_DelegateToThePreviewControl()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
var preview = new FakeChargenPreviewControl();
environment.Controller.AppearancePreviewControl = preview;
environment.Button(CharacterCreationAppearancePage.ZoomInId).OnClick!();
environment.Button(CharacterCreationAppearancePage.ZoomOutId).OnClick!();
environment.Button(CharacterCreationAppearancePage.RotateClockwiseId).OnClick!();
environment.Button(CharacterCreationAppearancePage.RotateCounterClockwiseId).OnClick!();
Assert.Equal(1, preview.ZoomInCalls);
Assert.Equal(1, preview.ZoomOutCalls);
Assert.Equal(1, preview.RotateClockwiseCalls);
Assert.Equal(1, preview.RotateCounterClockwiseCalls);
}
[Fact]
public void AppearanceZoomButtons_WithNoPreviewControlAssignedYet_AreHarmlessNoOps()
{
using var environment = new EnvironmentHarness();
environment.Controller.Open();
// The page mounts before the graphics backend exists — every zoom/
// rotate click before LivePresentationComposition assigns a real
// control must be a silent no-op, not a NullReferenceException.
environment.Button(CharacterCreationAppearancePage.ZoomInId).OnClick!();
environment.Button(CharacterCreationAppearancePage.RotateClockwiseId).OnClick!();
}
private static void SelectAluvianMale(EnvironmentHarness environment)
{
environment.Runtime.SelectHeritageDirect(AluvianId);
environment.TabButton(CharacterCreationUiController.AppearanceTabElementId).OnClick!();
environment.Button(CharacterCreationAppearancePage.MaleButtonId).OnClick!();
}
private sealed class FakeChargenPreviewControl : AcDream.App.Rendering.IChargenPreviewControl
{
public int ZoomInCalls { get; private set; }
public int ZoomOutCalls { get; private set; }
public int RotateClockwiseCalls { get; private set; }
public int RotateCounterClockwiseCalls { get; private set; }
public bool Rebuild(
ChargenOptions options,
uint heritageId,
int genderKey,
ChargenAppearanceSelection selection) => true;
public void ZoomIn() => ZoomInCalls++;
public void ZoomOut() => ZoomOutCalls++;
public void RotateClockwise() => RotateClockwiseCalls++;
public void RotateCounterClockwise() => RotateCounterClockwiseCalls++;
}
private static void BumpRevisionAndTick(EnvironmentHarness environment)
{
RuntimeCharacterCreationSnapshot snapshot = environment.Runtime.View.Snapshot;
@ -552,6 +799,9 @@ public sealed class CharacterCreationUiControllerTests
public UiTemplateListBox SkillsList() =>
Assert.IsType<UiTemplateListBox>(Screen.FindElement(0x100003F7u));
public UiScrollbar ShadeScroll() =>
Assert.IsType<UiScrollbar>(Screen.FindElement(CharacterCreationAppearancePage.ShadeScrollId));
/// <summary>Confirms or cancels the MOST RECENTLY opened confirmation
/// dialog, using <see cref="RetailConfirmationDialogView"/>'s real
/// button ids off the layout the factory's <c>createLayout</c>
@ -599,6 +849,8 @@ public sealed class CharacterCreationUiControllerTests
SelectStartArea,
_ => Result(RuntimeCommandStatus.Accepted),
() => RequestExitCalls++,
SetAppearanceIndex: SetAppearanceIndex,
SetShade: SetShade,
ResolveText: _ => null,
OpenOnStart: false);
}
@ -613,6 +865,11 @@ public sealed class CharacterCreationUiControllerTests
public ChargenAttributeId LastAttributeSet { get; private set; }
public int LastAttributeValue { get; private set; }
public int LastSelectedStartArea { get; private set; } = -1;
public ChargenAppearanceSlot? LastAppearanceSlot { get; private set; }
public uint LastAppearanceIndex { get; private set; }
public int AppearanceIndexCallCount { get; private set; }
public ChargenShadeSlot? LastShadeSlot { get; private set; }
public double LastShadeValue { get; private set; }
public void SelectHeritageDirect(uint heritageId) => SelectHeritage(heritageId);
@ -662,6 +919,44 @@ public sealed class CharacterCreationUiControllerTests
return Result(RuntimeCommandStatus.Accepted);
}
private RuntimeCommandResult SetAppearanceIndex(ChargenAppearanceSlot slot, uint index)
{
LastAppearanceSlot = slot;
LastAppearanceIndex = index;
AppearanceIndexCallCount++;
View.Snapshot = View.Snapshot with { Appearance = WithAppearanceIndex(View.Snapshot.Appearance, slot, index) };
return Result(RuntimeCommandStatus.Accepted);
}
private RuntimeCommandResult SetShade(ChargenShadeSlot slot, double value)
{
LastShadeSlot = slot;
LastShadeValue = value;
return Result(RuntimeCommandStatus.Accepted);
}
private static RuntimeCharacterCreationAppearance WithAppearanceIndex(
RuntimeCharacterCreationAppearance a,
ChargenAppearanceSlot slot,
uint index) => slot switch
{
ChargenAppearanceSlot.EyesStrip => a with { EyesStrip = index },
ChargenAppearanceSlot.NoseStrip => a with { NoseStrip = index },
ChargenAppearanceSlot.MouthStrip => a with { MouthStrip = index },
ChargenAppearanceSlot.HairStyle => a with { HairStyle = index },
ChargenAppearanceSlot.HairColor => a with { HairColor = index },
ChargenAppearanceSlot.EyeColor => a with { EyeColor = index },
ChargenAppearanceSlot.HeadgearStyle => a with { HeadgearStyle = index },
ChargenAppearanceSlot.HeadgearColor => a with { HeadgearColor = index },
ChargenAppearanceSlot.ShirtStyle => a with { ShirtStyle = index },
ChargenAppearanceSlot.ShirtColor => a with { ShirtColor = index },
ChargenAppearanceSlot.TrousersStyle => a with { TrousersStyle = index },
ChargenAppearanceSlot.TrousersColor => a with { TrousersColor = index },
ChargenAppearanceSlot.FootwearStyle => a with { FootwearStyle = index },
ChargenAppearanceSlot.FootwearColor => a with { FootwearColor = index },
_ => a,
};
private static RuntimeCommandResult Result(RuntimeCommandStatus status) =>
new(status, Generation);
@ -680,17 +975,34 @@ public sealed class CharacterCreationUiControllerTests
MotionTableId: 0u,
CombatTableId: 0u,
BaseObjDesc: ChargenObjDesc.Empty,
HairColors: [],
HairStyles: [],
EyeColors: [],
EyeStrips: [],
NoseStrips: [],
MouthStrips: [],
Headgears: [],
Shirts: [],
Pants: [],
Footwear: [],
ClothingColors: []);
// Campaign CC slice CC6b-MOUNT: non-empty appearance lists
// so the Appearance page's spin-cycle/wrap and swatch/shade
// dispatch tests have real option counts to exercise (the
// CC4 fixture left these empty since no page read them yet).
HairColors: [0x1000u, 0x1001u, 0x1002u],
HairStyles:
[
new ChargenHairStyle(IconId: 1u, Bald: false, AlternateSetup: 0u, ObjDesc: ChargenObjDesc.Empty),
new ChargenHairStyle(IconId: 2u, Bald: false, AlternateSetup: 0u, ObjDesc: ChargenObjDesc.Empty),
new ChargenHairStyle(IconId: 3u, Bald: true, AlternateSetup: 0u, ObjDesc: ChargenObjDesc.Empty),
],
EyeColors: [0x2000u, 0x2001u],
EyeStrips:
[
new ChargenEyeStrip(IconId: 1u, BaldIconId: 1u, ObjDesc: ChargenObjDesc.Empty, BaldObjDesc: ChargenObjDesc.Empty),
new ChargenEyeStrip(IconId: 2u, BaldIconId: 2u, ObjDesc: ChargenObjDesc.Empty, BaldObjDesc: ChargenObjDesc.Empty),
],
NoseStrips: [new ChargenFaceStrip(IconId: 1u, ObjDesc: ChargenObjDesc.Empty)],
MouthStrips: [new ChargenFaceStrip(IconId: 1u, ObjDesc: ChargenObjDesc.Empty)],
Headgears:
[
new ChargenGearOption("Cloth Cap", ClothingTableId: 1u, WeenieDefaultId: 1u),
new ChargenGearOption("Leather Cap", ClothingTableId: 2u, WeenieDefaultId: 2u),
],
Shirts: [new ChargenGearOption("Tunic", ClothingTableId: 3u, WeenieDefaultId: 3u)],
Pants: [new ChargenGearOption("Trousers", ClothingTableId: 4u, WeenieDefaultId: 4u)],
Footwear: [new ChargenGearOption("Boots", ClothingTableId: 5u, WeenieDefaultId: 5u)],
ClothingColors: [0x3000u, 0x3001u, 0x3002u]);
var templates = new List<ChargenTemplate>
{
@ -841,7 +1153,7 @@ public sealed class CharacterCreationUiControllerTests
root.Children.Add(BuildHeritagePage());
root.Children.Add(BuildProfessionPage());
root.Children.Add(BuildSkillsPage());
root.Children.Add(ContainerInfo(CharacterCreationUiController.AppearancePageElementId));
root.Children.Add(BuildAppearancePage());
root.Children.Add(BuildTownPage());
root.Children.Add(ContainerInfo(CharacterCreationUiController.SummaryPageElementId));
@ -947,6 +1259,82 @@ public sealed class CharacterCreationUiControllerTests
return page;
}
/// <summary>Campaign CC slice CC6b-MOUNT: the Appearance page fixture.
/// Spin geometry (each 200px wide, arrow children at the live-DAT-
/// measured x=80/127 — see <see cref="CharacterCreationAppearancePage"/>'s
/// own doc comment) mirrors the real installed layout exactly so the
/// same OnClickAt zone math this page uses in production is what these
/// tests exercise.</summary>
private static ElementInfo BuildAppearancePage()
{
var page = new ElementInfo
{
Id = CharacterCreationUiController.AppearancePageElementId,
Type = 3u,
Width = 800f,
Height = 500f,
};
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.FemaleButtonId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.MaleButtonId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.FaceButtonId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.ClothesButtonId));
page.Children.Add(ContainerInfo(CharacterCreationAppearancePage.FaceChoicesId));
page.Children.Add(ContainerInfo(CharacterCreationAppearancePage.ClothesChoicesId));
foreach (uint spinId in new[]
{
CharacterCreationAppearancePage.HairSpinId,
CharacterCreationAppearancePage.EyesSpinId,
CharacterCreationAppearancePage.NoseSpinId,
CharacterCreationAppearancePage.MouthSpinId,
CharacterCreationAppearancePage.SkinSpinId,
CharacterCreationAppearancePage.HeadgearSpinId,
CharacterCreationAppearancePage.ShirtSpinId,
CharacterCreationAppearancePage.TrousersSpinId,
CharacterCreationAppearancePage.FootwearSpinId,
})
{
page.Children.Add(SpinInfo(spinId));
}
foreach (uint swatchId in CharacterCreationAppearancePage.SwatchIds)
page.Children.Add(ButtonInfo(swatchId));
page.Children.Add(ScrollbarInfo(CharacterCreationAppearancePage.ShadeScrollId));
page.Children.Add(ContainerInfo(CharacterCreationAppearancePage.GradCircleId));
var viewport = new ElementInfo
{
Id = CharacterCreationAppearancePage.ViewportId,
Type = 0xDu,
Width = 300f,
Height = 300f,
};
page.Children.Add(viewport);
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.RotateClockwiseId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.RotateCounterClockwiseId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.ZoomInId));
page.Children.Add(ButtonInfo(CharacterCreationAppearancePage.ZoomOutId));
return page;
}
private static ElementInfo SpinInfo(uint id)
{
var spin = new ElementInfo
{
Id = id,
Type = 1u,
Width = 200f,
Height = 24f,
};
spin.Children.Add(new ElementInfo { Id = 0x1000030Au, Type = 1u, X = 80f, Width = 47f, Height = 24f });
spin.Children.Add(new ElementInfo { Id = 0x1000030Bu, Type = 1u, X = 127f, Width = 47f, Height = 24f });
return spin;
}
private static UiElement BuildSkillRowTemplate(uint templateElementId) =>
LayoutImporter.Build(
new ElementInfo