qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-11 07:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gl] Skip lights that are too far from the surface

Browse source 
Where too far is 1024 units as that is the maximum supported, or the
radius. The change to using unsigned for the distances meant the simple
checks missed the effective max dist going negative, thus leading to a
segfault.
This commit is contained in:
Bill Currie 2022-12-02 10:12:54 +09:00
parent 966ef949c5
commit baed4bb160
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/video/renderer/gl/gl_lightmap.c
View file

@ -119,6 +119,8 @@ R_AddDynamicLights_1 (const vec4f_t *transform, msurface_t *surf)
VectorSubtract (r_dlights[lnum].origin, entorigin, local); VectorSubtract (r_dlights[lnum].origin, entorigin, local);
dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
if (dist > min (1024, r_dlights[lnum].radius))
continue;
VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal, VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal,
impact); impact);
@ -150,7 +152,7 @@ R_AddDynamicLights_1 (const vec4f_t *transform, msurface_t *surf)
if (td < maxdist3) { // ensure part is visible on this line if (td < maxdist3) { // ensure part is visible on this line
maxdist2 = maxdist - td; maxdist2 = maxdist - td;
for (s = 0; s < smax; s++) { for (s = 0; s < smax; s++) {
if (sdtable[s] < maxdist2) { if (sdtable[s] + td < maxdist2) {
j = dlightdivtable[(sdtable[s] + td) >> 7]; j = dlightdivtable[(sdtable[s] + td) >> 7];
*bl++ += (grey * j) >> 7; *bl++ += (grey * j) >> 7;
} else } else
@ -189,6 +191,8 @@ R_AddDynamicLights_3 (const vec4f_t *transform, msurface_t *surf)
VectorSubtract (r_dlights[lnum].origin, entorigin, local); VectorSubtract (r_dlights[lnum].origin, entorigin, local);
dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
if (dist > min (1024, r_dlights[lnum].radius))
continue;
VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal, VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal,
impact); impact);
@ -221,7 +225,7 @@ R_AddDynamicLights_3 (const vec4f_t *transform, msurface_t *surf)
if (td < maxdist3) { // ensure part is visible on this line if (td < maxdist3) { // ensure part is visible on this line
maxdist2 = maxdist - td; maxdist2 = maxdist - td;
for (s = 0; s < smax; s++) { for (s = 0; s < smax; s++) {
if (sdtable[s] < maxdist2) { if (sdtable[s] + td < maxdist2) {
j = dlightdivtable[(sdtable[s] + td) >> 7]; j = dlightdivtable[(sdtable[s] + td) >> 7];
*bl++ += (red * j) >> 7; *bl++ += (red * j) >> 7;
*bl++ += (green * j) >> 7; *bl++ += (green * j) >> 7;