This reverts ceec3bc4. Two independent reasons, either sufficient.
The rendering regression. The slice deleted TextRenderGlStateScope, which
saved GL_MULTISAMPLE and GL_SAMPLE_ALPHA_TO_COVERAGE on entry, disabled them
for the text pass, and restored them on exit (TextRenderGlStateScope.cs:111-112
and 153-154 at the parent commit). Its replacement bakes that state into the
text pipeline but nothing restores it, and GlGpuPassEncoder.Dispose does not
either. Every world renderer is still raw GL at this point in the campaign, so
from the first UI frame onward the world drew with multisampling disabled.
The offline pixel gate caught it: 1,791 of 563,200 compared pixels differed,
0.318% against a 0.001 threshold. The commit message attributed this to
wall-clock-driven ambient animation shifting phase, and committed through the
failure. That explanation does not survive its own control: capturing twice at
the reverted-to commit differs by 19 pixels and twice at the slice's own commit
by 8, while base-versus-head differs by 1,791 - a 224x gap that no shared-noise
source explains. An amplified difference image settles it visually: the changed
pixels are the silhouette edges of every tree, building and rock, with terrain
interiors, water and the entire UI untouched. That is the signature of losing
edge antialiasing, not of animated sprites.
This is the exact failure mode two existing memory notes already warn about -
a mid-frame renderer must set every GL state it uses rather than inherit it,
and issue #52's lesson that a rendering migration must audit per-pass GL state
before declaring itself done.
The scope. The brief was three small leaf renderers plus additive frame-
lifecycle wiring, roughly ten files. The commit changed 334 files with 3,665
insertions and 3,845 deletions, including 323 public-to-internal visibility
conversions across the App assembly, 55 test files, two retired conformance
tests, and a self-described temporary escape hatch for bridging raw-GL viewport
textures. Even without the regression, that is not separable into the part
worth keeping and the part worth dropping.
Reverting rather than patching because the good work here - the RHI frame
lifecycle wiring and a genuine render-state-cache staleness fix - is small
enough to redo cleanly against a tightened spec, while untangling it from 300+
files of unrelated churn is not.
Post-revert: Release build clean, App suite back to 3,843 passed / 3 skipped,
offline pixel gate passing at 19 differing pixels.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
455 lines
18 KiB
C#
455 lines
18 KiB
C#
using AcDream.Core.Lighting;
|
|
using AcDream.Core.Plugins;
|
|
using AcDream.Core.Rendering;
|
|
using AcDream.Core.World;
|
|
using AcDream.Plugin.Abstractions;
|
|
|
|
namespace AcDream.App.Streaming;
|
|
|
|
/// <summary>
|
|
/// Retained receipt for the DAT-static presentation stages of one landblock
|
|
/// publication. The physics publisher calls the light/translucency stage at
|
|
/// the existing per-object point immediately before ordinary collision.
|
|
/// </summary>
|
|
public sealed class LandblockStaticPresentationPublication
|
|
{
|
|
private readonly Dictionary<uint, WorldEntity> _entities;
|
|
private readonly Dictionary<uint, WorldEntitySnapshot> _snapshots;
|
|
private readonly uint[] _orderedPreviouslyActiveIds;
|
|
private readonly Dictionary<uint, WorldEntitySnapshot> _replacementActive;
|
|
|
|
internal LandblockStaticPresentationPublication(
|
|
object owner,
|
|
LandblockPhysicsPublication physicsPublication,
|
|
Dictionary<uint, WorldEntity> entities,
|
|
Dictionary<uint, WorldEntitySnapshot> snapshots,
|
|
IReadOnlyDictionary<uint, WorldEntitySnapshot> priorActive,
|
|
HashSet<uint> previouslyActiveIds,
|
|
uint[] orderedPreviouslyActiveIds)
|
|
{
|
|
Owner = owner;
|
|
PhysicsPublication = physicsPublication;
|
|
_entities = entities;
|
|
_snapshots = snapshots;
|
|
PriorActive = priorActive;
|
|
PreviouslyActiveIds = previouslyActiveIds;
|
|
_orderedPreviouslyActiveIds = orderedPreviouslyActiveIds;
|
|
_replacementActive = new Dictionary<uint, WorldEntitySnapshot>(
|
|
physicsPublication.Build.Landblock.Entities.Count);
|
|
}
|
|
|
|
internal object Owner { get; }
|
|
internal LandblockPhysicsPublication PhysicsPublication { get; }
|
|
internal IReadOnlyDictionary<uint, WorldEntitySnapshot> PriorActive { get; }
|
|
internal Dictionary<uint, WorldEntity> MutableEntities => _entities;
|
|
internal Dictionary<uint, WorldEntitySnapshot> MutableSnapshots => _snapshots;
|
|
internal HashSet<uint> PreviouslyActiveIds { get; }
|
|
internal IReadOnlyList<uint> OrderedPreviouslyActiveIds =>
|
|
_orderedPreviouslyActiveIds;
|
|
internal IReadOnlyList<KeyValuePair<uint, WorldEntitySnapshot>>
|
|
OrderedSnapshots { get; set; } =
|
|
Array.Empty<KeyValuePair<uint, WorldEntitySnapshot>>();
|
|
internal Dictionary<uint, WorldEntitySnapshot> ReplacementActive =>
|
|
_replacementActive;
|
|
internal int PreparationCursor { get; set; }
|
|
internal bool PreparationCommitted { get; set; }
|
|
internal int PriorCleanupCursor { get; set; }
|
|
internal int PluginCursor { get; set; }
|
|
internal bool BeginCommitted { get; set; }
|
|
internal bool CompletionCommitted { get; set; }
|
|
|
|
public uint LandblockId => PhysicsPublication.LandblockId;
|
|
public IReadOnlyDictionary<uint, WorldEntity> Entities => _entities;
|
|
public IReadOnlyDictionary<uint, WorldEntitySnapshot> Snapshots => _snapshots;
|
|
}
|
|
|
|
public readonly record struct LandblockStaticPresentationDiagnostics(
|
|
long BeginCount,
|
|
long CompleteCount,
|
|
long LightReplacementCount,
|
|
long PluginSpawnCount,
|
|
long PluginRefreshCount,
|
|
long PluginRemovalCount,
|
|
int ActiveLandblockCount,
|
|
int ActiveEntityCount);
|
|
|
|
/// <summary>
|
|
/// Update-thread owner of DAT-static lights, translucency lifetime, and plugin
|
|
/// projection. Setup defaults remain activated exactly once at the existing
|
|
/// post-spatial render-pin boundary owned by <see cref="GpuWorldState"/>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Retail constructs each static <c>CPhysicsObj</c> from Setup defaults before
|
|
/// <c>CObjCell::init_objects</c> (0x0052B420) inserts/refloods it. The light
|
|
/// state follows <c>CPhysicsObj::set_lights</c> (0x0050FCF0); translucency
|
|
/// starts from the new object's Setup/material state before later FPHooks.
|
|
/// Plugin projection is an acdream adaptation and therefore emits at most one
|
|
/// logical spawn per retained static ID, while reapply only refreshes current
|
|
/// state.
|
|
/// </remarks>
|
|
public sealed class LandblockStaticPresentationPublisher
|
|
{
|
|
private readonly object _receiptOwner = new();
|
|
private readonly LightingHookSink _lighting;
|
|
private readonly TranslucencyFadeManager _translucency;
|
|
private readonly WorldGameState _worldState;
|
|
private readonly WorldEvents _worldEvents;
|
|
private readonly Dictionary<uint, Dictionary<uint, WorldEntitySnapshot>>
|
|
_activeByLandblock = new();
|
|
private readonly Dictionary<uint, uint> _landblockByEntityId = new();
|
|
|
|
private long _beginCount;
|
|
private long _completeCount;
|
|
private long _lightReplacementCount;
|
|
private long _pluginSpawnCount;
|
|
private long _pluginRefreshCount;
|
|
private long _pluginRemovalCount;
|
|
|
|
public LandblockStaticPresentationPublisher(
|
|
LightingHookSink lighting,
|
|
TranslucencyFadeManager translucency,
|
|
WorldGameState worldState,
|
|
WorldEvents worldEvents)
|
|
{
|
|
_lighting = lighting ?? throw new ArgumentNullException(nameof(lighting));
|
|
_translucency = translucency
|
|
?? throw new ArgumentNullException(nameof(translucency));
|
|
_worldState = worldState ?? throw new ArgumentNullException(nameof(worldState));
|
|
_worldEvents = worldEvents ?? throw new ArgumentNullException(nameof(worldEvents));
|
|
}
|
|
|
|
public LandblockStaticPresentationDiagnostics Diagnostics => new(
|
|
_beginCount,
|
|
_completeCount,
|
|
_lightReplacementCount,
|
|
_pluginSpawnCount,
|
|
_pluginRefreshCount,
|
|
_pluginRemovalCount,
|
|
_activeByLandblock.Count,
|
|
_landblockByEntityId.Count);
|
|
|
|
internal bool MatchesResources(
|
|
LightingHookSink lighting,
|
|
TranslucencyFadeManager translucency) =>
|
|
ReferenceEquals(_lighting, lighting)
|
|
&& ReferenceEquals(_translucency, translucency);
|
|
|
|
public LandblockStaticPresentationPublication PreparePublication(
|
|
LandblockPhysicsPublication physicsPublication)
|
|
{
|
|
LandblockStaticPresentationPublication publication =
|
|
CreatePublication(physicsPublication);
|
|
while (!AdvancePreparationOne(publication))
|
|
{
|
|
}
|
|
return publication;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Captures prior ownership without validating the replacement entity
|
|
/// list. The concrete pipeline advances replacement validation one entity
|
|
/// at a time before any render/physics owner mutates external state.
|
|
/// </summary>
|
|
internal LandblockStaticPresentationPublication CreatePublication(
|
|
LandblockPhysicsPublication physicsPublication)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(physicsPublication);
|
|
|
|
uint canonical = Canonicalize(physicsPublication.LandblockId);
|
|
_activeByLandblock.TryGetValue(
|
|
canonical,
|
|
out Dictionary<uint, WorldEntitySnapshot>? active);
|
|
var entities = new Dictionary<uint, WorldEntity>();
|
|
var snapshots = new Dictionary<uint, WorldEntitySnapshot>();
|
|
HashSet<uint> previous = active is not null
|
|
? active.Keys.ToHashSet()
|
|
: new HashSet<uint>();
|
|
uint[] orderedPrevious = previous.Order().ToArray();
|
|
return new LandblockStaticPresentationPublication(
|
|
_receiptOwner,
|
|
physicsPublication,
|
|
entities,
|
|
snapshots,
|
|
active ?? new Dictionary<uint, WorldEntitySnapshot>(),
|
|
previous,
|
|
orderedPrevious);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Validates and snapshots one replacement entity. The final stable plugin
|
|
/// order is materialized only after the cursor reaches the immutable tail.
|
|
/// </summary>
|
|
internal bool AdvancePreparationOne(
|
|
LandblockStaticPresentationPublication publication)
|
|
{
|
|
ValidateReceipt(publication);
|
|
if (publication.PreparationCommitted)
|
|
return true;
|
|
|
|
IReadOnlyList<WorldEntity> source =
|
|
publication.PhysicsPublication.Build.Landblock.Entities;
|
|
uint canonical = Canonicalize(publication.LandblockId);
|
|
if (publication.PreparationCursor < source.Count)
|
|
{
|
|
WorldEntity entity = source[publication.PreparationCursor];
|
|
if (entity.ServerGuid != 0)
|
|
{
|
|
publication.PreparationCursor++;
|
|
return false;
|
|
}
|
|
if (publication.Entities.ContainsKey(entity.Id))
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"Landblock 0x{canonical:X8} contains duplicate DAT-static ID " +
|
|
$"0x{entity.Id:X8}.");
|
|
}
|
|
if (_landblockByEntityId.TryGetValue(entity.Id, out uint owner)
|
|
&& owner != canonical)
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"DAT-static ID 0x{entity.Id:X8} is already owned by " +
|
|
$"landblock 0x{owner:X8}.");
|
|
}
|
|
if (publication.PriorActive.TryGetValue(
|
|
entity.Id,
|
|
out WorldEntitySnapshot retained)
|
|
&& retained.SourceId != entity.SourceGfxObjOrSetupId)
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"Retained DAT-static ID 0x{entity.Id:X8} changed source " +
|
|
$"from 0x{retained.SourceId:X8} to " +
|
|
$"0x{entity.SourceGfxObjOrSetupId:X8}.");
|
|
}
|
|
|
|
publication.MutableEntities.Add(entity.Id, entity);
|
|
publication.MutableSnapshots.Add(entity.Id, Snapshot(entity));
|
|
publication.PreparationCursor++;
|
|
return false;
|
|
}
|
|
|
|
publication.OrderedSnapshots = publication.Snapshots
|
|
.OrderBy(static pair => pair.Key)
|
|
.ToArray();
|
|
publication.PreparationCommitted = true;
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Retires omitted prior projections and detaches prior concrete lights
|
|
/// before replacement collision. Retained IDs keep their SetLight latch
|
|
/// and FPHook translucency state because rehydrate is not a logical create.
|
|
/// </summary>
|
|
public void BeginPublication(LandblockStaticPresentationPublication publication)
|
|
{
|
|
ValidateReceipt(publication);
|
|
if (!publication.PreparationCommitted)
|
|
throw new InvalidOperationException(
|
|
"Static presentation cannot begin before preparation commits.");
|
|
while (!AdvanceBeginOne(publication))
|
|
{
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Advances exactly one retained prior-owner cleanup. The cursor advances
|
|
/// only after the complete owner operation succeeds, so a failure retries
|
|
/// the same ID without rebuilding or reordering the work list.
|
|
/// </summary>
|
|
internal bool AdvanceBeginOne(
|
|
LandblockStaticPresentationPublication publication)
|
|
{
|
|
ValidateReceipt(publication);
|
|
if (publication.BeginCommitted)
|
|
return true;
|
|
|
|
if (publication.PriorCleanupCursor
|
|
< publication.OrderedPreviouslyActiveIds.Count)
|
|
{
|
|
uint id = publication.OrderedPreviouslyActiveIds[
|
|
publication.PriorCleanupCursor];
|
|
bool retained = publication.Entities.ContainsKey(id);
|
|
_lighting.UnregisterOwner(id, forgetState: !retained);
|
|
if (!retained)
|
|
{
|
|
_translucency.ClearEntity(id);
|
|
_worldState.RemoveById(id);
|
|
_worldEvents.ForgetEntity(id);
|
|
_landblockByEntityId.Remove(id);
|
|
_pluginRemovalCount++;
|
|
}
|
|
publication.PriorCleanupCursor++;
|
|
return false;
|
|
}
|
|
|
|
publication.BeginCommitted = true;
|
|
_beginCount++;
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Exact replacement called by <see cref="LandblockPhysicsPublisher"/>
|
|
/// immediately before registering this object's ordinary collision.
|
|
/// </summary>
|
|
public void PrepareEntityBeforeCollision(
|
|
LandblockStaticPresentationPublication publication,
|
|
WorldEntity entity)
|
|
{
|
|
ValidateReceipt(publication);
|
|
ArgumentNullException.ThrowIfNull(entity);
|
|
if (!publication.BeginCommitted)
|
|
throw new InvalidOperationException(
|
|
"Static presentation cannot prepare an entity before begin commits.");
|
|
if (entity.ServerGuid != 0)
|
|
return;
|
|
if (!publication.Entities.TryGetValue(entity.Id, out WorldEntity? expected)
|
|
|| !ReferenceEquals(expected, entity))
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"DAT-static entity 0x{entity.Id:X8} does not belong to this publication.");
|
|
}
|
|
|
|
bool retained = publication.PreviouslyActiveIds.Contains(entity.Id);
|
|
_lighting.UnregisterOwner(entity.Id, forgetState: !retained);
|
|
if (!retained)
|
|
_translucency.ClearEntity(entity.Id);
|
|
|
|
PhysicsDatBundle datBundle = publication.PhysicsPublication.Build.Landblock.PhysicsDats
|
|
?? PhysicsDatBundle.Empty;
|
|
uint sourceId = entity.SourceGfxObjOrSetupId;
|
|
if ((sourceId & 0xFF000000u) == 0x02000000u
|
|
&& datBundle.Setups.TryGetValue(sourceId, out var setup))
|
|
{
|
|
IReadOnlyList<LightSource> lights = LightInfoLoader.Load(
|
|
setup,
|
|
ownerId: entity.Id,
|
|
entityPosition: entity.Position,
|
|
entityRotation: entity.Rotation,
|
|
cellId: entity.ParentCellId ?? 0u);
|
|
for (int i = 0; i < lights.Count; i++)
|
|
_lighting.RegisterOwnedLight(lights[i]);
|
|
}
|
|
_lightReplacementCount++;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Publishes the exact current plugin snapshot after collision/reflood.
|
|
/// Existing IDs refresh replay state without emitting another logical
|
|
/// spawn; new IDs emit once.
|
|
/// </summary>
|
|
public void CompletePublication(
|
|
LandblockStaticPresentationPublication publication)
|
|
{
|
|
ValidateReceipt(publication);
|
|
if (!publication.BeginCommitted
|
|
|| !publication.PhysicsPublication.CompletionCommitted)
|
|
{
|
|
throw new InvalidOperationException(
|
|
"Static presentation requires completed physics publication.");
|
|
}
|
|
while (!AdvanceCompleteOne(publication))
|
|
{
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Advances exactly one plugin projection, then atomically publishes the
|
|
/// retained replacement dictionary after the cursor reaches its tail.
|
|
/// </summary>
|
|
internal bool AdvanceCompleteOne(
|
|
LandblockStaticPresentationPublication publication)
|
|
{
|
|
ValidateReceipt(publication);
|
|
if (!publication.BeginCommitted
|
|
|| !publication.PhysicsPublication.CompletionCommitted)
|
|
{
|
|
throw new InvalidOperationException(
|
|
"Static presentation requires completed physics publication.");
|
|
}
|
|
if (publication.CompletionCommitted)
|
|
return true;
|
|
|
|
if (publication.PluginCursor < publication.OrderedSnapshots.Count)
|
|
{
|
|
(uint id, WorldEntitySnapshot snapshot) =
|
|
publication.OrderedSnapshots[publication.PluginCursor];
|
|
_worldState.Add(snapshot);
|
|
if (publication.PreviouslyActiveIds.Contains(id))
|
|
{
|
|
_worldEvents.UpsertCurrent(snapshot);
|
|
_pluginRefreshCount++;
|
|
}
|
|
else
|
|
{
|
|
_worldEvents.FireEntitySpawned(snapshot);
|
|
_pluginSpawnCount++;
|
|
}
|
|
_landblockByEntityId[id] = Canonicalize(publication.LandblockId);
|
|
publication.ReplacementActive[id] = snapshot;
|
|
publication.PluginCursor++;
|
|
return false;
|
|
}
|
|
|
|
uint canonical = Canonicalize(publication.LandblockId);
|
|
if (publication.ReplacementActive.Count == 0)
|
|
_activeByLandblock.Remove(canonical);
|
|
else
|
|
_activeByLandblock[canonical] = publication.ReplacementActive;
|
|
publication.CompletionCommitted = true;
|
|
_completeCount++;
|
|
return true;
|
|
}
|
|
|
|
public void RemoveLighting(WorldEntity entity)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(entity);
|
|
if (entity.ServerGuid == 0)
|
|
_lighting.UnregisterOwner(entity.Id);
|
|
}
|
|
|
|
public void RemoveTranslucency(WorldEntity entity)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(entity);
|
|
if (entity.ServerGuid == 0)
|
|
_translucency.ClearEntity(entity.Id);
|
|
}
|
|
|
|
public void RemovePluginProjection(WorldEntity entity)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(entity);
|
|
if (entity.ServerGuid != 0)
|
|
return;
|
|
|
|
_worldState.RemoveById(entity.Id);
|
|
_worldEvents.ForgetEntity(entity.Id);
|
|
if (_landblockByEntityId.Remove(entity.Id, out uint landblockId)
|
|
&& _activeByLandblock.TryGetValue(
|
|
landblockId,
|
|
out Dictionary<uint, WorldEntitySnapshot>? active))
|
|
{
|
|
active.Remove(entity.Id);
|
|
if (active.Count == 0)
|
|
_activeByLandblock.Remove(landblockId);
|
|
}
|
|
_pluginRemovalCount++;
|
|
}
|
|
|
|
private void ValidateReceipt(LandblockStaticPresentationPublication publication)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(publication);
|
|
if (!ReferenceEquals(publication.Owner, _receiptOwner))
|
|
{
|
|
throw new ArgumentException(
|
|
"The static presentation receipt belongs to another publisher.",
|
|
nameof(publication));
|
|
}
|
|
}
|
|
|
|
private static WorldEntitySnapshot Snapshot(WorldEntity entity) => new(
|
|
Id: entity.Id,
|
|
SourceId: entity.SourceGfxObjOrSetupId,
|
|
Position: entity.Position,
|
|
Rotation: entity.Rotation);
|
|
|
|
private static uint Canonicalize(uint landblockId) =>
|
|
(landblockId & 0xFFFF0000u) | 0xFFFFu;
|
|
}
|