Lands the working A8 indoor-rendering and streaming fixes accumulated this session. User has verified these visually to some degree (e.g. lifestone / translucent meshes confirmed fine under the FrontFace flip; bridge / wall / collision regressions confirmed fixed after travel); not every path has been exhaustively gated. The cellar-flap defect remains OPEN and will be solved the retail-faithful way via a dedicated brainstorm (see handoff docs). Rendering core (reviewed, high confidence): - EnvCellRenderer SSBO stride fix: upload packed Matrix4x4[] (64B) instead of the 80B CPU InstanceData struct the shader never expected — fixes the transform/texture "explosion" for any draw with >1 instance (cells that dedupe to a shared cellGeomId). Real root cause. - WB-style global FrontFace(CW) + per-batch CullMode carried through the MDI layout (GroupKey + BuildIndirectArrays + DrawIndirectRange split into same-cull runs with absolute uDrawIDOffset per run). - EntitySet partitioning (IndoorPass / OutdoorScenery / LiveDynamic) + WorldEntity.BuildingShellAnchorCellId so building shells scope to their dat-derived building cell instead of rendering everywhere. - RenderOutsideInAcdream (look into buildings from outside) + CollectVisiblePortalBuildings frustum cull of portal bounds. - Sky-when-inside-building + per-cell audit probe + GL-state probe. Streaming / perf (test-covered; not independently code-reviewed this session): - Near/far priority queues so near work wins over far; PromoteToNear carries full landblock + mesh data; LandblockEntriesWithoutAnimatedIndex avoids rebuilding the animated-lookup dict in the hot draw path. Fixes the bridge-not-appearing / missing-walls / broken-collision-after-travel regressions and improves post-transition FPS. Tooling + docs: - tools/A8CellAudit: offline dat cell/portal/building dumper (portals + buildings modes) — reproduces the cellar-flap investigation with no launch. - docs/research cellar-flap root-cause + option-2 handoff (the didInsideStencil double-duty finding + the WB-recursive design decision + brainstorm prompt), entity-taxonomy, replan, issue-78 visibility investigation. Diagnostics retained on purpose: ACDREAM_A8_DIAG_* gates, portal_stencil.vert provisional pos.w clamp, and the probe families are kept (env-var gated, zero cost when off) because the pending option-2 cellar-flap brainstorm needs them. Strip in the option-2 ship commit. Indoor branch stays behind ACDREAM_A8_INDOOR_BRANCH=1 (default off = pre-A8 visual). Build green; App tests + Core (streaming/dispatcher/loader) tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
200 lines
7.1 KiB
C#
200 lines
7.1 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Numerics;
|
|
using AcDream.App.Rendering.Wb;
|
|
using AcDream.Core.World;
|
|
|
|
namespace AcDream.Core.Tests.Rendering.Wb;
|
|
|
|
public sealed class LandblockSpawnAdapterTests
|
|
{
|
|
[Fact]
|
|
public void OnLandblockLoaded_RegistersIncrementForEachUniqueAtlasGfxObj()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
// Two procedural (ServerGuid=0) entities with different GfxObj ids.
|
|
var lb = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
MakeAtlasEntity(id: 2, gfxObjIds: new[] { 0x01000030u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(lb);
|
|
|
|
// Three unique ids registered.
|
|
Assert.Equal(3, captured.IncrementCalls.Count);
|
|
Assert.Contains(0x01000010ul, captured.IncrementCalls);
|
|
Assert.Contains(0x01000020ul, captured.IncrementCalls);
|
|
Assert.Contains(0x01000030ul, captured.IncrementCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockLoaded_DedupsSharedIdsAcrossEntities()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var lb = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
MakeAtlasEntity(id: 2, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(lb);
|
|
|
|
// Two unique ids despite two entities sharing both.
|
|
Assert.Equal(2, captured.IncrementCalls.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockLoaded_SkipsServerSpawnedEntities()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var lb = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u }),
|
|
// ServerGuid != 0 → per-instance tier → must NOT register.
|
|
MakePerInstanceEntity(id: 2, serverGuid: 0xCAFE0001u, gfxObjIds: new[] { 0x01000020u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(lb);
|
|
|
|
// Only the atlas-tier entity's GfxObj is registered.
|
|
Assert.Single(captured.IncrementCalls);
|
|
Assert.Contains(0x01000010ul, captured.IncrementCalls);
|
|
Assert.DoesNotContain(0x01000020ul, captured.IncrementCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockUnloaded_RegistersMatchingDecrements()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var lb = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(lb);
|
|
adapter.OnLandblockUnloaded(0x12340000u);
|
|
|
|
Assert.Equal(captured.IncrementCalls.OrderBy(x => x), captured.DecrementCalls.OrderBy(x => x));
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockUnloaded_UnknownLandblock_NoOps()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
adapter.OnLandblockUnloaded(0xDEADBEEFu);
|
|
|
|
Assert.Empty(captured.DecrementCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockLoaded_SameLandblockTwice_DedupesAtTheLandblockLevel()
|
|
{
|
|
// If a landblock load fires twice (e.g. a streaming-controller bug),
|
|
// we should not double-register ids that were already seen.
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var lb = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(lb);
|
|
adapter.OnLandblockLoaded(lb);
|
|
|
|
// One unique id, one increment — not two.
|
|
Assert.Single(captured.IncrementCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockLoaded_FarEmptyThenNearPromotion_RegistersPromotedIds()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var far = MakeLandblock(
|
|
landblockId: 0x12340000u,
|
|
entities: System.Array.Empty<WorldEntity>());
|
|
var promoted = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(far);
|
|
adapter.OnLandblockLoaded(promoted);
|
|
|
|
Assert.Equal(2, captured.IncrementCalls.Count);
|
|
Assert.Contains(0x01000010ul, captured.IncrementCalls);
|
|
Assert.Contains(0x01000020ul, captured.IncrementCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public void OnLandblockLoaded_PromotionWithPartiallyRegisteredIds_RegistersOnlyNewIds()
|
|
{
|
|
var captured = new CapturingAdapterMock();
|
|
var adapter = new LandblockSpawnAdapter(captured);
|
|
|
|
var initial = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u }),
|
|
});
|
|
var promoted = MakeLandblock(landblockId: 0x12340000u, entities: new[]
|
|
{
|
|
MakeAtlasEntity(id: 1, gfxObjIds: new[] { 0x01000010u, 0x01000020u }),
|
|
});
|
|
|
|
adapter.OnLandblockLoaded(initial);
|
|
adapter.OnLandblockLoaded(promoted);
|
|
|
|
Assert.Equal(new[] { 0x01000010ul, 0x01000020ul }, captured.IncrementCalls);
|
|
}
|
|
|
|
// ── Test helpers ──────────────────────────────────────────────────────
|
|
|
|
private sealed class CapturingAdapterMock : IWbMeshAdapter
|
|
{
|
|
public List<ulong> IncrementCalls { get; } = new();
|
|
public List<ulong> DecrementCalls { get; } = new();
|
|
public void IncrementRefCount(ulong id) => IncrementCalls.Add(id);
|
|
public void DecrementRefCount(ulong id) => DecrementCalls.Add(id);
|
|
}
|
|
|
|
private static LoadedLandblock MakeLandblock(uint landblockId, WorldEntity[] entities)
|
|
=> new LoadedLandblock(
|
|
LandblockId: landblockId,
|
|
Heightmap: new DatReaderWriter.DBObjs.LandBlock(), // empty default
|
|
Entities: entities);
|
|
|
|
private static WorldEntity MakeAtlasEntity(uint id, uint[] gfxObjIds)
|
|
=> MakeEntity(id, serverGuid: 0u, gfxObjIds);
|
|
|
|
private static WorldEntity MakePerInstanceEntity(uint id, uint serverGuid, uint[] gfxObjIds)
|
|
=> MakeEntity(id, serverGuid, gfxObjIds);
|
|
|
|
private static WorldEntity MakeEntity(uint id, uint serverGuid, uint[] gfxObjIds)
|
|
{
|
|
var meshRefs = gfxObjIds
|
|
.Select(g => new MeshRef(g, Matrix4x4.Identity))
|
|
.ToList();
|
|
return new WorldEntity
|
|
{
|
|
Id = id,
|
|
ServerGuid = serverGuid,
|
|
SourceGfxObjOrSetupId = gfxObjIds.FirstOrDefault(),
|
|
Position = Vector3.Zero,
|
|
Rotation = Quaternion.Identity,
|
|
MeshRefs = meshRefs,
|
|
};
|
|
}
|
|
}
|