OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Move wall drawer args into functions

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-02 11:16:18 +01:00
commit f3d968cf41
17 changed files with 112 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/swrenderer/things/r_decal.cpp
View file

@ -277,11 +277,11 @@ namespace swrenderer
SpriteDrawerArgs drawerargs;
if (cameraLight->fixedlightlev >= 0)
drawerargs.SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev));
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev));
else if (cameraLight->fixedcolormap != NULL)
drawerargs.SetColorMapLight(cameraLight->fixedcolormap, 0, 0);
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0);
else if (!foggy && (decal->RenderFlags & RF_FULLBRIGHT))
drawerargs.SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0);
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0);
else
calclighting = true;
@ -299,7 +299,7 @@ namespace swrenderer
{
if (calclighting)
{ // calculate lighting
drawerargs.SetColorMapLight(usecolormap, light, wallshade);
drawerargs.SetLight(usecolormap, light, wallshade);
}
DrawColumn(drawerargs, x, WallSpriteTile, walltexcoords, texturemid, maskedScaleY, sprflipvert, mfloorclip, mceilingclip);
light += lightstep;