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

refactor(render): one group-creation seam, required foliage key field, first-frame wind snap (Campaign VM VM6 review 3)

Browse source 
Narrow re-review of a82959f1: APPROVE, with follow-ups. All items landed.

N2 (structural): (a) extracted the ONE shared InstanceGroup-from-key
construction seam, WbDrawDispatcher.CreateGroupFromKey(key, registration,
frame) — before this there were two near-identical `new InstanceGroup
{ ... }` initializers (GetOrCreateInstanceGroup and GetOrCreatePackedGroup)
that had already drifted once (the round-2 F1 bug). Both routes call it now;
CreateGroupFromKey's own `new()` is the only production InstanceGroup
construction site repo-wide, same precedent as AppendPackedInstance. (b)
GroupKey.FoliageFlags lost its `= 0u` default and moved before CullMode in
the declaration (CullMode keeps its default, C# requires optional params to
trail required ones), so a `new GroupKey(...)` that omits it is a compile
error. Fixed every real construction site the reorder/requirement touched:
the 2 production sites, ToKey (a reconstruction from InstanceGroup the
review didn't count but the reorder broke), and 5 test sites (one more than
the review's "4" — InstanceGroupClearTests had a second, implicit
target-typed `MakeKey` factory the original count missed). Verified by a
full solution build.

N1: added CreateGroupFromKey_CopiesFoliageFlagsFromTheKey
(InstanceGroupClearTests) — a key carrying FoliageFlags 0x2 in, the created
group's FoliageFlags 0x2 out. That test plus N2b's required field are what
actually guard the round-2 F1 blocker; reworded PackedDispatcherOracleTests'
existing test comment to say what IT proves (the classification-to-
BuildIndirectArrays-to-BatchData.flags path), not that it guards the
classifier.

N3: corrected the plan's round-2 paragraph — folding FoliageFlags into the
G2/G3 digest is correct and symmetric, but CompareClassifiedOutput only
runs from RenderScenePViewFrameProductController.BuildAndCompare, which has
no production caller anywhere in src/AcDream.App/, and both of
RenderScenePViewFrameProductTests's own callers construct the controller
without the optional dispatcher argument — so the fold catches nothing
until that oracle is wired to an actual caller.

N4: the plan's F6 note now names both classification caches — the classic
route's EntityClassificationCache.EntityCacheEntry (self-heals per entity
on its own next eviction) and the packed route's
PackedProjectionClassificationEntry/PackedClassifiedBatch.Key
(PackedProjectionClassificationCache.BeginFrame clears its entire cache in
one shot on a RenderSceneGeneration change) — and notes neither mechanism
is keyed to a pack switch specifically.

N5: deleted the now-unused single-generic ComputeEntityHasCutoutSubset<T>
overload; its 4 test call sites now use the two-generic, zero-alloc
overload with an unused int context and a static (_, value) => value
lambda, so there is exactly one ComputeEntityHasCutoutSubset to keep
correct.

