KeepersCompound
/
ThiefLightmapper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include door blocking in the cast mesh

This commit is contained in:
Jarrod Doyle 2024-12-09 10:09:13 +00:00
parent adf61c0f6f
commit 5538a0e3ea
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
KeepersCompound.Lightmapper/LightMapper.cs
View File

@ -129,6 +129,7 @@ public class LightMapper
private void BuildLightList() private void BuildLightList()
{ {
// TODO: Doors aren't blocking lights, seems to be lighttable related
_lights.Clear(); _lights.Clear();
// Get the chunks we need // Get the chunks we need

45
KeepersCompound.Lightmapper/MeshBuilder.cs
View File

@ -5,11 +5,13 @@ using KeepersCompound.LGS.Database.Chunks;
namespace KeepersCompound.Lightmapper; namespace KeepersCompound.Lightmapper;
// TODO: Rename to CastSurfaceType?
public enum SurfaceType public enum SurfaceType
{ {
Solid, Solid,
Sky, Sky,
Water, Water,
Air,
} }
public class Mesh(int triangleCount, List<Vector3> vertices, List<int> indices, List<SurfaceType> triangleSurfaceMap) public class Mesh(int triangleCount, List<Vector3> vertices, List<int> indices, List<SurfaceType> triangleSurfaceMap)
@ -35,17 +37,36 @@ public class MeshBuilder
var numPolys = cell.PolyCount; var numPolys = cell.PolyCount;
var numRenderPolys = cell.RenderPolyCount; var numRenderPolys = cell.RenderPolyCount;
var numPortalPolys = cell.PortalPolyCount; var numPortalPolys = cell.PortalPolyCount;
var solidPolys = numPolys - numPortalPolys;
// There's nothing to render var cellIdxOffset = 0;
if (numRenderPolys == 0 || numPortalPolys >= numPolys) for (var polyIdx = 0; polyIdx < numPolys; polyIdx++)
{
// There's 3 types of poly that we need to include in the mesh:
// - Terrain
// - Water surfaces
// - Door vision blockers
//
// Door vision blockers are the interesting one. They're not RenderPolys at all, and we only include
// them in the mesh if the cell only has two of them (otherwise the door is in the middle of the air)
SurfaceType primType;
if (polyIdx < solidPolys)
{
primType = cell.RenderPolys[polyIdx].TextureId == 249 ? SurfaceType.Sky : SurfaceType.Solid;
}
else if (polyIdx < numRenderPolys)
{
primType = SurfaceType.Water;
}
else if (cell is { Flags: 24, PortalPolyCount: 2 }) // TODO: Work out what these flags are!!
{
primType = SurfaceType.Solid;
}
else
{ {
continue; continue;
} }
var solidPolys = numPolys - numPortalPolys;
var cellIdxOffset = 0;
for (var polyIdx = 0; polyIdx < numRenderPolys; polyIdx++)
{
var poly = cell.Polys[polyIdx]; var poly = cell.Polys[polyIdx];
polyVertices.Clear(); polyVertices.Clear();
polyVertices.EnsureCapacity(poly.VertexCount); polyVertices.EnsureCapacity(poly.VertexCount);
@ -54,18 +75,6 @@ public class MeshBuilder
polyVertices.Add(cell.Vertices[cell.Indices[cellIdxOffset + i]]); polyVertices.Add(cell.Vertices[cell.Indices[cellIdxOffset + i]]);
} }
// We need to know what type of surface this poly is so we can map Embree primitive IDs to surface
// types
var renderPoly = cell.RenderPolys[polyIdx];
var primType = SurfaceType.Solid;
if (renderPoly.TextureId == 249)
{
primType = SurfaceType.Sky;
} else if (polyIdx >= solidPolys)
{
primType = SurfaceType.Water;
}
AddPolygon(polyVertices, primType); AddPolygon(polyVertices, primType);
cellIdxOffset += poly.VertexCount; cellIdxOffset += poly.VertexCount;
} }