feat(core): add LandblockLoader with Stab+Building → WorldEntity mapping
This commit is contained in:
parent
dbf913ebb4
commit
473a06c534
6 changed files with 221 additions and 0 deletions
77
src/AcDream.Core/World/LandblockLoader.cs
Normal file
77
src/AcDream.Core/World/LandblockLoader.cs
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
using DatReaderWriter;
|
||||||
|
using DatReaderWriter.DBObjs;
|
||||||
|
|
||||||
|
namespace AcDream.Core.World;
|
||||||
|
|
||||||
|
public static class LandblockLoader
|
||||||
|
{
|
||||||
|
private const uint GfxObjMask = 0x01000000u;
|
||||||
|
private const uint SetupMask = 0x02000000u;
|
||||||
|
private const uint TypeMask = 0xFF000000u;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Load a single landblock (heightmap + static objects) from the dats.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Null if the landblock is missing from the cell dat.</returns>
|
||||||
|
public static LoadedLandblock? Load(DatCollection dats, uint landblockId)
|
||||||
|
{
|
||||||
|
var block = dats.Get<LandBlock>(landblockId);
|
||||||
|
if (block is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var info = dats.Get<LandBlockInfo>((landblockId & 0xFFFF0000u) | 0xFFFEu);
|
||||||
|
var entities = info is null
|
||||||
|
? Array.Empty<WorldEntity>()
|
||||||
|
: BuildEntitiesFromInfo(info);
|
||||||
|
|
||||||
|
return new LoadedLandblock(landblockId, block, entities);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Pure mapping from a parsed LandBlockInfo to a list of WorldEntity.
|
||||||
|
/// Each Stab and BuildingInfo becomes one entity. Unsupported id types
|
||||||
|
/// (neither GfxObj 0x01xxxxxx nor Setup 0x02xxxxxx) are silently skipped.
|
||||||
|
/// MeshRefs is left empty at this stage — Task 5 populates it.
|
||||||
|
/// </summary>
|
||||||
|
public static IReadOnlyList<WorldEntity> BuildEntitiesFromInfo(LandBlockInfo info)
|
||||||
|
{
|
||||||
|
var result = new List<WorldEntity>(info.Objects.Count + info.Buildings.Count);
|
||||||
|
uint nextId = 1;
|
||||||
|
|
||||||
|
foreach (var stab in info.Objects)
|
||||||
|
{
|
||||||
|
if (!IsSupported(stab.Id))
|
||||||
|
continue;
|
||||||
|
result.Add(new WorldEntity
|
||||||
|
{
|
||||||
|
Id = nextId++,
|
||||||
|
SourceGfxObjOrSetupId = stab.Id,
|
||||||
|
Position = stab.Frame.Origin,
|
||||||
|
Rotation = stab.Frame.Orientation,
|
||||||
|
MeshRefs = Array.Empty<MeshRef>(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var building in info.Buildings)
|
||||||
|
{
|
||||||
|
if (!IsSupported(building.ModelId))
|
||||||
|
continue;
|
||||||
|
result.Add(new WorldEntity
|
||||||
|
{
|
||||||
|
Id = nextId++,
|
||||||
|
SourceGfxObjOrSetupId = building.ModelId,
|
||||||
|
Position = building.Frame.Origin,
|
||||||
|
Rotation = building.Frame.Orientation,
|
||||||
|
MeshRefs = Array.Empty<MeshRef>(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsSupported(uint id)
|
||||||
|
{
|
||||||
|
var type = id & TypeMask;
|
||||||
|
return type == GfxObjMask || type == SetupMask;
|
||||||
|
}
|
||||||
|
}
|
||||||
8
src/AcDream.Core/World/LoadedLandblock.cs
Normal file
8
src/AcDream.Core/World/LoadedLandblock.cs
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
using DatReaderWriter.DBObjs;
|
||||||
|
|
||||||
|
namespace AcDream.Core.World;
|
||||||
|
|
||||||
|
public sealed record LoadedLandblock(
|
||||||
|
uint LandblockId,
|
||||||
|
LandBlock Heightmap,
|
||||||
|
IReadOnlyList<WorldEntity> Entities);
|
||||||
5
src/AcDream.Core/World/MeshRef.cs
Normal file
5
src/AcDream.Core/World/MeshRef.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
|
namespace AcDream.Core.World;
|
||||||
|
|
||||||
|
public readonly record struct MeshRef(uint GfxObjId, Matrix4x4 PartTransform);
|
||||||
12
src/AcDream.Core/World/WorldEntity.cs
Normal file
12
src/AcDream.Core/World/WorldEntity.cs
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
|
namespace AcDream.Core.World;
|
||||||
|
|
||||||
|
public sealed class WorldEntity
|
||||||
|
{
|
||||||
|
public required uint Id { get; init; }
|
||||||
|
public required uint SourceGfxObjOrSetupId { get; init; }
|
||||||
|
public required Vector3 Position { get; init; }
|
||||||
|
public required Quaternion Rotation { get; init; }
|
||||||
|
public required IReadOnlyList<MeshRef> MeshRefs { get; init; }
|
||||||
|
}
|
||||||
119
tests/AcDream.Core.Tests/World/LandblockLoaderTests.cs
Normal file
119
tests/AcDream.Core.Tests/World/LandblockLoaderTests.cs
Normal file
|
|
@ -0,0 +1,119 @@
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue