Retail draws cell geometry at the dat EnvCell origin verbatim; the 0.02 m lift was our z-fight stand-in (register row AP-32, deleted in this commit). With the walk owning retail draw ORDER under WorldDepthContract Less (first-drawn-wins: DrawBlock terrain-then- objects per cell, DrawCells shells-then-contents), the coplanar tie-breaks the lift compensated for are now resolved the way retail resolves them. Deleted at every site: the PortalVisibilityBuilder const + the drawLiftZ Build parameter and its lifted exit-portal projection branch (gate and drawn geometry now share ONE space); the seal/punch fan lifts (DrawPortalDepthWrite + the walk's DrawWalkPunchFan); the LandblockBuildFactory drawn-cell-transform lift (render and physics share the one verbatim transform). The #130 proof flipped exactly as its own doc predicted: UnliftedGate_LeavesTheStripAtTheDrawnTopEdge is deleted (its premise - gate space != drawn space - no longer exists), and the renamed ExitDoorTopEdge_GateCoversTheDrawnApertureWithinPixelTolerance sweep (147 eye/gaze combos at the Holtburg corner door) passes with both in the same unlifted space (worst plane gap <= 1.2 px, scissor <= 0.15 px - unchanged tolerances). Ten more replay-test call sites swept to the new Build signature. Suites: full Release build 0 warnings; hermetic 6,750/0; the 21 affected InstalledDat replay tests green; Walk conformance 40/1 untouched. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
197 lines
8.3 KiB
C#
197 lines
8.3 KiB
C#
using System.Numerics;
|
|
using AcDream.App.Rendering.Walk;
|
|
using AcDream.Core.Vfx;
|
|
|
|
namespace AcDream.App.Rendering;
|
|
|
|
/// <summary>Campaign FW3.2b-2 (step 1): the walk driver's leaf draws over
|
|
/// this executor's renderers. Same leaf mechanics as the packed slice
|
|
/// methods — the cutover changes ORDER only.</summary>
|
|
internal sealed partial class RetailPViewPassExecutor
|
|
{
|
|
/// <summary>The walk's single sky turn: retail draws GameSky once
|
|
/// inside <c>LScape::draw</c>, clipped by the active views; looping
|
|
/// today's per-slice scissor + terrain-clip block reproduces today's
|
|
/// pixels while the driver sees ONE turn.</summary>
|
|
internal void DrawWalkSky(
|
|
RetailPViewFrameInput frame, ClipFrameAssembly clipAssembly)
|
|
{
|
|
if (!frame.RenderSky)
|
|
return;
|
|
ReadOnlySpan<ClipViewSlice> slices = clipAssembly.OutsideViewSlices;
|
|
for (int sliceIndex = 0; sliceIndex < slices.Length; sliceIndex++)
|
|
{
|
|
ClipViewSlice slice = slices[sliceIndex];
|
|
bool scissor = BeginDoorwayScissor(slice.NdcAabb);
|
|
_surface.BindTerrainClip();
|
|
EnableClipDistances();
|
|
_sky?.RenderSky(
|
|
frame.Camera,
|
|
frame.CameraWorldPosition,
|
|
frame.DayFraction,
|
|
frame.ActiveDayGroup,
|
|
frame.SkyKeyframe,
|
|
frame.EnvironOverrideActive);
|
|
DisableClipDistances();
|
|
if (_particles is not null && _particleRenderer is not null)
|
|
{
|
|
_particleRenderer.Draw(
|
|
frame.Camera,
|
|
frame.CameraWorldPosition,
|
|
ParticleRenderPass.SkyPreScene);
|
|
}
|
|
if (scissor)
|
|
_surface.EndScissor();
|
|
}
|
|
}
|
|
|
|
/// <summary>The walk's per-slice terrain turn — the terrain block of
|
|
/// <c>DrawLandscapeSlice</c> (scissor + terrain clip + slice planes +
|
|
/// NDC AABB), without the sky/entity halves the walk owns separately.</summary>
|
|
internal void DrawWalkTerrainSlice(
|
|
RetailPViewFrameInput frame, ClipFrameAssembly clipAssembly, int sliceIndex)
|
|
{
|
|
ReadOnlySpan<ClipViewSlice> slices = clipAssembly.OutsideViewSlices;
|
|
if ((uint)sliceIndex >= (uint)slices.Length)
|
|
{
|
|
throw new ArgumentOutOfRangeException(
|
|
nameof(sliceIndex), sliceIndex,
|
|
$"walk terrain turn: slice {sliceIndex} of {slices.Length}");
|
|
}
|
|
ClipViewSlice slice = slices[sliceIndex];
|
|
bool scissor = BeginDoorwayScissor(slice.NdcAabb);
|
|
_surface.BindTerrainClip();
|
|
EnableClipDistances();
|
|
_terrainDiagnostics.Begin();
|
|
_terrain?.Draw(
|
|
frame.Camera,
|
|
frame.Frustum,
|
|
neverCullLandblockId: frame.PlayerLandblockId,
|
|
clipPlanes: slice.Planes,
|
|
ndcClipAabb: slice.NdcAabb);
|
|
_terrainDiagnostics.Complete();
|
|
DisableClipDistances();
|
|
if (scissor)
|
|
_surface.EndScissor();
|
|
}
|
|
|
|
/// <summary>The walk's punch-fan turn — <c>DrawPortalPolyInternal</c>
|
|
/// @0x0059bc90's far-Z punch through <c>PortalDepthMaskRenderer</c>,
|
|
/// clipped by the pinned view's slice planes (retail
|
|
/// <c>building_view</c> @0x0059f3bf). FW3.3: fans draw at the dat
|
|
/// aperture verbatim (the ShellDrawLiftZ retirement).</summary>
|
|
internal void DrawWalkPunchFan(
|
|
RetailPViewFrameInput frame,
|
|
ClipFrameAssembly clipAssembly,
|
|
WalkPolygon worldPolygon,
|
|
int activeViewIndex)
|
|
{
|
|
if (_portalDepthMask is null)
|
|
return;
|
|
Vector3[] vertices = worldPolygon.Vertices;
|
|
if (vertices.Length < 3)
|
|
return;
|
|
ReadOnlySpan<ClipViewSlice> slices = clipAssembly.OutsideViewSlices;
|
|
ReadOnlySpan<Vector4> planes = (uint)activeViewIndex < (uint)slices.Length
|
|
? slices[activeViewIndex].Planes
|
|
: default;
|
|
|
|
Span<Vector3> world = stackalloc Vector3[32];
|
|
int count = Math.Min(vertices.Length, world.Length);
|
|
for (int vertex = 0; vertex < count; vertex++)
|
|
world[vertex] = vertices[vertex];
|
|
_portalDepthMask.DrawDepthFan(
|
|
world[..count],
|
|
frame.ViewProjection,
|
|
planes,
|
|
forceFarZ: true);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Campaign FW stage FW3.2b-2 (step 1, additive): the production
|
|
/// <see cref="IWalkFrameLeafRenderer"/> over this executor's leaf renderers.
|
|
/// Constructed per frame by the FW3.2b-2 rooting (plan §FW3 "FW3.2b-2 —
|
|
/// the production rooting"); nothing invokes it until the static cutover
|
|
/// flips. Each member maps a <see cref="WalkFrameDriver"/> turn onto the
|
|
/// SAME leaf calls the packed path uses today, so the cutover changes
|
|
/// ORDER, never the leaf mechanics:
|
|
///
|
|
/// <list type="bullet">
|
|
/// <item><see cref="DrawSky"/> → the sky block of <c>DrawLandscapeSlice</c>,
|
|
/// looped over the active slices internally (retail draws GameSky once
|
|
/// inside <c>LScape::draw</c> clipped by the active views; the per-slice
|
|
/// scissor+clip here reproduces today's pixels while the driver still sees
|
|
/// ONE sky turn).</item>
|
|
/// <item><see cref="DrawTerrainSlice"/> → the terrain block of
|
|
/// <c>DrawLandscapeSlice</c> (scissor + terrain clip + slice planes).</item>
|
|
/// <item><see cref="DrawCellShell"/> → <c>EnvCellRenderer</c> opaque +
|
|
/// transparent-ordered for ONE cell (retail <c>DrawEnvCell</c>
|
|
/// @0x0059f170 draws per cell at its flood turn).</item>
|
|
/// <item><see cref="DrawPunchFan"/> → <c>PortalDepthMaskRenderer.DrawDepthFan</c>
|
|
/// with <c>forceFarZ</c>, clipped by the pinned view's slice planes
|
|
/// (retail <c>building_view</c> @0x0059f3bf); FW3.3 draws fans at the dat
|
|
/// aperture verbatim (the ShellDrawLiftZ retirement).</item>
|
|
/// <item><see cref="ClearInteriorDepth"/>/<see cref="DrawExitSeals"/> →
|
|
/// caller-supplied actions (the renderer owns the pass scope and the
|
|
/// root-flood seal iteration; the adapter only provides the turns).</item>
|
|
/// <item><see cref="AlphaBarrier"/> → <c>FlushLandscapeAlphaFartherThan</c>
|
|
/// (the <c>DrawBuilding</c> barrier; retail's flush-all
|
|
/// <c>FlushAlphaList(0f)</c> @0x0059f30b is the FW4 adjudication
|
|
/// candidate recorded on the driver's interface).</item>
|
|
/// </list>
|
|
/// </summary>
|
|
internal sealed class WalkProductionLeafRenderer : IWalkFrameLeafRenderer
|
|
{
|
|
private readonly RetailPViewPassExecutor _passes;
|
|
private readonly RetailPViewFrameInput _frame;
|
|
private readonly ClipFrameAssembly _clipAssembly;
|
|
private readonly Action _clearInteriorDepth;
|
|
private readonly Action _drawExitSeals;
|
|
private readonly HashSet<uint> _singleCellScratch = new();
|
|
private readonly List<uint> _singleCellListScratch = new();
|
|
|
|
internal WalkProductionLeafRenderer(
|
|
RetailPViewPassExecutor passes,
|
|
RetailPViewFrameInput frame,
|
|
ClipFrameAssembly clipAssembly,
|
|
Action clearInteriorDepth,
|
|
Action drawExitSeals)
|
|
{
|
|
_passes = passes ?? throw new ArgumentNullException(nameof(passes));
|
|
_frame = frame ?? throw new ArgumentNullException(nameof(frame));
|
|
_clipAssembly = clipAssembly;
|
|
_clearInteriorDepth = clearInteriorDepth
|
|
?? throw new ArgumentNullException(nameof(clearInteriorDepth));
|
|
_drawExitSeals = drawExitSeals
|
|
?? throw new ArgumentNullException(nameof(drawExitSeals));
|
|
}
|
|
|
|
public void DrawSky() => _passes.DrawWalkSky(_frame, _clipAssembly);
|
|
|
|
public void DrawTerrainSlice(int sliceIndex) =>
|
|
_passes.DrawWalkTerrainSlice(_frame, _clipAssembly, sliceIndex);
|
|
|
|
public void DrawCellShell(uint cellId)
|
|
{
|
|
_singleCellScratch.Clear();
|
|
_singleCellScratch.Add(cellId);
|
|
_passes.DrawOpaqueCellShells(_singleCellScratch);
|
|
if (_passes.CellHasTransparentShell(cellId))
|
|
{
|
|
_singleCellListScratch.Clear();
|
|
_singleCellListScratch.Add(cellId);
|
|
_passes.DrawTransparentCellShellsOrdered(_singleCellListScratch);
|
|
}
|
|
}
|
|
|
|
public void ClearInteriorDepth() => _clearInteriorDepth();
|
|
|
|
public void DrawExitSeals() => _drawExitSeals();
|
|
|
|
public void DrawPunchFan(WalkPolygon worldPolygon, int activeViewIndex) =>
|
|
_passes.DrawWalkPunchFan(_frame, _clipAssembly, worldPolygon, activeViewIndex);
|
|
|
|
public void AlphaBarrier(float viewerDistance) =>
|
|
_passes.FlushLandscapeAlphaFartherThan(viewerDistance);
|
|
}
|