okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Reaction renderer features, remove "#ifdef REACTION"s

Browse source
This commit is contained in:
SmileTheory 2013-02-04 20:33:58 -08:00
parent 517c65d85e
commit 9bace5bac7
11 changed files with 122 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

22
code/rend2/tr_surface.c
View file

@ -300,27 +300,7 @@ static void RB_SurfaceSprite( void ) {
VectorSubtract( vec3_origin, left, left );
}
#ifdef REACTION
if (ent->e.renderfx & RF_SUNFLARE)
{
if (backEnd.viewHasSunFlare)
{
ri.Printf(PRINT_WARNING, "Multiple sun flares not supported\n");
return;
}
if (R_CullPointAndRadiusEx(ent->e.origin, ent->e.radius, backEnd.viewParms.frustum, (backEnd.viewParms.flags & VPF_FARPLANEFRUSTUM) ? 5 : 4) == CULL_OUT)
return;
colors[0] = colors[1] = colors[2] = colors[3] = ent->e.shaderRGBA[glRefConfig.framebufferObject] / 255.0f;
if (colors[0] == 0)
return;
backEnd.viewHasSunFlare = qtrue;
backEnd.frameHasSunFlare = qtrue;
}
else
#endif
{
VectorScale4(ent->e.shaderRGBA, 1.0f / 255.0f, colors);
}
VectorScale4(ent->e.shaderRGBA, 1.0f / 255.0f, colors);
RB_AddQuadStamp( ent->e.origin, left, up, colors );
}