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

light: rewrite part of WriteLightmaps for more readable code

This commit is contained in:
Eric Wasylishen 2015-05-31 12:27:40 -06:00
parent c39971bb94
commit e0d3f872ff
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
light/ltface.c
View File

@ -1241,7 +1241,6 @@ WriteLightmaps(bsp2_dface_t *face, const lightsurf_t *lightsurf,
if (lightmaps[mapnum].style == 255) if (lightmaps[mapnum].style == 255)
break; break;
sample = lightmaps[mapnum].samples;
for (t = 0; t <= lightsurf->texsize[1]; t++) { for (t = 0; t <= lightsurf->texsize[1]; t++) {
for (s = 0; s <= lightsurf->texsize[0]; s++) { for (s = 0; s <= lightsurf->texsize[0]; s++) {
@ -1250,11 +1249,14 @@ WriteLightmaps(bsp2_dface_t *face, const lightsurf_t *lightsurf,
VectorCopy(vec3_origin, color); VectorCopy(vec3_origin, color);
for (i = 0; i < oversample; i++) { for (i = 0; i < oversample; i++) {
for (j = 0; j < oversample; j++) { for (j = 0; j < oversample; j++) {
const int col = (s*oversample) + j;
const int row = (t*oversample) + i;
sample = lightmaps[mapnum].samples + (row * width) + col;
light += sample->light; light += sample->light;
VectorAdd(color, sample->color, color); VectorAdd(color, sample->color, color);
sample++;
} }
sample += width - oversample;
} }
light /= oversample * oversample; light /= oversample * oversample;
VectorScale(color, 1.0 / oversample / oversample, color); VectorScale(color, 1.0 / oversample / oversample, color);
@ -1278,10 +1280,7 @@ WriteLightmaps(bsp2_dface_t *face, const lightsurf_t *lightsurf,
*lit++ = color[0]; *lit++ = color[0];
*lit++ = color[1]; *lit++ = color[1];
*lit++ = color[2]; *lit++ = color[2];
sample -= width * oversample - oversample;
} }
sample += width * oversample - width;
} }
} }
} }