Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert light collector changes which caused static mesh lights to break

Browse source
This commit is contained in:
Lwmte 2024-12-26 10:52:13 +01:00
parent e888b9d7e1
commit a9af06e2fa
1 changed files with 91 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

142
TombEngine/Renderer/RendererFrame.cpp
View file

@ -382,7 +382,7 @@ namespace TEN::Renderer
void Renderer::CollectItems(short roomNumber, RenderView& renderView)
{
if (_rooms.size() < roomNumber)
if (_rooms.size() <= roomNumber)
return;
auto& rendererRoom = _rooms[roomNumber];
@ -484,7 +484,7 @@ namespace TEN::Renderer
void Renderer::CollectStatics(short roomNumber, RenderView& renderView)
{
if (_rooms.size() < roomNumber)
if (_rooms.size() <= roomNumber)
return;
auto& room = _rooms[roomNumber];
@ -540,7 +540,7 @@ namespace TEN::Renderer
}
else
{
// Collecy only dynamic lights and use cached lights from rooms
// Collect only dynamic lights and use cached lights from rooms
CollectLights(mesh->Pose.Position.ToVector3(), 1024, room.RoomNumber, NO_VALUE, false, true, &mesh->CachedRoomLights, &lights);
}
}
@ -558,7 +558,7 @@ namespace TEN::Renderer
}
}
void Renderer::CollectLights(const Vector3& pos, float radius, int roomNumber, int prevRoomNumber, bool prioritizeShadowLight, bool useCachedRoomLights, std::vector<RendererLightNode>* roomsLights, std::vector<RendererLight*>* outputLights)
void Renderer::CollectLights(const Vector3& position, float radius, int roomNumber, int prevRoomNumber, bool prioritizeShadowLight, bool useCachedRoomLights, std::vector<RendererLightNode>* roomsLights, std::vector<RendererLight*>* outputLights)
{
if (_rooms.size() <= roomNumber)
return;
@ -566,45 +566,31 @@ namespace TEN::Renderer
// Now collect lights from dynamic list and from rooms
std::vector<RendererLightNode> tempLights;
tempLights.reserve(MAX_LIGHTS_DRAW);
auto& room = _rooms[roomNumber];
RendererLight* brightestLight = nullptr;
float highestIntensity = 0.0f;
auto calculateIntensity = [](float distSqr, const RendererLight& light, float radius) -> std::optional<float>
{
if (distSqr >= SQUARE(BLOCK(20)) || distSqr > SQUARE(light.Out + radius))
return std::nullopt; // Light is too far.
float distance = sqrt(distSqr);
float attenuation = 1.0f - distance / light.Out;
return attenuation * light.Intensity * light.Luma;
};
auto processLight = [&](RendererLight& light, float distSqr, int dynamicFlag)
{
float distance = sqrt(distSqr);
float intensity = calculateIntensity(distSqr, light, radius).value_or(0.0f);
if (intensity <= EPSILON)
return;
if ((light.Type == LightType::Point || light.Type == LightType::Spot) &&
light.CastShadows && prioritizeShadowLight && intensity >= highestIntensity)
{
highestIntensity = intensity;
brightestLight = &light;
}
tempLights.push_back({ &light, intensity, distance, dynamicFlag });
};
float brightest = 0.0f;
// Dynamic lights have the priority
for (auto& light : _dynamicLights[_dynamicLightList])
{
float distSqr = Vector3::DistanceSquared(pos, light.Position);
processLight(light, distSqr, 1);
float distSqr = Vector3::DistanceSquared(position, light.Position);
// Collect only lights nearer than 20 sectors
if (distSqr >= SQUARE(BLOCK(20)))
continue;
// Check the out radius
if (distSqr > SQUARE(light.Out + radius))
continue;
float distance = sqrt(distSqr);
float attenuation = 1.0f - distance / light.Out;
float intensity = attenuation * light.Intensity * light.Luma;
RendererLightNode node = { &light, intensity, distance, 1 };
tempLights.push_back(node);
}
if (!useCachedRoomLights)
@ -613,8 +599,15 @@ namespace TEN::Renderer
for (int roomToCheck : room.Neighbors)
{
auto& currentRoom = _rooms[roomToCheck];
for (auto& light : currentRoom.Lights)
int lightCount = (int)currentRoom.Lights.size();
for (int j = 0; j < lightCount; j++)
{
auto& light = currentRoom.Lights[j];
float intensity = 0;
float dist = 0;
// Check only lights different from sun.
if (light.Type == LightType::Sun)
{
@ -623,25 +616,72 @@ namespace TEN::Renderer
continue;
// Sun is added without distance checks.
float intensity = light.Intensity * Luma(light.Color);
RendererLightNode node = { &light, intensity, 0.0f, 0 };
tempLights.push_back(node);
if (roomsLights != nullptr)
roomsLights->push_back(node);
intensity = light.Intensity * Luma(light.Color);
}
else if (light.Type == LightType::Point ||
light.Type == LightType::Shadow ||
light.Type == LightType::Spot)
else if (light.Type == LightType::Point || light.Type == LightType::Shadow)
{
float distSqr = Vector3::DistanceSquared(pos, light.Position);
processLight(light, distSqr, 0);
float distSqr = Vector3::DistanceSquared(position, light.Position);
// Collect only lights nearer than 20 blocks.
if (distSqr >= SQUARE(BLOCK(20)))
continue;
// Check out radius.
if (distSqr > SQUARE(light.Out + radius))
continue;
dist = sqrt(distSqr);
float attenuation = 1.0f - dist / light.Out;
intensity = attenuation * light.Intensity * Luma(light.Color);
// If collecting shadows, try collecting shadow-casting light.
if (light.CastShadows && prioritizeShadowLight && light.Type == LightType::Point)
{
if (intensity >= brightest)
{
brightest = intensity;
brightestLight = &light;
}
}
}
else if (light.Type == LightType::Spot)
{
float distSqr = Vector3::DistanceSquared(position, light.Position);
// Collect only lights nearer than 20 blocks.
if (distSqr >= SQUARE(BLOCK(20)))
continue;
// Check range.
if (distSqr > SQUARE(light.Out + radius))
continue;
dist = sqrt(distSqr);
float attenuation = 1.0f - dist / light.Out;
intensity = attenuation * light.Intensity * light.Luma;
// If shadow pointer provided, try collecting shadow-casting light.
if (light.CastShadows && prioritizeShadowLight)
{
if (intensity >= brightest)
{
brightest = intensity;
brightestLight = &light;
}
}
}
else
{
// Invalid light type.
continue;
}
RendererLightNode node = { &light, intensity, dist, 0 };
if (roomsLights != nullptr)
roomsLights->push_back(node);
tempLights.push_back(node);
}
}
}
@ -663,7 +703,7 @@ namespace TEN::Renderer
// Put actual lights in provided vector.
outputLights->clear();
// Add brightest light, if collecting shadow light is specified, even if it's far in range.
// Add brightest ligh, if collecting shadow light is specified, even if it's far in range.
if (prioritizeShadowLight && brightestLight)
outputLights->push_back(brightestLight);
@ -746,7 +786,7 @@ namespace TEN::Renderer
void Renderer::CollectLightsForRoom(short roomNumber, RenderView &renderView)
{
if (_rooms.size() < roomNumber)
if (_rooms.size() <= roomNumber)
return;
RendererRoom& room = _rooms[roomNumber];
@ -788,7 +828,7 @@ namespace TEN::Renderer
void Renderer::CollectEffects(short roomNumber)
{
if (_rooms.size() < roomNumber)
if (_rooms.size() <= roomNumber)
return;
RendererRoom& room = _rooms[roomNumber];