qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-02-22 03:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rearranging things a little for colored lights.

Browse source
This commit is contained in:
Joseph Carter 2000-04-13 01:34:01 +00:00
parent 51e1267f45
commit 9abadd0a12
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/cl_tent.c
View file

@ -271,9 +271,9 @@ CL_ParseTEnt (void)
dl->radius = 350; dl->radius = 350;
dl->die = cl.time + 0.5; dl->die = cl.time + 0.5;
dl->decay = 300; dl->decay = 300;
dl->color[0] = 0.2; dl->color[0] = 0.86;
dl->color[1] = 0.1; dl->color[1] = 0.31;
dl->color[2] = 0.05; dl->color[2] = 0.24;
dl->color[3] = 0.7; dl->color[3] = 0.7;
// sound // sound

16
common/gl_rsurf.c
View file

@ -205,9 +205,9 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
{ {
scale = d_lightstylevalue[surf->styles[maps]]; scale = d_lightstylevalue[surf->styles[maps]];
surf->cached_light[maps] = scale; // 8.8 fraction surf->cached_light[maps] = scale; // 8.8 fraction
for (i=0, j=0 ; i<size ; i++)
{
if (bspver == CBSPVERSION) if (bspver == CBSPVERSION)
{
for (i=0, j=0 ; i<size ; i++)
{ {
cblocklights[0][i] += cblocklights[0][i] +=
lightmap[j++] * scale; lightmap[j++] * scale;
@ -215,17 +215,24 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
lightmap[j++] * scale; lightmap[j++] * scale;
cblocklights[2][i] += cblocklights[2][i] +=
lightmap[j++] * scale; lightmap[j++] * scale;
blocklights[i] +=
lightmap[j++] * scale;
}
lightmap += (size<<2);
} else { } else {
for (i=0 ; i<size ; i++)
{
cblocklights[0][i] += cblocklights[0][i] +=
lightmap[i] * scale; lightmap[i] * scale;
cblocklights[1][i] += cblocklights[1][i] +=
lightmap[i] * scale; lightmap[i] * scale;
cblocklights[2][i] += cblocklights[2][i] +=
lightmap[i] * scale; lightmap[i] * scale;
blocklights[i] +=
lightmap[i] * scale;
} }
blocklights[i] += lightmap[j++] * scale; lightmap += size;
} }
lightmap += size; // skip to next lightmap
} }
// add all the dynamic lights // add all the dynamic lights
@ -237,6 +244,7 @@ store:
switch (gl_lightmap_format) switch (gl_lightmap_format)
{ {
case GL_RGBA: case GL_RGBA:
case GL_RGBA4:
stride -= (smax<<2); stride -= (smax<<2);
rbl = cblocklights[0]; rbl = cblocklights[0];
gbl = cblocklights[1]; gbl = cblocklights[1];