fix(ui): bind radar to streamed world state

Resolve the live-entity spatial broadphase at snapshot time so retained UI construction cannot capture GameWindow's empty bootstrap GpuWorldState. Add a replacement-owner regression test covering the exact compass-without-blips failure.

Co-authored-by: OpenAI Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-21 06:24:05 +02:00
parent e02acb870c
commit f4cf802330
5 changed files with 90 additions and 17 deletions

View file

@ -2264,7 +2264,7 @@ public sealed class GameWindow : IDisposable
coordinatesOnRadar: () => _persistedGameplay.CoordinatesOnRadar, coordinatesOnRadar: () => _persistedGameplay.CoordinatesOnRadar,
uiLocked: () => _persistedGameplay.LockUI, uiLocked: () => _persistedGameplay.LockUI,
playerEntities: () => _entitiesByServerGuid, playerEntities: () => _entitiesByServerGuid,
copySpatialCandidates: _worldState.CopyLiveEntitiesNearLandblock); spatialQuery: () => _worldState);
var retailChatVm = new AcDream.UI.Abstractions.Panels.Chat.ChatVM(Chat, displayLimit: 200); var retailChatVm = new AcDream.UI.Abstractions.Panels.Chat.ChatVM(Chat, displayLimit: 200);
_retailChatVm = retailChatVm; _retailChatVm = retailChatVm;
AcDream.App.UI.RetailUiPersistenceBindings? persistence = _settingsStore is null AcDream.App.UI.RetailUiPersistenceBindings? persistence = _settingsStore is null

View file

