1774d8b298
Addresses the CC6a dual-lens review (architectural PASS with reservations, retail fidelity PASS with reservations, merge after F1/F2/F3). F1 (BLOCKING) - AlternateSetup/setupId tested the wrong sentinel (0) instead of retail's INVALID_DID (0xFFFFFFFF, CharGenState::GetSetupID @0x005C5B22). A hair style storing that value would have been adopted as a literal Setup id, nulling Get<Setup> and killing the whole preview. Fixed both sites with a new InvalidDid constant; added two hand-built tests plus an installed-DAT sweep of every hair style across all 26 heritage/gender combinations (869 selections, zero unresolved Setup ids). F2 (BLOCKING) - TS-82's register row, ChargenClothingTable.cs's doc, and the plan's ledger row all understated Undead's measured clothing-coverage gap as "headgear/trousers/footwear" (3 slots) with a self-contradicting "4 of 4 non-shirt slots" aside. Corrected everywhere to the true measured ALL FOUR slots (headgear, trousers, shirt, footwear). F3 (BLOCKING) - the palette-math "three independent sources" claim overcounted: ACViewer's ClothingTableList.xaml.cs:97 computes a different expression for a different problem, and its vendored PaletteSet.cs is ACE's own file, not an independent implementation. Rewrote the evidence paragraph in ChargenPalSetMath.cs to the two sources that actually hold (decomp control flow + ACE's "Taken from acclient.c" port). F4 (MEDIUM) - ChargenPreviewEntityBuilder.TryBuild did unlocked dat reads; DatCollection is not thread-safe and every sibling dat-touching resolver in this layer takes a shared datLock. Added a required datLock parameter; every dat read now happens inside one lock, mirroring RetailPaperdollPoseApplicator.Apply's shape. F5 (LOW) - noted the pre-existing Streaming.LandblockBuildFactoryTests timing flake in the ledger so a future session doesn't chase it. F6 (LOW) - fixed ChargenPreviewCamera.cs's rotation doc, which cited a nonexistent identifier in a dimensionally-wrong expression; corrected to retail's actual DoRotation @0x0047CAC7 per-tick formula. F7 (LOW-MEDIUM) - the TS-82 measurement was WriteLine-only; pinned with real assertions (zero gaps for the 9 standard heritages, exactly the 4 measured Undead table ids on both genders). Kept the existing env-gated skip pattern (confirmed house convention). F8 (LOW) - the inner PalSet-miss loop recorded-and-continued past a miss; retail's own loop returns immediately on a miss (~0x005A7B32), aborting every remaining choice in that garment. Changed continue to break; added a test proving a subsequent present PalSet is correctly not applied. F9 (LOW) - fixed three dangling <see cref="...Compose"/> doc references (the method is TryCompose). F10 (LOW) - the packed (byte)(range/8) narrowing was unchecked; a real NumColors of 2048 happened to wrap to the correct "whole palette" 0 sentinel by unchecked-cast accident. Replaced with explicit PackOffset/ PackNumColors helpers that document the 2048->0 equivalence deliberately and throw on any other unrepresentable shape. F11/F12 (LOW, CC6b scope) - noted in the plan's CC6b row: the second m_alternateSetupID override source is unmodelled, and a shared RetailHeldPose helper is worth extracting before a fourth consumer. Test counts: Core.Tests 4772/1 skip (+5), Content.Tests 147/0 (+1), App.Tests 5121/6 skips (unchanged; F5's named flake did not reproduce) - zero failures, full solution Release build green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
57 lines
2.9 KiB
C#
57 lines
2.9 KiB
C#
namespace AcDream.Core.CharGen;
|
|
|
|
/// <summary>
|
|
/// Pure port of retail's shade→palette-index resolution
|
|
/// (<c>PalSet::GetPaletteID @ 0x005AC570</c>, invoked from
|
|
/// <c>gmCG3DView::Update @ 0x004EE9D0</c> for the skin/hair subpalette
|
|
/// build and from <c>ClothingTable::BuildObjDesc @ 0x005A7900</c> for every
|
|
/// clothing-slot dye choice). The decompiled body is genuinely FPU-elided —
|
|
/// the <c>_ftol2()</c> truncating-cast operand is lost to the decompiler,
|
|
/// and can only be read as "some product of <paramref name="count"/>-ish and
|
|
/// <paramref name="shade"/>-ish operands" from the surrounding x87 stack
|
|
/// traffic — but the decomp's own control-flow SHAPE is still verifiable
|
|
/// independent of that lost operand: a two-sided FPU compare at
|
|
/// <c>0x005AC5A0</c> gating on <c>>= 0.0</c>, consistent with a
|
|
/// <c>[0,1]</c> shade bounds check before the cast. What resolves the
|
|
/// elided operand is ACE's <c>ACE.DatLoader.FileTypes.PaletteSet.GetPaletteID</c>,
|
|
/// which carries the explicit comment "Taken from acclient.c
|
|
/// (PalSet::GetPaletteID)" against the exact formula below. That is TWO
|
|
/// sources (decomp control flow + ACE's cited port), not three: the
|
|
/// <c>PaletteSet.cs</c> file present in the vendored ACViewer checkout is
|
|
/// ACE's own file, not an independent reimplementation, and ACViewer's
|
|
/// <c>ClothingTableList.xaml.cs:97</c> UI slider computes a DIFFERENT
|
|
/// expression for a DIFFERENT problem (mapping a shade back to a slider tick
|
|
/// position against <c>Shades.Maximum</c>, i.e. <c>count-1</c>, not
|
|
/// <c>count</c>) — neither corroborates this formula and both are dropped
|
|
/// from the evidence chain here.
|
|
/// </summary>
|
|
public static class ChargenPalSetMath
|
|
{
|
|
/// <summary>
|
|
/// Resolves a shade fraction to an index into a palette-id list of the
|
|
/// given <paramref name="count"/>. Returns -1 (retail's
|
|
/// <c>INVALID_DID</c> outcome) when <paramref name="count"/> is
|
|
/// non-positive or <paramref name="shade"/> falls outside
|
|
/// <c>[0.0, 1.0]</c> — including retail's own <c>-1.0</c> "unset"
|
|
/// sentinel (<c>CharGenState::Reset @ 0x005C68A0</c>), which is
|
|
/// deliberately out of range so an untouched shade resolves to
|
|
/// "nothing," matching retail. Callers should treat -1 as "skip this
|
|
/// subpalette contribution" rather than emit a placeholder id.
|
|
/// </summary>
|
|
public static int GetPaletteIndex(int count, double shade)
|
|
{
|
|
if (count <= 0 || shade < 0.0 || shade > 1.0)
|
|
return -1;
|
|
|
|
// Truncating cast, exactly as ACE's cited port and the decomp's
|
|
// _ftol2() (which truncates toward zero on x86, matching a plain
|
|
// C-style (int) cast here since count > 0 and 0 <= shade <= 1 keep
|
|
// the product non-negative).
|
|
int index = (int)((count - 0.000001) * shade);
|
|
if (index < 0)
|
|
index = 0;
|
|
if (index > count - 1)
|
|
index = count - 1;
|
|
return index;
|
|
}
|
|
}
|