Adds a bool flag at the WorldEntity data layer set by LandblockLoader from the source dat array: LandBlockInfo.Buildings → true (cottage walls, inn walls, smithy walls); LandBlockInfo.Objects → false (trees, lampposts, rocks, hitching posts). Retail anchor: CLandBlock::init_buildings reads a separate BuildInfo** array from objects (acclient.h:31893 num_buildings / buildings field; acclient_2013_pseudo_c.txt:313854 init_buildings entry). WorldBuilder preserves the same distinction via SceneryInstance.IsBuilding (StaticObjectRenderManager.cs:334). Today acdream's loader reads both arrays into the same WorldEntity pool with no tag, destroying the distinction (the comment at GameWindow.cs:5175 already acknowledges this gap for scenery suppression). This commit closes the gap. Render-time consumption arrives in R2 (EntitySet partition refactor). Two new LandblockLoader tests lock the tagging behavior. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
215 lines
6.8 KiB
C#
215 lines
6.8 KiB
C#
using System.Numerics;
|
|
using AcDream.Core.World;
|
|
using DatReaderWriter.DBObjs;
|
|
using DatReaderWriter.Types;
|
|
|
|
namespace AcDream.Core.Tests.World;
|
|
|
|
public class LandblockLoaderTests
|
|
{
|
|
private static LandBlock BuildFlatLandBlock()
|
|
{
|
|
var block = new LandBlock
|
|
{
|
|
HasObjects = true,
|
|
Terrain = new TerrainInfo[81],
|
|
Height = new byte[81],
|
|
};
|
|
for (int i = 0; i < 81; i++)
|
|
{
|
|
block.Terrain[i] = (ushort)0;
|
|
block.Height[i] = 0;
|
|
}
|
|
return block;
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_StabsAndBuildings_AreMappedToEntities()
|
|
{
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects =
|
|
{
|
|
new Stab
|
|
{
|
|
Id = 0x01000042u, // GfxObj id
|
|
Frame = new Frame
|
|
{
|
|
Origin = new Vector3(10, 20, 5),
|
|
Orientation = Quaternion.Identity,
|
|
},
|
|
},
|
|
new Stab
|
|
{
|
|
Id = 0x02000099u, // Setup id
|
|
Frame = new Frame
|
|
{
|
|
Origin = new Vector3(30, 40, 10),
|
|
Orientation = Quaternion.Identity,
|
|
},
|
|
},
|
|
},
|
|
Buildings =
|
|
{
|
|
new BuildingInfo
|
|
{
|
|
ModelId = 0x020000AAu, // Setup for a building
|
|
Frame = new Frame
|
|
{
|
|
Origin = new Vector3(50, 60, 0),
|
|
Orientation = Quaternion.Identity,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
Assert.Equal(3, entities.Count);
|
|
Assert.Contains(entities, e => e.SourceGfxObjOrSetupId == 0x01000042u && e.Position == new Vector3(10, 20, 5));
|
|
Assert.Contains(entities, e => e.SourceGfxObjOrSetupId == 0x02000099u && e.Position == new Vector3(30, 40, 10));
|
|
Assert.Contains(entities, e => e.SourceGfxObjOrSetupId == 0x020000AAu && e.Position == new Vector3(50, 60, 0));
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_AssignsMonotonicIds()
|
|
{
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects =
|
|
{
|
|
new Stab { Id = 0x01000001u, Frame = new Frame() },
|
|
new Stab { Id = 0x01000002u, Frame = new Frame() },
|
|
new Stab { Id = 0x01000003u, Frame = new Frame() },
|
|
},
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
var ids = entities.Select(e => e.Id).OrderBy(i => i).ToArray();
|
|
Assert.Equal(3, ids.Distinct().Count()); // all unique
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_UnsupportedIdType_IsSkipped()
|
|
{
|
|
// 0x03xxxxxx is neither GfxObj (0x01) nor Setup (0x02).
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects =
|
|
{
|
|
new Stab { Id = 0x01000001u, Frame = new Frame() },
|
|
new Stab { Id = 0x03000002u, Frame = new Frame() }, // skipped
|
|
new Stab { Id = 0x02000003u, Frame = new Frame() },
|
|
},
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
Assert.Equal(2, entities.Count);
|
|
Assert.DoesNotContain(entities, e => e.SourceGfxObjOrSetupId == 0x03000002u);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_Empty_ReturnsEmpty()
|
|
{
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(new LandBlockInfo());
|
|
Assert.Empty(entities);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_WithLandblockId_NamespacesIdsForGlobalUniqueness()
|
|
{
|
|
// Regression: cross-LB stab Id collision was the cause of visual
|
|
// glitches in Tier 1 cache (commit <THIS_COMMIT>) — buildings rendered
|
|
// up in the air with wrong textures because cache was keyed by
|
|
// entity.Id and stab Ids restarted at 1 per landblock.
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects =
|
|
{
|
|
new Stab { Id = 0x01000001u, Frame = new Frame() },
|
|
new Stab { Id = 0x01000002u, Frame = new Frame() },
|
|
},
|
|
};
|
|
|
|
var entitiesLbA = LandblockLoader.BuildEntitiesFromInfo(info, landblockId: 0xA9B40000u);
|
|
var entitiesLbB = LandblockLoader.BuildEntitiesFromInfo(info, landblockId: 0xA9B50000u);
|
|
|
|
// No two entities across LB A and LB B share the same Id.
|
|
var idsA = entitiesLbA.Select(e => e.Id).ToArray();
|
|
var idsB = entitiesLbB.Select(e => e.Id).ToArray();
|
|
Assert.Empty(idsA.Intersect(idsB));
|
|
|
|
// The namespace top byte is 0xC0 for stabs (distinct from 0x80 scenery,
|
|
// 0x40 interior, low-range live entities).
|
|
Assert.All(idsA, id => Assert.Equal(0xC0u, (id >> 24) & 0xFFu));
|
|
Assert.All(idsB, id => Assert.Equal(0xC0u, (id >> 24) & 0xFFu));
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_LegacyZeroLandblockId_StartsAtOne()
|
|
{
|
|
// Backward compat: existing callers (tests pre-fix) call without a
|
|
// landblockId and get the legacy "starts at 1" behavior.
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects = { new Stab { Id = 0x01000001u, Frame = new Frame() } },
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
Assert.Single(entities);
|
|
Assert.Equal(1u, entities[0].Id);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_TagsBuildingsWithIsBuildingShellTrue()
|
|
{
|
|
var info = new LandBlockInfo
|
|
{
|
|
Buildings =
|
|
{
|
|
new BuildingInfo
|
|
{
|
|
ModelId = 0x02000123u, // Setup id
|
|
Frame = new Frame
|
|
{
|
|
Origin = new Vector3(10f, 20f, 30f),
|
|
Orientation = Quaternion.Identity,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
Assert.Single(entities);
|
|
Assert.True(entities[0].IsBuildingShell);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildEntitiesFromInfo_TagsObjectsWithIsBuildingShellFalse()
|
|
{
|
|
var info = new LandBlockInfo
|
|
{
|
|
Objects =
|
|
{
|
|
new Stab
|
|
{
|
|
Id = 0x01000123u, // GfxObj id
|
|
Frame = new Frame
|
|
{
|
|
Origin = new Vector3(10f, 20f, 30f),
|
|
Orientation = Quaternion.Identity,
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var entities = LandblockLoader.BuildEntitiesFromInfo(info);
|
|
|
|
Assert.Single(entities);
|
|
Assert.False(entities[0].IsBuildingShell);
|
|
}
|
|
}
|