ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[tools/quake3/q3map2/light{,maps}_ydnar.c] Fix float-to-int conversion by preventing NaN values

This commit is contained in:
Thomas Köppe 2016-08-14 12:13:18 +01:00
parent 6409de3029
commit f463907e46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/quake3/q3map2/light_ydnar.c
View File

@ -2033,7 +2033,7 @@ void IlluminateRawLightmap( int rawLightmapNum ){
} }
/* set luxel filter radius */ /* set luxel filter radius */
luxelFilterRadius = superSample * filterRadius / lm->sampleSize; luxelFilterRadius = lm->sampleSize != 0 ? superSample * filterRadius / lm->sampleSize : 0;
if ( luxelFilterRadius == 0 && ( filterRadius > 0.0f || filter ) ) { if ( luxelFilterRadius == 0 && ( filterRadius > 0.0f || filter ) ) {
luxelFilterRadius = 1; luxelFilterRadius = 1;
} }

4
tools/quake3/q3map2/lightmaps_ydnar.c
View File

@ -518,7 +518,7 @@ qboolean AddPatchToRawLightmap( int num, rawLightmap_t *lm ){
length = 0; length = 0;
for ( x = 0; x < ( mesh->width - 1 ); x++ ) for ( x = 0; x < ( mesh->width - 1 ); x++ )
length += widthTable[ x ]; length += widthTable[ x ];
lm->w = ceil( length / lm->sampleSize ) + 1; lm->w = lm->sampleSize != 0 ? ceil( length / lm->sampleSize ) + 1 : 0;
if ( lm->w < ds->patchWidth ) { if ( lm->w < ds->patchWidth ) {
lm->w = ds->patchWidth; lm->w = ds->patchWidth;
} }
@ -531,7 +531,7 @@ qboolean AddPatchToRawLightmap( int num, rawLightmap_t *lm ){
length = 0; length = 0;
for ( y = 0; y < ( mesh->height - 1 ); y++ ) for ( y = 0; y < ( mesh->height - 1 ); y++ )
length += heightTable[ y ]; length += heightTable[ y ];
lm->h = ceil( length / lm->sampleSize ) + 1; lm->h = lm->sampleSize != 0 ? ceil( length / lm->sampleSize ) + 1 : 0;
if ( lm->h < ds->patchHeight ) { if ( lm->h < ds->patchHeight ) {
lm->h = ds->patchHeight; lm->h = ds->patchHeight;
} }