39e8408c7d
Procedural-scenery foliage (trees/bushes — entity ids in the ProceduralSceneryIdAllocator's 0x8XXYYIII namespace) sways with weather in mesh_atmospheric.vert and all four directional_shadow_world_* caster vertex shaders, both calling the identical new foliage_wind.glsl include so the shadow moves with the leaf by construction. Classification (FoliageWindClassification, AcDream.App.Rendering.Wb): two new BatchData.flags bits, computed once per (entity, subset) from four inputs — entity id (bit 31 for procedural scenery), the pack's declared FoliageExclusions membership, the subset's TranslucencyKind, and ObjectRenderData.HasCutoutSubset (computed once per mesh at build time, not per frame). Bit 1 marks an alpha-cutout leaf subset; bit 2 marks an opaque trunk subset (only when its own mesh also owns a cutout subset, so rocks stay still). WbDrawDispatcher.ClassifyBatches (world receiver) and AddDirectionalShadowBatches (caster) call this with the same four inputs, so casters and receivers classify identically without needing to share state. Retail's mesh_modern/terrain_modern/mesh_detail pipelines never read these bits, so pack-off output is unaffected. Motion model (foliage_wind.glsl, mirrored bit-for-bit in the new FoliageWindModel for hermetic CPU tests): height-squared-scaled slow lean for every foliage subset, plus branch swing and per-vertex-hash-decorrelated flutter for cutout subsets only. AtmosphericPostProcessGraph.ResolveFoliageWind resolves the wind block once per frame.Serial — advanced by whichever of RenderDirectionalShadows (which runs first) or RenderPostProcess is called first that frame, with the second reading the already-advanced state, which is what keeps the caster and receiver reading byte-identical clock/strength values. The per-day-group mean/gust target (AtmospherePolicyDeclaration. FoliageWindByDayGroup, keyed by the same day-group index convention ActiveDayGroupMultipliers already established: Clear/Cloudy/Overcast/Rainy) eases toward its target over WeatherSystem.TransitionSeconds (10s) so a weather change never snaps; wind-enabled off or indoor instead gates the OUTPUT to an exact zero (not an asymptotic approach) so a settings toggle or cell transition is immediate. The wind clock is a Stopwatch started at graph construction (monotonic, session-relative magnitude for GPU sin() accuracy), overridable by the same ACDREAM_SKY_PHASE_SECONDS pin SkyRenderer already uses, for deterministic offline gates. New settings: wind-enabled, wind-strength, wind-direction-degrees (225° default — no authored retail wind direction exists to read), wind-lean-metres, wind-branch-metres, wind-flutter-metres (0 on Low), wind-canopy-height-metres. Register row IA-25 files this as an intentional, strictly opt-in divergence: retail applies no per-vertex wind displacement to any geometry. Known, accepted limitation: classification is per mesh-subset (one BatchData.flags word per indirect-draw batch), not per entity instance, so the rare case of one mesh subset being reachable from both a procedural-scenery and a non-scenery placement would classify all of that subset's instances alike. Tests: FoliageWindClassificationTests (the full classification matrix), FoliageWindModelTests (identity on non-foliage/calm-wind/base-vertex, canopy-top displacement bound, z-never-increases, trunk has no flutter term), RenderPackAtmospherePolicyEvaluationTests (exact day-group lookup, no interpolation across day-group ids, easing convergence without overshoot or discontinuity), AtmosphericShaderAbiTests (each of the five shaders calls acdreamFoliageDisplace exactly once; mesh_modern/terrain/mesh_detail call it never), and four AtmosphericPostProcessGraphTests additions (indoor/disabled exact-zero gating, settings-to-UBO wiring, same-frame-Serial idempotency — the last proxies the caster/receiver agreement invariant without needing this hermetic harness's WbDrawDispatcher/TerrainModernRenderer dependency chain to exercise RenderDirectionalShadows directly). App hermetic filter: 6015/6017 (the same 2 pre-existing failures as VM6a, confirmed unrelated). Core.Tests hermetic: 4697/4697. RenderPackValidator.Tests: 30/30. Full solution Debug and Release builds green. Shader recompile touched exactly the 5 edited files' .spv (plus manifest); the retail oracle set and every other pack shader are byte-identical. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
62 lines
2.5 KiB
C#
62 lines
2.5 KiB
C#
using AcDream.Core.Meshing;
|
|
|
|
namespace AcDream.App.Rendering.Wb;
|
|
|
|
/// <summary>
|
|
/// Campaign VM VM6: the two <c>BatchData.flags</c> bits that mark a world
|
|
/// draw batch as swaying foliage — bit 0 remains #226's built-mesh marker
|
|
/// (see <c>mesh_detail.frag</c>'s <c>vBatchFlags & 1u</c> check) and is
|
|
/// never touched here. <c>mesh_atmospheric.vert</c> and the four
|
|
/// <c>directional_shadow_world_*.vert</c> caster shaders read these bits
|
|
/// through the shared <c>foliage_wind.glsl</c> include
|
|
/// (<c>acdreamFoliageDisplace</c>'s <c>batchFlags & 0x6u</c> gate); the
|
|
/// retail <c>mesh_modern</c> pipelines never read them, so setting them does
|
|
/// not change pack-off output.
|
|
/// </summary>
|
|
internal static class FoliageWindClassification
|
|
{
|
|
/// <summary>
|
|
/// Bit 1: the subset is an alpha-cutout/ClipMap material AND its owning
|
|
/// entity is procedural scenery (see <see cref="Classify"/>). Leaves,
|
|
/// fronds, bushes, grass tufts.
|
|
/// </summary>
|
|
internal const uint CutoutFoliageFlag = 0x2u;
|
|
|
|
/// <summary>
|
|
/// Bit 2: the subset is opaque AND its owning entity is procedural
|
|
/// scenery AND that same entity owns at least one cutout subset — a
|
|
/// tree trunk or branch, not a rock (rocks have no cutout subset).
|
|
/// </summary>
|
|
internal const uint TrunkFlag = 0x4u;
|
|
|
|
private const uint SceneryEntityIdBit = 0x8000_0000u;
|
|
|
|
/// <summary>
|
|
/// Pure classification: no allocation, no scan. <paramref name="meshHasCutoutSubset"/>
|
|
/// is expected to be computed once per GfxObj/Setup mesh and cached with
|
|
/// the mesh record (<see cref="AcDream.App.Rendering.Wb.ObjectRenderData.HasCutoutSubset"/>),
|
|
/// not recomputed per call.
|
|
/// </summary>
|
|
internal static uint Classify(
|
|
uint entityId,
|
|
bool isExcluded,
|
|
TranslucencyKind translucency,
|
|
bool meshHasCutoutSubset)
|
|
{
|
|
if (!IsProceduralScenery(entityId) || isExcluded)
|
|
return 0u;
|
|
if (translucency == TranslucencyKind.ClipMap)
|
|
return CutoutFoliageFlag;
|
|
if (translucency == TranslucencyKind.Opaque && meshHasCutoutSubset)
|
|
return TrunkFlag;
|
|
return 0u;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Bit 31 of the entity id — see <c>ProceduralSceneryIdAllocator</c>'s
|
|
/// <c>0x8XXYYIII</c> namespace. No other consumer decodes more than this
|
|
/// one bit.
|
|
/// </summary>
|
|
internal static bool IsProceduralScenery(uint entityId) =>
|
|
(entityId & SceneryEntityIdBit) != 0u;
|
|
}
|