Compare commits
6 Commits
ec9c20423d
...
fafae43c56
Author | SHA1 | Date |
---|---|---|
|
fafae43c56 | |
|
db0b1f9c7a | |
|
b493c447c7 | |
|
77f69be219 | |
|
3040914afb | |
|
1f0b87f3de |
|
@ -482,8 +482,13 @@ public class LightMapper
|
|||
}
|
||||
});
|
||||
|
||||
var visibleCellMap = new List<int[]>(_lights.Count);
|
||||
var pvs = new PotentiallyVisibleSet(worldRep.Cells);
|
||||
Parallel.ForEach(lightCellMap, i =>
|
||||
{
|
||||
if (i != -1) pvs.ComputeVisibility(i);
|
||||
});
|
||||
|
||||
var visibleCellMap = new List<int[]>(_lights.Count);
|
||||
for (var i = 0; i < _lights.Count; i++)
|
||||
{
|
||||
var cellIdx = lightCellMap[i];
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
using System.Collections;
|
||||
using System.Numerics;
|
||||
using KeepersCompound.LGS.Database.Chunks;
|
||||
using Serilog;
|
||||
|
||||
namespace KeepersCompound.Lightmapper;
|
||||
|
||||
public class PotentiallyVisibleSet
|
||||
{
|
||||
private struct Node(List<int> edgeIndices)
|
||||
private readonly struct Node(List<int> edgeIndices)
|
||||
{
|
||||
public bool VisibilityComputed = false;
|
||||
public HashSet<int> VisibleNodes = [];
|
||||
public readonly HashSet<int> VisibleNodes = [];
|
||||
public readonly List<int> EdgeIndices = edgeIndices;
|
||||
}
|
||||
|
||||
|
@ -75,6 +75,7 @@ public class PotentiallyVisibleSet
|
|||
}
|
||||
|
||||
private readonly Node[] _graph;
|
||||
private readonly bool[] _computedMap;
|
||||
private readonly List<Edge> _edges;
|
||||
|
||||
private const float Epsilon = 0.1f;
|
||||
|
@ -98,14 +99,18 @@ public class PotentiallyVisibleSet
|
|||
public PotentiallyVisibleSet(WorldRep.Cell[] cells)
|
||||
{
|
||||
_graph = new Node[cells.Length];
|
||||
_edges = [];
|
||||
_computedMap = new bool[cells.Length];
|
||||
|
||||
var portalCount = 0;
|
||||
foreach (var cell in cells)
|
||||
for (var i = 0; i < cells.Length; i++)
|
||||
{
|
||||
portalCount += cell.PortalPolyCount;
|
||||
_computedMap[i] = false;
|
||||
portalCount += cells[i].PortalPolyCount;
|
||||
}
|
||||
|
||||
_edges = new List<Edge>(portalCount);
|
||||
Log.Information("Mission contains {PortalCount} portals.", portalCount);
|
||||
|
||||
for (var i = 0; i < cells.Length; i++)
|
||||
{
|
||||
var cell = cells[i];
|
||||
|
@ -139,7 +144,7 @@ public class PotentiallyVisibleSet
|
|||
vs.Add(cell.Vertices[cell.Indices[indicesOffset + vIdx]]);
|
||||
}
|
||||
|
||||
var edge = new Edge(portalCount, poly.Destination, new Poly(vs, cell.Planes[poly.PlaneId]));
|
||||
var edge = new Edge(cells.Length, poly.Destination, new Poly(vs, cell.Planes[poly.PlaneId]));
|
||||
edgeIndices.Add(_edges.Count);
|
||||
_edges.Add(edge);
|
||||
indicesOffset += poly.VertexCount;
|
||||
|
@ -148,23 +153,21 @@ public class PotentiallyVisibleSet
|
|||
_graph[i] = new Node(edgeIndices);
|
||||
}
|
||||
|
||||
Parallel.ForEach(_edges, ComputeEdgeMightSee);
|
||||
// Parallel.ForEach(_edges, ComputeEdgeMightSee);
|
||||
}
|
||||
|
||||
public int[] GetVisible(int cellIdx)
|
||||
{
|
||||
// TODO: Handle out of range indices
|
||||
var node = _graph[cellIdx];
|
||||
if (node.VisibilityComputed)
|
||||
if (_computedMap[cellIdx])
|
||||
{
|
||||
return [..node.VisibleNodes];
|
||||
}
|
||||
|
||||
var visibleCells = ComputeVisibility(cellIdx);
|
||||
node.VisibilityComputed = true;
|
||||
node.VisibleNodes = visibleCells;
|
||||
ComputeVisibility(cellIdx);
|
||||
_graph[cellIdx] = node;
|
||||
return [..visibleCells];
|
||||
return [.._graph[cellIdx].VisibleNodes];
|
||||
}
|
||||
|
||||
private void ComputeEdgeMightSee(Edge source)
|
||||
|
@ -236,30 +239,29 @@ public class PotentiallyVisibleSet
|
|||
}
|
||||
}
|
||||
|
||||
private HashSet<int> ComputeVisibility(int cellIdx)
|
||||
public void ComputeVisibility(int cellIdx)
|
||||
{
|
||||
if (cellIdx >= _graph.Length)
|
||||
{
|
||||
return [];
|
||||
return;
|
||||
}
|
||||
|
||||
// A cell can always see itself, so we'll add that now
|
||||
var visible = new HashSet<int>();
|
||||
visible.Add(cellIdx);
|
||||
|
||||
_graph[cellIdx].VisibleNodes.Add(cellIdx);
|
||||
foreach (var edgeIdx in _graph[cellIdx].EdgeIndices)
|
||||
{
|
||||
var edge = _edges[edgeIdx];
|
||||
ComputeEdgeMightSee(edge);
|
||||
for (var i = 0; i < edge.MightSee.Length; i++)
|
||||
{
|
||||
if (edge.MightSee[i])
|
||||
{
|
||||
visible.Add(i);
|
||||
_graph[cellIdx].VisibleNodes.Add(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return visible;
|
||||
_computedMap[cellIdx] = true;
|
||||
|
||||
// if (cellIdx >= _portalGraph.Length)
|
||||
// {
|
||||
|
|
Loading…
Reference in New Issue