Campaign CH round 4, user-gate items 1+2. Root cause: retail ships a second (background) glyph atlas per font, dilated 2px on every side, plus two border-pixel scalars (Font.NumHorizontalBorderPixels/ NumVerticalBorderPixels) that acdream's font reader never read — so even the pre-existing outline parameter drew almost nothing once enabled. Landed together (either half alone is a no-op or a regression): - UiDatFont carries BorderX/BorderY from the DAT font resource. - UiRenderContext.DrawStringDat inflates the background blit's source and destination rect by that margin and restructures into retail's exact two-pass whole-string outline-then-fill model (UIElement_Text::DrawSelf), plus the 8-neighbour +-1px fallback for fonts with no background atlas. Corrects the stale "property 0xd" comment to the real ids, 0x21 (Outline) / 0x22 (OutlineColor). - LayoutDesc property 0x21/0x22 import (ElementInfo.Outline/ OutlineColor, LayoutImporter.ReadState, ElementReader.Merge/ ApplyCanonicalLegacyProjection, DatWidgetFactory.BuildText) so every authored-outline element across the DAT set is correct at once. - SpewBox: RetailFontId corrected from a round-3 heuristic (0x40000025) to the actually-authored 0x40000001 (18px bold serif), Outline=true set on the controller's UiText. Fill colour stays the user-gate-round-1-pinned yellow — font atlases are alpha-only (PFID_A8), so there is no baked shading that could explain the screenshot's gold as anything other than the outline itself. - Chat transcript: default fill now seeds from its authored ARGB(255,204,204,204) instead of an unrelated color-table slot (ChatTranscriptRenderer.BuildLines takes the transcript's own DefaultColor as a parameter); the 34-entry LogTextType table is untouched, and every existing CH1 conformance test stays green unmodified. Regenerated the committed chat_2100006f.json fixture from the real installed DAT, confirming end to end (not by missing-field default) that the transcript carries no outline. Tests: font-reader border fields + inflation math pinned against the real DAT font, two-pass draw ordering/tint/inflation via a new TextRenderer.DebugSpriteSegmentVerts test seam, property 0x21/0x22 import at both the ElementReader.Merge and StateDesc-property layers, SpewBox font/outline, and the chat default-shade seed with the color table proven untouched. Full Release suite: 12,610 passed / 4 skipped / 0 failed (AcDream.slnx, complete solution). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
353 lines
14 KiB
C#
353 lines
14 KiB
C#
using System.Numerics;
|
|
using AcDream.App.UI;
|
|
using AcDream.App.UI.Layout;
|
|
namespace AcDream.App.Tests.UI.Layout;
|
|
|
|
public class ElementReaderTests
|
|
{
|
|
// ── ToAnchors (decomp-backed: UIElement::UpdateForParentSizeChange @0x00462640) ─────────────
|
|
|
|
/// <summary>
|
|
/// Top edge (L=1,T=1,R=1,B=2): LeftEdge==1 → Left; RightEdge==1 → Right (stretch);
|
|
/// TopEdge==1 → Top; BottomEdge==2 (not 1/4, top≠2) → no Bottom.
|
|
/// This is the top chrome edge — it pins left, stretches width, pins top, fixed height.
|
|
/// Real vitals values from format doc §11 (0x10000634).
|
|
/// </summary>
|
|
[Fact]
|
|
public void ToAnchors_TopEdge_StretchesWidth()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 1, top: 1, right: 1, bottom: 2);
|
|
Assert.True(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.True(a.HasFlag(AnchorEdges.Right));
|
|
Assert.False(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
/// <summary>
|
|
/// TL corner (L=1,T=1,R=2,B=2): LeftEdge==1 → Left; RightEdge==2 (not 1/4), left≠2 → no Right;
|
|
/// TopEdge==1 → Top; BottomEdge==2, top≠2 → no Bottom. Fixed size, pinned top-left.
|
|
/// Real vitals values from format doc §11 (0x10000633).
|
|
/// </summary>
|
|
[Fact]
|
|
public void ToAnchors_TlCorner_PinsTopLeftFixed()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 1, top: 1, right: 2, bottom: 2);
|
|
Assert.True(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.False(a.HasFlag(AnchorEdges.Right));
|
|
Assert.False(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
/// <summary>
|
|
/// TR corner (L=2,T=1,R=1,B=2): LeftEdge==2 → triggers Right (track-right); RightEdge==1 → Right;
|
|
/// left≠1 → no Left; TopEdge==1 → Top; BottomEdge==2, top≠2 → no Bottom.
|
|
/// Fixed-width element whose left and right both track the parent's right edge.
|
|
/// Real vitals values from format doc §11 (0x10000635).
|
|
/// </summary>
|
|
[Fact]
|
|
public void ToAnchors_TrCorner_TracksRight()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 2, top: 1, right: 1, bottom: 2);
|
|
Assert.False(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.True(a.HasFlag(AnchorEdges.Right));
|
|
Assert.False(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Left edge (L=1,T=1,R=2,B=1): LeftEdge==1 → Left; RightEdge==2, left≠2 → no Right;
|
|
/// TopEdge==1 → Top; BottomEdge==1 → Bottom. Pins left+top+bottom, fixed width, stretches height.
|
|
/// Real vitals values from format doc §11 (0x10000636).
|
|
/// </summary>
|
|
[Fact]
|
|
public void ToAnchors_LeftEdge_StretchesHeight()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 1, top: 1, right: 2, bottom: 1);
|
|
Assert.True(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.False(a.HasFlag(AnchorEdges.Right));
|
|
Assert.True(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
/// <summary>
|
|
/// All-ones (L=1,T=1,R=1,B=1): all four flags fire — Left, Right, Top, Bottom.
|
|
/// A piece pinned to all four sides stretches both horizontally and vertically.
|
|
/// </summary>
|
|
[Fact]
|
|
public void ToAnchors_Meter_StretchesBoth()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 1, top: 1, right: 1, bottom: 1);
|
|
Assert.True(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.True(a.HasFlag(AnchorEdges.Right));
|
|
Assert.True(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
/// <summary>
|
|
/// All-zero edge flags (prototype-only elements) fall back to Left|Top default.
|
|
/// </summary>
|
|
[Fact]
|
|
public void EdgeFlagsToAnchors_AllZero_DefaultsToTopLeft()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 0, top: 0, right: 0, bottom: 0);
|
|
Assert.Equal(AnchorEdges.Left | AnchorEdges.Top, a);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Value 3 on left and right axes contributes no Left/Right anchor;
|
|
/// TopEdge==1 → Top; BottomEdge==1 → Bottom.
|
|
/// left=3 (not 1/4) → no Left; right=3 (not 1/4), left≠2 → no Right;
|
|
/// top=1 → Top; bottom=1 → Bottom. Result: Top|Bottom.
|
|
/// </summary>
|
|
[Fact]
|
|
public void EdgeFlagsToAnchors_ValueThree_HorizAxes_YieldsTopBottom()
|
|
{
|
|
var a = ElementReader.ToAnchors(left: 3, top: 1, right: 3, bottom: 1);
|
|
Assert.False(a.HasFlag(AnchorEdges.Left));
|
|
Assert.True(a.HasFlag(AnchorEdges.Top));
|
|
Assert.False(a.HasFlag(AnchorEdges.Right));
|
|
Assert.True(a.HasFlag(AnchorEdges.Bottom));
|
|
}
|
|
|
|
// ── Merge ────────────────────────────────────────────────────────────────
|
|
|
|
[Fact]
|
|
public void Merge_BaseThenOverride_DerivedWins()
|
|
{
|
|
var base_ = new ElementInfo { Type = 0, FontDid = 0x40000000, Width = 150, Height = 16 };
|
|
var derived = new ElementInfo { Type = 0, Width = 200 }; // overrides width, inherits font + height
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(200, merged.Width); // override
|
|
Assert.Equal(16, merged.Height); // inherited
|
|
Assert.Equal(0x40000000u, merged.FontDid);// inherited
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_DerivedHasFontDid_OverridesBase()
|
|
{
|
|
var base_ = new ElementInfo { FontDid = 0x40000000, Width = 100, Height = 10 };
|
|
var derived = new ElementInfo { FontDid = 0x40000001, Width = 100 };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(0x40000001u, merged.FontDid);
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_DerivedStateMediaOverridesBase()
|
|
{
|
|
var base_ = new ElementInfo();
|
|
base_.StateMedia[""] = (0x06001000u, 1);
|
|
base_.StateMedia["HideDetail"] = (0x06001001u, 1);
|
|
|
|
var derived = new ElementInfo();
|
|
derived.StateMedia[""] = (0x06002000u, 3); // overrides base default state
|
|
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
// derived's "" overrides base's ""
|
|
Assert.Equal((0x06002000u, 3), merged.StateMedia[""]);
|
|
// base's "HideDetail" is kept (derived didn't provide it)
|
|
Assert.Equal((0x06001001u, 1), merged.StateMedia["HideDetail"]);
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_DerivedStateCursorOverridesBase()
|
|
{
|
|
var base_ = new ElementInfo();
|
|
base_.StateCursors[""] = new UiCursorMedia(0x06003000u, 1, 2);
|
|
base_.StateCursors["Drag_rollover_accept"] = new UiCursorMedia(0x06003001u, 3, 4);
|
|
|
|
var derived = new ElementInfo();
|
|
derived.StateCursors[""] = new UiCursorMedia(0x06004000u, 5, 6);
|
|
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
|
|
Assert.Equal(new UiCursorMedia(0x06004000u, 5, 6), merged.StateCursors[""]);
|
|
Assert.Equal(new UiCursorMedia(0x06003001u, 3, 4), merged.StateCursors["Drag_rollover_accept"]);
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_ChildrenComeFromDerived()
|
|
{
|
|
var base_ = new ElementInfo();
|
|
base_.Children.Add(new ElementInfo { Id = 0x1u });
|
|
|
|
var derived = new ElementInfo();
|
|
derived.Children.Add(new ElementInfo { Id = 0x2u });
|
|
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
// children must come from derived only
|
|
Assert.Single(merged.Children);
|
|
Assert.Equal(0x2u, merged.Children[0].Id);
|
|
}
|
|
|
|
// ── HJustify / VJustify — Merge propagation ─────────────────────────────
|
|
|
|
/// <summary>
|
|
/// When the derived element has a non-Center HJustify, the derived value wins
|
|
/// (same "non-default wins" rule as FontDid).
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedHJustifyRight_OverridesBaseCenter()
|
|
{
|
|
var base_ = new ElementInfo { HJustify = HJustify.Center };
|
|
var derived = new ElementInfo { HJustify = HJustify.Right };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(HJustify.Right, merged.HJustify);
|
|
}
|
|
|
|
/// <summary>
|
|
/// When the derived element has the default HJustify (Center), the base value
|
|
/// is inherited — Center from the derived does NOT override a Left base.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedHJustifyCenter_InheritsBaseLeft()
|
|
{
|
|
var base_ = new ElementInfo { HJustify = HJustify.Left };
|
|
var derived = new ElementInfo { HJustify = HJustify.Center }; // default — no explicit dat property
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(HJustify.Left, merged.HJustify);
|
|
}
|
|
|
|
/// <summary>
|
|
/// VJustify=Top from the base propagates when the derived element has no explicit
|
|
/// (Center) vertical justification.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_BaseVJustifyTop_InheritedWhenDerivedIsCenter()
|
|
{
|
|
var base_ = new ElementInfo { VJustify = VJustify.Top };
|
|
var derived = new ElementInfo { VJustify = VJustify.Center }; // default
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(VJustify.Top, merged.VJustify);
|
|
}
|
|
|
|
/// <summary>
|
|
/// VJustify=Bottom from the derived element wins over a Center base.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedVJustifyBottom_OverridesBaseCenter()
|
|
{
|
|
var base_ = new ElementInfo { VJustify = VJustify.Center };
|
|
var derived = new ElementInfo { VJustify = VJustify.Bottom };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(VJustify.Bottom, merged.VJustify);
|
|
}
|
|
|
|
// ── FontColor — Merge propagation (Fix B) ────────────────────────────────
|
|
|
|
/// <summary>
|
|
/// When the derived element has an explicit (non-null) FontColor, the derived value
|
|
/// wins in Merge — same "non-null derived wins" rule used for FontDid and HJustify.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedFontColor_OverridesBaseNull()
|
|
{
|
|
var base_ = new ElementInfo { FontColor = null };
|
|
var derived = new ElementInfo { FontColor = new Vector4(1f, 0f, 0f, 1f) };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(new Vector4(1f, 0f, 0f, 1f), merged.FontColor);
|
|
}
|
|
|
|
/// <summary>
|
|
/// When the derived element has no FontColor (null), the base's FontColor is inherited.
|
|
/// A null-derived must NOT override a non-null base.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedFontColorNull_InheritsBaseColor()
|
|
{
|
|
var gold = new Vector4(1f, 0.82f, 0.36f, 1f);
|
|
var base_ = new ElementInfo { FontColor = gold };
|
|
var derived = new ElementInfo { FontColor = null }; // default — no dat property
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(gold, merged.FontColor);
|
|
}
|
|
|
|
/// <summary>
|
|
/// When neither base nor derived carries a FontColor, the merged result is null.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_BothFontColorNull_MergedIsNull()
|
|
{
|
|
var base_ = new ElementInfo { FontColor = null };
|
|
var derived = new ElementInfo { FontColor = null };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Null(merged.FontColor);
|
|
}
|
|
|
|
// ── Outline / OutlineColor — property 0x21/0x22 (Campaign CH round 4) ──────
|
|
|
|
/// <summary>
|
|
/// A derived element that authors 0x21=true wins over an un-outlined base —
|
|
/// same "derived wins" convention as FontDid. This is the SpewBox line
|
|
/// template's own shape: its base style (0x10000377) authors no outline; the
|
|
/// line template's own state does.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedOutlineTrue_OverridesBaseFalse()
|
|
{
|
|
var base_ = new ElementInfo { Outline = false };
|
|
var derived = new ElementInfo { Outline = true };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.True(merged.Outline);
|
|
}
|
|
|
|
/// <summary>
|
|
/// A derived element that does NOT author 0x21 (stays at the false default)
|
|
/// inherits an outlined base rather than clobbering it — the same "false/zero
|
|
/// derived never overrides a set base" rule HJustify/FontDid already use.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedOutlineFalse_InheritsOutlinedBase()
|
|
{
|
|
var base_ = new ElementInfo { Outline = true };
|
|
var derived = new ElementInfo { Outline = false };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.True(merged.Outline);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Neither base nor derived authors 0x21 — the chat transcript's own shape
|
|
/// (style 0x10000372 authors no outline anywhere in its chain).
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_NeitherOutlines_MergedStaysFalse()
|
|
{
|
|
var base_ = new ElementInfo { Outline = false };
|
|
var derived = new ElementInfo { Outline = false };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.False(merged.Outline);
|
|
}
|
|
|
|
/// <summary>
|
|
/// OutlineColor follows the exact same "non-null derived wins" rule as
|
|
/// FontColor — property 0x22 is authored on only 9 elements in the whole DAT
|
|
/// set, so most outlined elements inherit null here and fall back to the
|
|
/// widget's own black default.
|
|
/// </summary>
|
|
[Fact]
|
|
public void Merge_DerivedOutlineColor_OverridesBaseNull()
|
|
{
|
|
var base_ = new ElementInfo { OutlineColor = null };
|
|
var derived = new ElementInfo { OutlineColor = new Vector4(0f, 0f, 0.4f, 1f) };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(new Vector4(0f, 0f, 0.4f, 1f), merged.OutlineColor);
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_DerivedOutlineColorNull_InheritsBaseColor()
|
|
{
|
|
var authored = new Vector4(17f / 255f, 15f / 255f, 7f / 255f, 1f);
|
|
var base_ = new ElementInfo { OutlineColor = authored };
|
|
var derived = new ElementInfo { OutlineColor = null };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Equal(authored, merged.OutlineColor);
|
|
}
|
|
|
|
[Fact]
|
|
public void Merge_BothOutlineColorNull_MergedIsNull()
|
|
{
|
|
var base_ = new ElementInfo { OutlineColor = null };
|
|
var derived = new ElementInfo { OutlineColor = null };
|
|
var merged = ElementReader.Merge(base_, derived);
|
|
Assert.Null(merged.OutlineColor);
|
|
}
|
|
}
|