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

fix(render): foliage wind keys on the DAT-classified WeatherKind, not the day-group index (Campaign VM VM6)

Browse source 
FoliageWindByDayGroup / FoliageWindDayGroupPoint(int ActiveDayGroup, ...)
becomes FoliageWindByWeather / FoliageWindWeatherPoint(string WeatherKind,
...) in AtmospherePolicyDeclaration (Plugin.Abstractions is BCL-only, so
the key is the exact member name of AcDream.Core.World.WeatherKind rather
than the enum itself). The raw activeDayGroup index carries no weather
meaning by itself; WeatherState.cs already classifies each day group's
authored DAT name into one of five real weather kinds, and that fact was
already threaded through AtmosphericFrameInputs.Weather / uAtmosphereWeather.x
— this reuses it instead of guessing an index-to-category mapping.

Built-in table (BuiltInAtmosphericRenderPack.AtmospherePolicy()): Clear
0.25/0.15, Overcast 0.60/0.35, Rain 0.85/0.60, Snow 0.35/0.20, Storm
1.00/0.75 — all five WeatherKind members declared, the invented "Cloudy"
row dropped. RenderPackAtmospherePolicyEvaluation.FoliageWind now takes a
WeatherKind and matches by weather.ToString() (ordinal) against each
declared point's name; a kind absent from the table falls back to the
declared Clear row, then to (0,0) if Clear itself is undeclared. The
delta-seconds EMA interpolation (EaseTowardTarget) is unchanged.
AtmosphericPostProcessGraph.ResolveFoliageWind and its two callers
(RenderPostProcess via inputs.Weather; RenderDirectionalShadows via
foundation.Atmosphere.Kind) now pass WeatherKind instead of the day-group
int.

RenderPackValidation.ValidateAtmosphere (runs for every pack declaring an
AtmospherePolicy, not gated to Tier2/shadow packs) now rejects an unknown
or non-exact-case weather-kind name and a repeated kind, mirroring the
existing ActiveDayGroupMultiplier duplicate-key check.

Tests: RenderPackAtmospherePolicyEvaluationTests rewritten for the
kind-keyed API (all five kinds resolve to their declared row, an unlisted
kind falls back to Clear, ordinal exact-case matching, null-table
handling); RenderPackSpirvValidatorTests gains four descriptor-validation
cases (unknown name, wrong case, duplicate kind, the five-kind table
accepted); AtmosphericPostProcessGraphTests' three foliage-wind cases now
select WeatherKind.Storm via `with` instead of an assumed day-group index.

Spot-check (per the coordinator's ask, not changed here): yes —
ActiveDayGroupMultiplier / EvaluateDayGroupPolicy (pre-existing, Campaign
AR/VM3-era — BuiltInAtmosphericRenderPack.AtmospherePolicy()'s three rows
`new ActiveDayGroupMultiplier(0, 1.0), (1, 0.35), (2, 0.20)`) key the
sun-ray/shadow/volumetric day-group strength multiplier by the same raw
activeDayGroup index with an undocumented assumed meaning (0=brightest ...
2=dimmest), the identical class of issue this commit fixes for foliage
wind. Left unchanged per instruction; flagging for the coordinator to file.

Full solution Debug and Release builds green. App hermetic filter
6024/6026 — the same 2 pre-existing failures as VM6a/VM6b. Both were
re-run in isolation per the verification ask: both still fail alone (not
a load-flake in this environment) — confirmed via git stash earlier this
session that both already fail on the unmodified pre-VM6 baseline, so
they are pre-existing and unrelated to this change. Core.Tests hermetic
4697/4697. RenderPackValidator.Tests 30/30. No shader/spv changes in this
commit (pure C#/docs fix).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-23 01:07:54 +02:00
parent 39e8408c7d
commit 6cc5e183b9
10 changed files with 325 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/AcDream.App/Rendering/Packs/RenderPackAtmospherePolicyEvaluation.cs
View file

@ -1,3 +1,4 @@
using AcDream.Core.World;
using AcDream.Plugin.Abstractions.Rendering;
namespace AcDream.App.Rendering.Packs;
@ -45,26 +46,40 @@ internal static class RenderPackAtmospherePolicyEvaluation
fallback);
/// <summary>
/// Campaign VM VM6: exact day-group lookup for foliage wind — the same
/// shape as <see cref="ActiveDayGroupMultiplier"/>'s exact-match pattern
/// (day groups are not ordered by "how windy," so there is nothing to
/// interpolate across them). A day group absent from the table returns
/// (0, 0) — no wind is the safe default for an unclassified day group,
/// not full wind. The caller is responsible for smoothing the resolved
/// target over time; this method is a pure, stateless lookup.
/// Campaign VM VM6, corrected in the fix round: exact weather-kind
/// lookup for foliage wind, keyed by the DAT-classified
/// <see cref="WeatherKind"/> the frame already carries
/// (<c>AtmosphericFrameInputs.Weather</c> / <c>uAtmosphereWeather.x</c>)
/// — not the raw <c>activeDayGroup</c> index, which carries no weather
/// meaning by itself. Matches by <c>weather.ToString()</c> (ordinal)
/// against each declared <see cref="FoliageWindWeatherPoint.WeatherKind"/>
/// name. The five kinds are not ordered by "how windy," so this is an
/// exact match, never an interpolation across them. A kind absent from
/// the table falls back to the declared Clear row (a weather kind the
/// classifier could not resolve is closer to "no weather data" than to
/// "assume it's windy"); if Clear itself is undeclared, the fallback is
/// (0, 0). The caller is responsible for smoothing the resolved target
/// over time; this method is a pure, stateless lookup.
/// </summary>
internal static (float Mean, float Gust) FoliageWind(
IReadOnlyList<FoliageWindDayGroupPoint>? points,
int activeDayGroup)
IReadOnlyList<FoliageWindWeatherPoint>? points,
WeatherKind weather)
{
if (points is null)
return (0f, 0f);
foreach (FoliageWindDayGroupPoint point in points)
string kind = weather.ToString();
FoliageWindWeatherPoint? clear = null;
foreach (FoliageWindWeatherPoint point in points)
{
if (point.ActiveDayGroup == activeDayGroup)
if (string.Equals(point.WeatherKind, kind, StringComparison.Ordinal))
return ((float)point.Mean, (float)point.Gust);
if (clear is null
&& string.Equals(point.WeatherKind, nameof(WeatherKind.Clear), StringComparison.Ordinal))
{
clear = point;
}
}
return (0f, 0f);
return clear is { } fallback ? ((float)fallback.Mean, (float)fallback.Gust) : (0f, 0f);
}
/// <summary>