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

Swap inner and outer pixel tracing loop

This commit is contained in:
Jarrod Doyle 2024-12-09 12:28:52 +00:00
parent 27f8dab8fe
commit c2b69cda46
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
KeepersCompound.Lightmapper/LightMapper.cs
View File

@ -1,4 +1,3 @@
using System.Diagnostics;
using System.Numerics; using System.Numerics;
using KeepersCompound.LGS; using KeepersCompound.LGS;
using KeepersCompound.LGS.Database; using KeepersCompound.LGS.Database;
@ -393,53 +392,63 @@ public class LightMapper
} }
var planeMapper = new MathUtils.PlanePointMapper(plane.Normal, vs[0], vs[1]); var planeMapper = new MathUtils.PlanePointMapper(plane.Normal, vs[0], vs[1]);
var v2ds = planeMapper.MapTo2d(vs); var v2ds = planeMapper.MapTo2d(vs);
var (texU, texV) = renderPoly.TextureVectors;
var (offsets, weights) =
GetTraceOffsetsAndWeights(settings.MultiSampling, texU, texV, settings.MultiSamplingCenterWeight);
var (quadOffsets, quadWeights) = settings.MultiSampling == SoftnessMode.HighFourPoint
? (offsets, weights)
: GetTraceOffsetsAndWeights(SoftnessMode.HighFourPoint, texU, texV, settings.MultiSamplingCenterWeight);
foreach (var light in _lights) for (var y = 0; y < lightmap.Height; y++)
{ {
var layer = 0; for (var x = 0; x < lightmap.Width; x++)
// Check if plane normal is facing towards the light
// If it's not then we're never going to be (directly) lit by this
// light.
var centerDirection = renderPoly.Center - light.Position;
if (Vector3.Dot(plane.Normal, centerDirection) >= 0)
{ {
continue; var pos = topLeft;
} pos += x * 0.25f * renderPoly.TextureVectors.Item1;
pos += y * 0.25f * renderPoly.TextureVectors.Item2;
// If there aren't *any* points on the plane that are in range of the light
// then none of the lightmap points will be so we can discard. // TODO: Handle quad lit lights better. Right now we're computing two sets of points for every
// The more compact a map is the less effective this is // luxel. Maybe it's better to only compute if we encounter a quadlit light?
var planeDist = MathUtils.DistanceFromPlane(plane, light.Position); var tracePoints = GetTracePoints(pos, offsets, renderPoly.Center, planeMapper, v2ds);
if (planeDist > light.Radius) var quadTracePoints = settings.MultiSampling == SoftnessMode.HighFourPoint
{ ? tracePoints
continue; : GetTracePoints(pos, quadOffsets, renderPoly.Center, planeMapper, v2ds);
} foreach (var light in _lights)
// If the poly of the lightmap doesn't intersect the light radius then
// none of the lightmap points will so we can discard.
if (!MathUtils.Intersects(new MathUtils.Sphere(light.Position, light.Radius), aabb))
{
continue;
}
for (var y = 0; y < lightmap.Height; y++)
{
for (var x = 0; x < lightmap.Width; x++)
{ {
var pos = topLeft; var layer = 0;
pos += x * 0.25f * renderPoly.TextureVectors.Item1;
pos += y * 0.25f * renderPoly.TextureVectors.Item2;
var softnessMode = light.QuadLit ? SoftnessMode.HighFourPoint : settings.MultiSampling; // Check if plane normal is facing towards the light
var (texU, texV) = renderPoly.TextureVectors; // If it's not then we're never going to be (directly) lit by this
var (offsets, weights) = GetTraceOffsetsAndWeights(softnessMode, texU, texV,settings.MultiSamplingCenterWeight); // light.
var tracePoints = GetTracePoints(pos, offsets, renderPoly.Center, planeMapper, v2ds); var centerDirection = renderPoly.Center - light.Position;
if (Vector3.Dot(plane.Normal, centerDirection) >= 0)
var strength = 0f;
for (var idx = 0; idx < tracePoints.Length; idx++)
{ {
var point = tracePoints[idx]; continue;
}
// If there aren't *any* points on the plane that are in range of the light
// then none of the lightmap points will be so we can discard.
// The more compact a map is the less effective this is
var planeDist = MathUtils.DistanceFromPlane(plane, light.Position);
if (planeDist > light.Radius)
{
continue;
}
// If the poly of the lightmap doesn't intersect the light radius then
// none of the lightmap points will so we can discard.
if (!MathUtils.Intersects(new MathUtils.Sphere(light.Position, light.Radius), aabb))
{
continue;
}
var strength = 0f;
var targetPoints = light.QuadLit ? quadTracePoints : tracePoints;
var targetWeights = light.QuadLit ? quadWeights : weights;
for (var idx = 0; idx < targetPoints.Length; idx++)
{
var point = targetPoints[idx];
// If we're out of range there's no point casting a ray // If we're out of range there's no point casting a ray
// There's probably a better way to discard the entire lightmap // There's probably a better way to discard the entire lightmap
@ -451,7 +460,7 @@ public class LightMapper
if (TraceRay(light.Position, point)) if (TraceRay(light.Position, point))
{ {
strength += weights[idx] * light.StrengthAtPoint(point, plane); strength += targetWeights[idx] * light.StrengthAtPoint(point, plane);
} }
} }