56860501b6
Dungeon FPS sat at ~30 (frame ~33ms) because the 25x25 streaming window around the dungeon landblock pulled in ~129 NEIGHBORING landblocks + their thousands of torch/particle emitters, all drawn though never visible. In AC all dungeons are packed adjacent in the unused "ocean" map grid, so those neighbors are unrelated dungeons. The FPS timeline proved it: 247 fps at login (lb 0/0, ~10K entities) → 17 → 30 as landblocks streamed in (lb 0→129) — the cost tracked LANDBLOCK count, not entities. Retail-faithful: ACE LandblockManager.GetAdjacentIDs returns ZERO adjacents for a dungeon (`if (landblock.IsDungeon) return adjacents;`, Landblock.cs:577-582) — every dungeon is a self-contained landblock you never see out of. Fix: when the player stands in a sealed indoor cell (CurrCell.IsEnv && !SeenOutside — the same predicate that kills the sun/sky), collapse streaming to just the player's dungeon landblock and unload the neighbors. Building interiors (cottage/inn) have SeenOutside cells, so they are NOT gated and keep their surrounding terrain (the frozen building/cellar demo is unaffected). Unloading the neighbors also tears down their lights (removeTerrain → UnregisterOwner), shrinking LightManager._all from ~2227 toward retail's ≤40 — which directly helps the A7 lighting bake landing next. Mechanics (StreamingController): - Edge IN: ClearPendingLoads() cancels the in-flight 25x25 window (new streamer ClearLoads control job — worker drops queued Loads, keeps Unloads), unload every resident neighbor, pin a radius-0 StreamingRegion, (re)load the dungeon block if needed. - Stay collapsed: sweep any straggler that finished loading after the edge (a Load the worker had already dequeued before ClearLoads). - Edge OUT (portal/teleport to outdoors): rebuild the full two-tier window at the new center, unload anything stale. AP-36 added to the divergence register (the gate uses the cheap SeenOutside cell predicate as an approximation of ACE's full landblock IsDungeon classification). GameWindow also carries a TEMP ACDREAM_LOG_FPS=1 headless FPS line (strip after the A7 FPS+lighting verification). Build green; 58 streaming tests green (6 new dungeon-gate tests). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
77 lines
3.4 KiB
C#
77 lines
3.4 KiB
C#
using System.Collections.Generic;
|
|
using AcDream.Core.Terrain;
|
|
using AcDream.Core.World;
|
|
|
|
namespace AcDream.App.Streaming;
|
|
|
|
/// <summary>
|
|
/// A job posted to <see cref="LandblockStreamer"/>'s inbox. Either a load
|
|
/// (fetch this landblock from the dats and build its CPU-side mesh data)
|
|
/// or an unload (release any state tied to this landblock on the render
|
|
/// thread's next Tick drain).
|
|
/// </summary>
|
|
public abstract record LandblockStreamJob(uint LandblockId)
|
|
{
|
|
public sealed record Load(uint LandblockId, LandblockStreamJobKind Kind) : LandblockStreamJob(LandblockId);
|
|
public sealed record Unload(uint LandblockId) : LandblockStreamJob(LandblockId);
|
|
|
|
/// <summary>
|
|
/// Control job: drop every queued (not-yet-started) Load from the worker's
|
|
/// priority queues, keeping Unloads. Posted by
|
|
/// <see cref="LandblockStreamer.ClearPendingLoads"/> when the player enters a
|
|
/// dungeon and the in-flight outdoor/neighbor window load must be cancelled
|
|
/// (#133 FPS — dungeons have no adjacent landblocks). LandblockId is 0 by
|
|
/// convention; readers pattern-match on the type.
|
|
/// </summary>
|
|
public sealed record ClearLoads() : LandblockStreamJob(0);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Outbox record the render thread drains. Either a successful load, a
|
|
/// failed load (logged and ignored until region recenters off/back), or
|
|
/// an unload notification (tells the render thread to release GPU state
|
|
/// for this landblock id).
|
|
/// </summary>
|
|
public abstract record LandblockStreamResult(uint LandblockId)
|
|
{
|
|
/// <summary>
|
|
/// A landblock load completed. <see cref="Tier"/> distinguishes Far
|
|
/// (terrain only) from Near (terrain + entities). <see cref="MeshData"/>
|
|
/// is built off the render thread on the streaming worker.
|
|
/// </summary>
|
|
public sealed record Loaded(
|
|
uint LandblockId,
|
|
LandblockStreamTier Tier,
|
|
LoadedLandblock Landblock,
|
|
LandblockMeshData MeshData
|
|
) : LandblockStreamResult(LandblockId);
|
|
|
|
/// <summary>
|
|
/// A previously-Far-resident landblock was promoted to Near. The result
|
|
/// carries the full near landblock plus mesh data so the render thread can
|
|
/// run the same near-tier side effects as a fresh LoadNear: cell visibility,
|
|
/// building registries, EnvCell finalization, lighting, and static collision.
|
|
/// GpuWorldState still merges only the entity layer so live entities already
|
|
/// attached to the landblock are preserved.
|
|
/// </summary>
|
|
public sealed record Promoted(
|
|
uint LandblockId,
|
|
LoadedLandblock Landblock,
|
|
LandblockMeshData MeshData
|
|
) : LandblockStreamResult(LandblockId)
|
|
{
|
|
public IReadOnlyList<WorldEntity> Entities => Landblock.Entities;
|
|
}
|
|
|
|
public sealed record Failed(uint LandblockId, string Error) : LandblockStreamResult(LandblockId);
|
|
public sealed record Unloaded(uint LandblockId) : LandblockStreamResult(LandblockId);
|
|
|
|
/// <summary>
|
|
/// The worker loop itself crashed with an unhandled exception. Not tied
|
|
/// to a specific landblock — distinguished from <see cref="Failed"/>
|
|
/// because consumers typically route this to a fatal-log path rather
|
|
/// than retrying a single landblock later. LandblockId is 0 by
|
|
/// convention; readers should pattern-match on the type, not the id.
|
|
/// </summary>
|
|
public sealed record WorkerCrashed(string Error) : LandblockStreamResult(0);
|
|
}
|