007e287309
The dungeon/house/outdoor lights read as hard-edged blown discs ("spotlights")
because our point/spot shader used `atten = 1.0` flat inside a hard `d < range`
cutoff. The mesh.frag comment claimed this was retail-faithful ("no attenuation
inside Range... the bubble-of-light look relies on crisp boundaries", citing
r13 10.2) — that was a misread and the literal cause of the symptom.
Verified against the decomp (not guessed): calc_point_light (0x0059c8b0, the
PER-VERTEX point-light path that lights static walls) scales each light's
contribution by (1 - dist/falloff_eff) — a LINEAR ramp that fades to exactly 0
at the edge, eliminating the hard disc. falloff_eff = Falloff * static_light_factor,
and static_light_factor = 1.3 (0x00820e24), NOT the 1.5 config_hardware_light
rangeAdjust (that 1.5 is the D3D-dynamic path for moving objects, a different
path). The Ghidra port (acclient.c:808639) is more garbled — BN pseudo-C is the
oracle here; the exact normalization factor + a half-Lambert wrap (0.5*dist+N*L)
are x87-obscured (same artifact class as GetPowerBarLevel) and left unported.
Changes:
- mesh_modern.frag + mesh.frag: replace flat atten with clamp(1 - d/range, 0, 1);
Range now carries falloff_eff so the ramp fades to 0 at the cutoff. Fix the
false "no attenuation / crisp bubble" comment in mesh.frag.
- LightInfoLoader: Range = Falloff * 1.3 (static_light_factor), was * 1.5.
- LightManager: correct the stale class doc comment (Tick is now nearest-8
allocation-free partial-select with NO viewer-range slack filter).
- divergence register: AP-16 updated (slack filter removed), AP-35 added
(per-pixel vs per-vertex Gouraud; dropped half-Lambert wrap + normalization).
- test: LightingHookSinkTests Range 8*1.3 = 10.4.
Build + 20 lighting tests green. Visual gate pending (game-wide lighting change:
dungeon torches, house candles, outdoor braziers).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
119 lines
4 KiB
C#
119 lines
4 KiB
C#
using System.Numerics;
|
||
using AcDream.Core.Lighting;
|
||
using DatReaderWriter.Types;
|
||
using Xunit;
|
||
|
||
namespace AcDream.Core.Tests.Lighting;
|
||
|
||
public sealed class LightingHookSinkTests
|
||
{
|
||
[Fact]
|
||
public void SetLightHook_FlipsOwnedLights()
|
||
{
|
||
var mgr = new LightManager();
|
||
var sink = new LightingHookSink(mgr);
|
||
|
||
var light1 = new LightSource { Kind = LightKind.Point, OwnerId = 42, IsLit = true };
|
||
var light2 = new LightSource { Kind = LightKind.Point, OwnerId = 42, IsLit = true };
|
||
var other = new LightSource { Kind = LightKind.Point, OwnerId = 99, IsLit = true };
|
||
sink.RegisterOwnedLight(light1);
|
||
sink.RegisterOwnedLight(light2);
|
||
sink.RegisterOwnedLight(other);
|
||
|
||
var hook = new SetLightHook { LightsOn = false };
|
||
sink.OnHook(entityId: 42, entityWorldPosition: Vector3.Zero, hook: hook);
|
||
|
||
Assert.False(light1.IsLit);
|
||
Assert.False(light2.IsLit);
|
||
Assert.True(other.IsLit); // owner 99 untouched
|
||
}
|
||
|
||
[Fact]
|
||
public void UnregisterOwner_RemovesAllOwnedLights()
|
||
{
|
||
var mgr = new LightManager();
|
||
var sink = new LightingHookSink(mgr);
|
||
|
||
sink.RegisterOwnedLight(new LightSource { OwnerId = 7 });
|
||
sink.RegisterOwnedLight(new LightSource { OwnerId = 7 });
|
||
Assert.Equal(2, mgr.RegisteredCount);
|
||
|
||
sink.UnregisterOwner(7);
|
||
Assert.Equal(0, mgr.RegisteredCount);
|
||
}
|
||
|
||
[Fact]
|
||
public void UnrelatedHook_Ignored()
|
||
{
|
||
var mgr = new LightManager();
|
||
var sink = new LightingHookSink(mgr);
|
||
var light = new LightSource { OwnerId = 1, IsLit = true };
|
||
sink.RegisterOwnedLight(light);
|
||
|
||
// Should not crash or change state for non-SetLight hooks.
|
||
var noise = new SoundHook();
|
||
sink.OnHook(entityId: 1, entityWorldPosition: Vector3.Zero, hook: noise);
|
||
|
||
Assert.True(light.IsLit);
|
||
}
|
||
}
|
||
|
||
public sealed class LightInfoLoaderTests
|
||
{
|
||
[Fact]
|
||
public void Load_EmptyLights_ReturnsEmpty()
|
||
{
|
||
var setup = new DatReaderWriter.DBObjs.Setup();
|
||
var result = LightInfoLoader.Load(setup, 1u, Vector3.Zero, Quaternion.Identity);
|
||
Assert.Empty(result);
|
||
}
|
||
|
||
[Fact]
|
||
public void Load_PointLight_ProducesCorrectSource()
|
||
{
|
||
var setup = new DatReaderWriter.DBObjs.Setup();
|
||
setup.Lights[0] = new LightInfo
|
||
{
|
||
ViewSpaceLocation = new Frame
|
||
{
|
||
Origin = new Vector3(1, 2, 3),
|
||
Orientation = Quaternion.Identity,
|
||
},
|
||
Color = new ColorARGB { Red = 255, Green = 200, Blue = 50, Alpha = 255 },
|
||
Intensity = 0.8f,
|
||
Falloff = 8f,
|
||
ConeAngle = 0f, // point
|
||
};
|
||
|
||
var result = LightInfoLoader.Load(setup, ownerId: 77,
|
||
entityPosition: new Vector3(100, 200, 300),
|
||
entityRotation: Quaternion.Identity);
|
||
|
||
Assert.Single(result);
|
||
var light = result[0];
|
||
Assert.Equal(LightKind.Point, light.Kind);
|
||
Assert.Equal(77u, light.OwnerId);
|
||
Assert.Equal(10.4f, light.Range, 3); // Falloff 8 × static_light_factor 1.3 (calc_point_light 0x00820e24)
|
||
Assert.Equal(0.8f, light.Intensity);
|
||
Assert.Equal(new Vector3(101, 202, 303), light.WorldPosition);
|
||
Assert.InRange(light.ColorLinear.X, 0.99f, 1.01f);
|
||
}
|
||
|
||
[Fact]
|
||
public void Load_NonZeroConeAngle_ProducesSpot()
|
||
{
|
||
var setup = new DatReaderWriter.DBObjs.Setup();
|
||
setup.Lights[0] = new LightInfo
|
||
{
|
||
ViewSpaceLocation = new Frame { Origin = Vector3.Zero, Orientation = Quaternion.Identity },
|
||
Color = new ColorARGB { Red = 255, Green = 255, Blue = 255, Alpha = 255 },
|
||
Intensity = 1f,
|
||
Falloff = 5f,
|
||
ConeAngle = 0.5f,
|
||
};
|
||
|
||
var result = LightInfoLoader.Load(setup, ownerId: 1, entityPosition: Vector3.Zero, entityRotation: Quaternion.Identity);
|
||
Assert.Equal(LightKind.Spot, result[0].Kind);
|
||
Assert.Equal(0.5f, result[0].ConeAngle);
|
||
}
|
||
}
|