yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-22 09:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

renders: split R_BuildLightMap to two function

Browse source
This commit is contained in:
Denis Pauk 2024-03-24 18:04:30 +02:00
parent d02cfe40ac
commit 611259e0a1
2 changed files with 96 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

172
src/client/refresh/files/light.c
View file

@ -484,6 +484,94 @@ R_GetTemporaryLMBuffer(size_t size)
return s_bufferlights;
}
static void
R_StoreLightMap(byte *dest, int stride, const byte *destmax, int smax, int tmax)
{
float *bl;
int i;
/* put into texture format */
stride -= (smax << 2);
bl = s_blocklights;
if ((dest + (stride * (tmax - 1)) + smax * LIGHTMAP_BYTES) > destmax)
{
Com_Error(ERR_DROP, "%s destination too small for lightmap %d > %ld",
__func__, (stride * (tmax - 1)) + smax * LIGHTMAP_BYTES, destmax - dest);
}
for (i = 0; i < tmax; i++, dest += stride)
{
int j;
for (j = 0; j < smax; j++)
{
int r, g, b, a, max;
r = Q_ftol(bl[0]);
g = Q_ftol(bl[1]);
b = Q_ftol(bl[2]);
/* catch negative lights */
if (r < 0)
{
r = 0;
}
if (g < 0)
{
g = 0;
}
if (b < 0)
{
b = 0;
}
/* determine the brightest of the three color components */
if (r > g)
{
max = r;
}
else
{
max = g;
}
if (b > max)
{
max = b;
}
/* alpha is ONLY used for the mono lightmap case. For this
reason we set it to the brightest of the color components
so that things don't get too dim. */
a = max;
/* rescale all the color components if the
intensity of the greatest channel exceeds
1.0 */
if (max > 255)
{
float t = 255.0F / max;
r = r * t;
g = g * t;
b = b * t;
a = a * t;
}
dest[0] = r;
dest[1] = g;
dest[2] = b;
dest[3] = a;
bl += 3;
dest += LIGHTMAP_BYTES;
}
}
}
/*
* Combine and scale multiple lightmaps into the floating format in blocklights
*/
@ -492,8 +580,7 @@ R_BuildLightMap(const msurface_t *surf, byte *dest, int stride, const byte *dest
const refdef_t *r_newrefdef, float modulate, int r_framecount)
{
int smax, tmax;
int r, g, b, a, max;
int i, j, size, numlightmaps;
int i, size, numlightmaps;
byte *lightmap;
float scale[4];
float *bl;
@ -523,7 +610,8 @@ R_BuildLightMap(const msurface_t *surf, byte *dest, int stride, const byte *dest
s_blocklights[i] = 255;
}
goto store;
R_StoreLightMap(dest, stride, destmax, smax, tmax);
return;
}
/* count the # of maps */
@ -620,83 +708,7 @@ R_BuildLightMap(const msurface_t *surf, byte *dest, int stride, const byte *dest
R_AddDynamicLights(surf, r_newrefdef, s_blocklights, s_blocklights_max);
}
store:
/* put into texture format */
stride -= (smax << 2);
bl = s_blocklights;
if ((dest + (stride * (tmax - 1)) + smax * LIGHTMAP_BYTES) > destmax)
{
Com_Error(ERR_DROP, "%s destination too small for lightmap %d > %ld",
__func__, (stride * (tmax - 1)) + smax * LIGHTMAP_BYTES, destmax - dest);
}
for (i = 0; i < tmax; i++, dest += stride)
{
for (j = 0; j < smax; j++)
{
r = Q_ftol(bl[0]);
g = Q_ftol(bl[1]);
b = Q_ftol(bl[2]);
/* catch negative lights */
if (r < 0)
{
r = 0;
}
if (g < 0)
{
g = 0;
}
if (b < 0)
{
b = 0;
}
/* determine the brightest of the three color components */
if (r > g)
{
max = r;
}
else
{
max = g;
}
if (b > max)
{
max = b;
}
/* alpha is ONLY used for the mono lightmap case. For this
reason we set it to the brightest of the color components
so that things don't get too dim. */
a = max;
/* rescale all the color components if the
intensity of the greatest channel exceeds
1.0 */
if (max > 255)
{
float t = 255.0F / max;
r = r * t;
g = g * t;
b = b * t;
a = a * t;
}
dest[0] = r;
dest[1] = g;
dest[2] = b;
dest[3] = a;
bl += 3;
dest += LIGHTMAP_BYTES;
}
}
R_StoreLightMap(dest, stride, destmax, smax, tmax);
}
static void

10
src/client/refresh/soft/sw_light.c
View file

@ -50,25 +50,23 @@ RI_PushDlights(const model_t *model)
}
static void
RI_AddDynamicLights(drawsurf_t* drawsurf)
RI_AddDynamicLights(const msurface_t *surf)
{
/* TODO: Covert to reuse with shared files/light */
msurface_t *surf;
int lnum;
int smax, tmax;
mtexinfo_t *tex;
surf = drawsurf->surf;
smax = (surf->extents[0] >> surf->lmshift) + 1;
tmax = (surf->extents[1] >> surf->lmshift) + 1;
tex = surf->texinfo;
if (blocklight_max <= blocklights + smax*tmax*3)
{
r_outoflights = true;
return;
}
tex = surf->texinfo;
for (lnum=0; lnum < r_newrefdef.num_dlights; lnum++)
{
vec3_t impact, local, color;
@ -299,7 +297,7 @@ RI_BuildLightMap(drawsurf_t* drawsurf)
// add all the dynamic lights
if (surf->dlightframe == r_framecount)
{
RI_AddDynamicLights (drawsurf);
RI_AddDynamicLights(drawsurf->surf);
}
// bound, invert, and shift