OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Move ColormapLight to r_light

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-24 04:24:04 +01:00
commit f94cced13d
4 changed files with 56 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/swrenderer/things/r_visiblesprite.cpp
View file

@ -408,46 +408,4 @@ namespace swrenderer
spr->Light.BaseColormap = colormap;
spr->Light.ColormapNum = colormapnum;
}
void ColormapLight::SetColormap(double visibility, int shade, FDynamicColormap *basecolormap, bool fullbright, bool invertColormap, bool fadeToBlack)
{
if (fadeToBlack)
{
if (invertColormap) // Fade to white
{
basecolormap = GetSpecialLights(basecolormap->Color, MAKERGB(255, 255, 255), basecolormap->Desaturate);
invertColormap = false;
}
else // Fade to black
{
basecolormap = GetSpecialLights(basecolormap->Color, MAKERGB(0, 0, 0), basecolormap->Desaturate);
}
}
if (invertColormap)
{
basecolormap = GetSpecialLights(basecolormap->Color, basecolormap->Fade.InverseColor(), basecolormap->Desaturate);
}
if (fixedcolormap)
{
BaseColormap = fixedcolormap;
ColormapNum = 0;
}
else if (fixedlightlev >= 0)
{
BaseColormap = (r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap;
ColormapNum = fixedlightlev >> COLORMAPSHIFT;
}
else if (fullbright)
{
BaseColormap = (r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap;
ColormapNum = 0;
}
else
{
BaseColormap = basecolormap;
ColormapNum = GETPALOOKUP(visibility, shade);
}
}
}