@ -3,6 +3,7 @@ using System.Linq;
using System.Numerics; using System.Numerics;
using AcDream.App.Rendering.Vfx; using AcDream.App.Rendering.Vfx;
using AcDream.App.Rendering.Wb; using AcDream.App.Rendering.Wb;
using AcDream.App.World;
using AcDream.Core.World; using AcDream.Core.World;
namespace AcDream.App.Streaming; namespace AcDream.App.Streaming;
@ -39,7 +40,7 @@ namespace AcDream.App.Streaming;
/// Threading: not thread-safe. All calls must happen on the render thread. /// Threading: not thread-safe. All calls must happen on the render thread.
/// </remarks> /// </remarks>
/// </summary> /// </summary>
public sealed class GpuWorldState public sealed class GpuWorldState : ILiveEntitySpatialQuery
{ {
private readonly LandblockSpawnAdapter? _wbSpawnAdapter; private readonly LandblockSpawnAdapter? _wbSpawnAdapter;
private readonly EntityScriptActivator? _entityScriptActivator; private readonly EntityScriptActivator? _entityScriptActivator;

View file

@ -1,4 +1,5 @@
using System.Numerics; using System.Numerics;
using AcDream.App.World;
using AcDream.Core.Items; using AcDream.Core.Items;
using AcDream.Core.Net; using AcDream.Core.Net;
using AcDream.Core.Physics.Motion; using AcDream.Core.Physics.Motion;
@ -29,7 +30,7 @@ public sealed class RadarSnapshotProvider
private readonly Func<bool> _coordinatesOnRadar; private readonly Func<bool> _coordinatesOnRadar;
private readonly Func<bool> _uiLocked; private readonly Func<bool> _uiLocked;
private readonly Func<uint, RadarRelationshipTraits>? _relationshipFor; private readonly Func<uint, RadarRelationshipTraits>? _relationshipFor;
private readonly Action<uint, int, List<KeyValuePair<uint, WorldEntity>>>? _copySpatialCandidates; private readonly Func<ILiveEntitySpatialQuery?>? _spatialQuery;
private readonly List<KeyValuePair<uint, WorldEntity>> _candidateScratch = new(); private readonly List<KeyValuePair<uint, WorldEntity>> _candidateScratch = new();
public RadarSnapshotProvider( public RadarSnapshotProvider(
@ -44,7 +45,7 @@ public sealed class RadarSnapshotProvider
Func<bool> uiLocked, Func<bool> uiLocked,
Func<uint, RadarRelationshipTraits>? relationshipFor = null, Func<uint, RadarRelationshipTraits>? relationshipFor = null,
Func<IReadOnlyDictionary<uint, WorldEntity>>? playerEntities = null, Func<IReadOnlyDictionary<uint, WorldEntity>>? playerEntities = null,
Action<uint, int, List<KeyValuePair<uint, WorldEntity>>>? copySpatialCandidates = null) Func<ILiveEntitySpatialQuery?>? spatialQuery = null)
{ {
_objects = objects ?? throw new ArgumentNullException(nameof(objects)); _objects = objects ?? throw new ArgumentNullException(nameof(objects));
_worldEntities = worldEntities ?? throw new ArgumentNullException(nameof(worldEntities)); _worldEntities = worldEntities ?? throw new ArgumentNullException(nameof(worldEntities));
@ -57,7 +58,7 @@ public sealed class RadarSnapshotProvider
_coordinatesOnRadar = coordinatesOnRadar ?? throw new ArgumentNullException(nameof(coordinatesOnRadar)); _coordinatesOnRadar = coordinatesOnRadar ?? throw new ArgumentNullException(nameof(coordinatesOnRadar));
_uiLocked = uiLocked ?? throw new ArgumentNullException(nameof(uiLocked)); _uiLocked = uiLocked ?? throw new ArgumentNullException(nameof(uiLocked));
_relationshipFor = relationshipFor; _relationshipFor = relationshipFor;
_copySpatialCandidates = copySpatialCandidates; _spatialQuery = spatialQuery;
} }
public UiRadarSnapshot BuildSnapshot() public UiRadarSnapshot BuildSnapshot()
@ -90,12 +91,16 @@ public sealed class RadarSnapshotProvider
float range = RetailRadar.GetRangeMeters(isOutside); float range = RetailRadar.GetRangeMeters(isOutside);
_candidateScratch.Clear(); _candidateScratch.Clear();
if (_copySpatialCandidates is not null) // Retained UI mounts before the production GpuWorldState. Resolve the
// spatial owner per snapshot just like the live dictionaries above;
// retaining a method group here binds forever to the empty bootstrap
// state and produces a working compass with no object blips.
if (_spatialQuery?.Invoke() is { } spatialQuery)
{ {
// Retail radar is at most 75 metres while a landblock is 192 // Retail radar is at most 75 metres while a landblock is 192
// metres wide. The current block plus its eight neighbours is a // metres wide. The current block plus its eight neighbours is a
// complete broadphase (the cheap spatial pre-filter). // complete broadphase (the cheap spatial pre-filter).
_copySpatialCandidates(playerCellId, 1, _candidateScratch); spatialQuery.CopyLiveEntitiesNearLandblock(playerCellId, 1, _candidateScratch);
} }
else else
{ {

View file

@ -0,0 +1,16 @@
using AcDream.Core.World;
namespace AcDream.App.World;
/// <summary>
/// Read-only spatial broadphase for live server-object projections.
/// Consumers resolve this owner late because <c>GameWindow</c> replaces its
/// empty bootstrap world state after retained UI construction.
/// </summary>
public interface ILiveEntitySpatialQuery
{
void CopyLiveEntitiesNearLandblock(
uint centerCellOrLandblockId,
int landblockRadius,
List<KeyValuePair<uint, WorldEntity>> destination);
}

View file

@ -1,6 +1,7 @@
using System.Numerics; using System.Numerics;
using AcDream.App.UI; using AcDream.App.UI;
using AcDream.App.UI.Layout; using AcDream.App.UI.Layout;
using AcDream.App.World;
using AcDream.Core.Items; using AcDream.Core.Items;
using AcDream.Core.Net; using AcDream.Core.Net;
using AcDream.Core.Net.Messages; using AcDream.Core.Net.Messages;
@ -210,8 +211,8 @@ public sealed class RadarSnapshotProviderTests
[unrelated] = Entity(unrelated, new Vector3(6f, 0f, 0f), Quaternion.Identity), [unrelated] = Entity(unrelated, new Vector3(6f, 0f, 0f), Quaternion.Identity),
}; };
var spawns = entities.Keys.ToDictionary(guid => guid, Spawn); var spawns = entities.Keys.ToDictionary(guid => guid, Spawn);
uint copiedCell = 0; var spatialQuery = new RecordingSpatialQuery(
int copiedRadius = -1; new KeyValuePair<uint, WorldEntity>(nearby, entities[nearby]));
var provider = new RadarSnapshotProvider( var provider = new RadarSnapshotProvider(
objects, objects,
() => entities, () => entities,
@ -222,20 +223,70 @@ public sealed class RadarSnapshotProviderTests
selectedGuid: () => null, selectedGuid: () => null,
coordinatesOnRadar: () => true, coordinatesOnRadar: () => true,
uiLocked: () => false, uiLocked: () => false,
copySpatialCandidates: (cell, radius, destination) => spatialQuery: () => spatialQuery);
{
copiedCell = cell;
copiedRadius = radius;
destination.Add(new KeyValuePair<uint, WorldEntity>(nearby, entities[nearby]));
});
UiRadarSnapshot snapshot = provider.BuildSnapshot(); UiRadarSnapshot snapshot = provider.BuildSnapshot();
Assert.Equal(0xA9B40001u, copiedCell); Assert.Equal(0xA9B40001u, spatialQuery.CopiedCell);
Assert.Equal(1, copiedRadius); Assert.Equal(1, spatialQuery.CopiedRadius);
Assert.Equal(nearby, Assert.Single(snapshot.Blips).ObjectId); Assert.Equal(nearby, Assert.Single(snapshot.Blips).ObjectId);
} }
[Fact]
public void BuildSnapshot_ResolvesSpatialOwnerAfterBootstrapReplacement()
{
const uint player = 50u;
const uint monster = 51u;
var objects = new ClientObjectTable();
objects.Ingest(Weenie(player, "Player", ItemType.Creature));
objects.Ingest(Weenie(monster, "Drudge", ItemType.Creature) with
{
RadarBehavior = (byte)RadarBehavior.ShowAlways,
});
var entities = new Dictionary<uint, WorldEntity>
{
[player] = Entity(player, Vector3.Zero, Quaternion.Identity),
[monster] = Entity(monster, new Vector3(5f, 0f, 0f), Quaternion.Identity),
};
var spawns = entities.Keys.ToDictionary(guid => guid, Spawn);
ILiveEntitySpatialQuery currentSpatialQuery = new RecordingSpatialQuery();
var provider = new RadarSnapshotProvider(
objects,
() => entities,
() => spawns,
playerGuid: () => player,
playerYawRadians: () => 0f,
playerCellId: () => 0xA9B40001u,
selectedGuid: () => null,
coordinatesOnRadar: () => true,
uiLocked: () => false,
spatialQuery: () => currentSpatialQuery);
Assert.Empty(provider.BuildSnapshot().Blips);
currentSpatialQuery = new RecordingSpatialQuery(
new KeyValuePair<uint, WorldEntity>(monster, entities[monster]));
Assert.Equal(monster, Assert.Single(provider.BuildSnapshot().Blips).ObjectId);
}
private sealed class RecordingSpatialQuery(
params KeyValuePair<uint, WorldEntity>[] candidates) : ILiveEntitySpatialQuery
{
public uint CopiedCell { get; private set; }
public int CopiedRadius { get; private set; } = -1;
public void CopyLiveEntitiesNearLandblock(
uint centerCellOrLandblockId,
int landblockRadius,
List<KeyValuePair<uint, WorldEntity>> destination)
{
CopiedCell = centerCellOrLandblockId;
CopiedRadius = landblockRadius;
destination.AddRange(candidates);
}
}
private static WorldEntity Entity(uint guid, Vector3 position, Quaternion rotation) => new() private static WorldEntity Entity(uint guid, Vector3 position, Quaternion rotation) => new()
{ {
Id = guid, Id = guid,