A6 (reviewer-filed): ResolveFoliageWind's _windMean/_windGust started at 0
and always eased toward the weather target by clock delta, with no
distinction for a graph's first-ever advance. A pinned clock
(ACDREAM_SKY_PHASE_SECONDS, the offline pixel gate's determinism pin) never
advances between calls, so the wind reached only whatever fraction the
first (1-second-clamped) step produced and sat there forever; live, the
first 10 s after a graph is constructed (pack selection / login) spun up
from dead calm even though the weather already IS what it is. Fixed at the
root: the first advance (_windFrameSerial == -1, the constructor sentinel)
now snaps _windMean/_windGust straight to the target; every later advance
eases over WeatherSystem.TransitionSeconds exactly as before. Added a
SetWindClockSecondsOverrideForTesting seam (_windClockSecondsOverride is no
longer readonly) so a hermetic test can advance the pinned clock by an
exact amount between two resolves without a real-time Thread.Sleep; two new
tests prove the first-advance snap is exact and a second advance still
eases at the normal rate. The three existing indoor/wind-disabled/amplitude
gate tests pass unchanged.

Verify: Release build 0 warnings/0 errors. App hermetic-lane filter
6,046/0 failed. Core.Tests 4,695/0 failed. Full hermetic-filtered solution:
15,274/0 failed across 15 projects.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-23 03:03:56 +02:00
parent a82959f1b7
commit fccba8390d
12 changed files with 347 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/AcDream.App/Rendering/Wb/FoliageWindClassification.cs
View file

@ -58,42 +58,31 @@ internal static class FoliageWindClassification
/// no cutout batches of its own (the leaves are a DIFFERENT part), so
/// classifying it from only its own <c>HasCutoutSubset</c> never gives
/// it <see cref="TrunkFlag"/>. Both the world-receiver and
/// directional-shadow-caster Setup-part walks call this ONCE per entity
/// per frame (not per batch) to OR every currently-resolved part's
/// <c>HasCutoutSubset</c> into one entity-scoped value before
/// classifying each part against it. Generic over the caller's own part
/// representation so it needs no dependency on <c>ObjectRenderData</c>
/// or the mesh adapter — the caller supplies <paramref name="hasCutoutSubset"/>
/// to look each part's value up however it already does. Short-circuits
/// on the first <see langword="true"/>; a part the caller cannot
/// currently resolve simply contributes nothing (the caller marks the
/// entity incomplete separately and reclassifies once every part loads).
/// </summary>
internal static bool ComputeEntityHasCutoutSubset<T>(
IReadOnlyList<T> setupParts,
Func<T, bool> hasCutoutSubset)
{
for (int i = 0; i < setupParts.Count; i++)
{
if (hasCutoutSubset(setupParts[i]))
return true;
}
return false;
}
/// <summary>
/// Campaign VM VM6 review fix round 2 (F3): zero-alloc production
/// overload of <see cref="ComputeEntityHasCutoutSubset{T}"/>. The
/// single-generic overload above is exactly what a caller needs to
/// predicate on an instance field (e.g. the mesh adapter) — but doing so
/// with a lambda that closes over <c>this</c> allocates a fresh closure
/// object AND a fresh delegate on every call, and this is called once
/// per Setup entity per frame from the world receiver, the shadow
/// caster, and the packed production classifier. Passing the would-be-
/// captured value as an explicit <typeparamref name="TContext"/>
/// argument to a <see langword="static"/> lambda (no captures at all)
/// lets the C# compiler cache a single delegate instance for the
/// method's lifetime instead of allocating one per call.
/// directional-shadow-caster Setup-part walks, and the packed production
/// classifier, call this ONCE per entity per frame (not per batch) to OR
/// every currently-resolved part's <c>HasCutoutSubset</c> into one
/// entity-scoped value before classifying each part against it. Generic
/// over the caller's own part representation so it needs no dependency
/// on <c>ObjectRenderData</c> or the mesh adapter — the caller supplies
/// <paramref name="hasCutoutSubset"/> to look each part's value up
/// however it already does. Short-circuits on the first
/// <see langword="true"/>; a part the caller cannot currently resolve
/// simply contributes nothing (the caller marks the entity incomplete
/// separately and reclassifies once every part loads).
///
/// <para>Campaign VM VM6 review fix round 2 (F3), round 3 (N5): takes
/// the would-be-captured value (e.g. the mesh adapter) as an explicit
/// <typeparamref name="TContext"/> argument to a
/// <see langword="static"/> lambda instead of letting a caller's lambda
/// close over an instance field — a closure-capturing lambda would
/// allocate a fresh closure object AND delegate on every call, and this
/// runs once per Setup entity per frame from all three production
/// classifiers. A <see langword="static"/> lambda with no captures lets
/// the C# compiler cache a single delegate instance for the method's
/// lifetime instead. Round 3 deleted the single-generic predecessor of
/// this overload — every call site (production and test) now goes
/// through this one, so there is exactly one
/// <c>ComputeEntityHasCutoutSubset</c> to keep correct.</para>
/// </summary>
internal static bool ComputeEntityHasCutoutSubset<T, TContext>(
IReadOnlyList<T> setupParts,