olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: nudge lightgrid points if stuck in solid

This commit is contained in:
Eric Wasylishen 2023-02-07 00:56:27 -07:00
parent aa831d9ac3
commit 96c7658b80
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/light/entities.hh
View File

@ -149,3 +149,4 @@ aabb3d EstimateVisibleBoundsAtPoint(const qvec3d &point);
bool EntDict_CheckNoEmptyValues(const mbsp_t *bsp, const entdict_t &entdict);
entdict_t &WorldEnt();
std::tuple<qvec3d, bool> FixLightOnFace(const mbsp_t *bsp, const qvec3d &point, bool warn = true, float max_dist = 2.f);

19
light/entities.cc
View File

@ -1018,11 +1018,11 @@ void LoadEntities(const settings::worldspawn_keys &cfg, const mbsp_t *bsp)
logging::print("{} entities read, {} are lights.\n", entdicts.size(), all_lights.size());
}
static qvec3d FixLightOnFace(const mbsp_t *bsp, const qvec3d &point)
std::tuple<qvec3d, bool> FixLightOnFace(const mbsp_t *bsp, const qvec3d &point, bool warn, float max_dist)
{
// FIXME: Check all shadow casters
if (!Light_PointInWorld(bsp, point)) {
return point;
return {point, true};
}
for (int i = 0; i < 6; i++) {
@ -1030,24 +1030,27 @@ static qvec3d FixLightOnFace(const mbsp_t *bsp, const qvec3d &point)
int axis = i / 2;
bool add = i % 2;
testpoint[axis] += (add ? 2 : -2); // sample points are 1 unit off faces. so nudge by 2 units, so the lights are
// above the sample points
// sample points are 1 unit off faces. so nudge by 2 units, so the lights are
// above the sample points
testpoint[axis] += (add ? max_dist : -max_dist);
// FIXME: Check all shadow casters
if (!Light_PointInWorld(bsp, testpoint)) {
return testpoint;
return {testpoint, true};
}
}
logging::print("WARNING: couldn't nudge light out of solid at {}\n", point);
return point;
if (warn)
logging::print("WARNING: couldn't nudge light out of solid at {}\n", point);
return {point, false};
}
void FixLightsOnFaces(const mbsp_t *bsp)
{
for (auto &entity : all_lights) {
if (entity->light.value() != 0 && !entity->nonudge.value()) {
entity->origin.setValue(FixLightOnFace(bsp, entity->origin.value()), settings::source::MAP);
auto [fixed_pos, success] = FixLightOnFace(bsp, entity->origin.value());
entity->origin.setValue(fixed_pos, settings::source::MAP);
}
}
}

9
light/light.cc
View File

@ -1079,6 +1079,15 @@ static void LightGrid(bspdata_t *bspdata)
qvec3d world_point = grid_mins + (qvec3d{x,y,z} * light_options.lightgrid_dist.value());
bool occluded = Light_PointInWorld(&bsp, world_point);
if (occluded) {
// search for a nearby point
auto [fixed_pos, success] = FixLightOnFace(&bsp, world_point, false, 2.0f);
if (success) {
occluded = false;
world_point = fixed_pos;
}
}
lightgrid_samples_t samples;
if (!occluded)