quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slow down non-fast operation but make it more accurate by not using falloff tolerance at all when -fast is not used

Browse Source
This commit is contained in:
Rudolf Polzer 2012-02-09 10:51:09 +01:00
parent c30d367a12
commit 8dcd2d22e6
1 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3632,23 +3632,29 @@ void SetupEnvelopes( qboolean forGrid, qboolean fastFlag )
/* handle area lights */ /* handle area lights */
if( exactPointToPolygon && light->type == EMIT_AREA && light->w != NULL ) if( exactPointToPolygon && light->type == EMIT_AREA && light->w != NULL )
{ {
/* ugly hack to calculate extent for area lights, but only done once */ light->envelope = MAX_WORLD_COORD * 8.0f;
VectorScale( light->normal, -1.0f, dir );
for( radius = 100.0f; radius < 130000.0f && light->envelope == 0; radius += 10.0f ) /* check for fast mode */
if( (light->flags & LIGHT_FAST) || (light->flags & LIGHT_FAST_TEMP) )
{ {
float factor; /* ugly hack to calculate extent for area lights, but only done once */
VectorScale( light->normal, -1.0f, dir );
VectorMA( light->origin, radius, light->normal, origin ); for( radius = 100.0f; radius < MAX_WORLD_COORD * 8.0f; radius += 10.0f )
factor = PointToPolygonFormFactor( origin, dir, light->w ); {
if( factor < 0.0f ) float factor;
factor *= -1.0f;
if( (factor * light->add) <= light->falloffTolerance ) VectorMA( light->origin, radius, light->normal, origin );
light->envelope = radius; factor = PointToPolygonFormFactor( origin, dir, light->w );
if( factor < 0.0f )
factor *= -1.0f;
if( (factor * light->add) <= light->falloffTolerance )
{
light->envelope = radius;
break;
}
}
} }
/* check for fast mode */
if( !(light->flags & LIGHT_FAST) && !(light->flags & LIGHT_FAST_TEMP) )
light->envelope = MAX_WORLD_COORD * 8.0f;
intensity = light->photons; /* hopefully not used */ intensity = light->photons; /* hopefully not used */
} }
else else
@ -3660,35 +3666,45 @@ void SetupEnvelopes( qboolean forGrid, qboolean fastFlag )
/* other calcs */ /* other calcs */
if( light->envelope <= 0.0f ) if( light->envelope <= 0.0f )
{ {
/* FIXME shouldn't we assume falloffTolerance == 0 when -fast is not used? */
/* solve distance for non-distance lights */ /* solve distance for non-distance lights */
if( !(light->flags & LIGHT_ATTEN_DISTANCE) ) if( !(light->flags & LIGHT_ATTEN_DISTANCE) )
light->envelope = MAX_WORLD_COORD * 8.0f; light->envelope = MAX_WORLD_COORD * 8.0f;
/* solve distance for linear lights */
else if( (light->flags & LIGHT_ATTEN_LINEAR ) )
//% light->envelope = ((intensity / light->falloffTolerance) * linearScale - 1 + radius) / light->fade;
light->envelope = ((intensity * linearScale) - light->falloffTolerance) / light->fade;
/*
add = angle * light->photons * linearScale - (dist * light->fade);
T = (light->photons * linearScale) - (dist * light->fade);
T + (dist * light->fade) = (light->photons * linearScale);
dist * light->fade = (light->photons * linearScale) - T;
dist = ((light->photons * linearScale) - T) / light->fade;
*/
/* solve for inverse square falloff */
else
light->envelope = sqrt( intensity / light->falloffTolerance ) + radius;
/* else if( (light->flags & LIGHT_FAST) || (light->flags & LIGHT_FAST_TEMP) )
add = light->photons / (dist * dist); {
T = light->photons / (dist * dist); /* solve distance for linear lights */
T * (dist * dist) = light->photons; if( (light->flags & LIGHT_ATTEN_LINEAR ) )
dist = sqrt( light->photons / T ); light->envelope = ((intensity * linearScale) - light->falloffTolerance) / light->fade;
*/
/*
add = angle * light->photons * linearScale - (dist * light->fade);
T = (light->photons * linearScale) - (dist * light->fade);
T + (dist * light->fade) = (light->photons * linearScale);
dist * light->fade = (light->photons * linearScale) - T;
dist = ((light->photons * linearScale) - T) / light->fade;
*/
/* solve for inverse square falloff */
else
light->envelope = sqrt( intensity / light->falloffTolerance ) + radius;
/*
add = light->photons / (dist * dist);
T = light->photons / (dist * dist);
T * (dist * dist) = light->photons;
dist = sqrt( light->photons / T );
*/
}
else
{
/* solve distance for linear lights */
if( (light->flags & LIGHT_ATTEN_LINEAR ) )
light->envelope = (intensity * linearScale) / light->fade;
/* can't cull these */
else
light->envelope = MAX_WORLD_COORD * 8.0f;
}
} }
/* chop radius against pvs */ /* chop radius against pvs */