zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-07 16:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add dynamic light to sprites in palette mode

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-23 21:50:16 +01:00
parent 563b64b5e3
commit 4d161fbd42
2 changed files with 55 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/swrenderer/drawers/r_draw_pal.cpp
View file

@ -882,6 +882,24 @@ namespace swrenderer
_srccolor = args.SrcColorIndex(); _srccolor = args.SrcColorIndex();
_srcalpha = args.SrcAlpha(); _srcalpha = args.SrcAlpha();
_destalpha = args.DestAlpha(); _destalpha = args.DestAlpha();
_dynlight = args.DynamicLight();
_light = args.Light();
}
uint8_t PalColumnCommand::AddLights(uint8_t fg, uint8_t material, uint32_t lit_r, uint32_t lit_g, uint32_t lit_b)
{
if (lit_r == 0 && lit_g == 0 && lit_b == 0)
return fg;
uint32_t material_r = GPalette.BaseColors[material].r;
uint32_t material_g = GPalette.BaseColors[material].g;
uint32_t material_b = GPalette.BaseColors[material].b;
lit_r = MIN<uint32_t>(GPalette.BaseColors[fg].r + ((lit_r * material_r) >> 8), 255);
lit_g = MIN<uint32_t>(GPalette.BaseColors[fg].g + ((lit_g * material_g) >> 8), 255);
lit_b = MIN<uint32_t>(GPalette.BaseColors[fg].b + ((lit_b * material_b) >> 8), 255);
return RGB256k.All[((lit_r >> 2) << 12) | ((lit_g >> 2) << 6) | (lit_b >> 2)];
} }
void DrawColumnPalCommand::Execute(DrawerThread *thread) void DrawColumnPalCommand::Execute(DrawerThread *thread)
@ -916,13 +934,10 @@ namespace swrenderer
const uint8_t *colormap = _colormap; const uint8_t *colormap = _colormap;
const uint8_t *source = _source; const uint8_t *source = _source;
// Inner loop that does the actual texture mapping, if (_dynlight == 0)
// e.g. a DDA-lile scaling. {
// This is as fast as it gets.
do do
{ {
// Re-map color indices from wall texture column
// using a lighting/special effects LUT.
*dest = colormap[source[frac >> FRACBITS]]; *dest = colormap[source[frac >> FRACBITS]];
dest += pitch; dest += pitch;
@ -930,6 +945,31 @@ namespace swrenderer
} while (--count); } while (--count);
} }
else
{
uint32_t lit_r = RPART(_dynlight);
uint32_t lit_g = GPART(_dynlight);
uint32_t lit_b = BPART(_dynlight);
uint32_t light = 256 - (_light >> (FRACBITS - 8));
lit_r = MIN<uint32_t>(light + lit_r, 256);
lit_g = MIN<uint32_t>(light + lit_g, 256);
lit_b = MIN<uint32_t>(light + lit_b, 256);
lit_r = lit_r - light;
lit_g = lit_g - light;
lit_b = lit_b - light;
do
{
auto material = source[frac >> FRACBITS];
auto fg = colormap[material];
*dest = AddLights(fg, material, lit_r, lit_g, lit_b);
dest += pitch;
frac += fracstep;
} while (--count);
}
}
void FillColumnPalCommand::Execute(DrawerThread *thread) void FillColumnPalCommand::Execute(DrawerThread *thread)
{ {

4
src/swrenderer/drawers/r_draw_pal.h
View file

@ -76,6 +76,8 @@ namespace swrenderer
FString DebugInfo() override { return "PalColumnCommand"; } FString DebugInfo() override { return "PalColumnCommand"; }
protected: protected:
uint8_t AddLights(uint8_t fg, uint8_t material, uint32_t lit_r, uint32_t lit_g, uint32_t lit_b);
int _count; int _count;
uint8_t *_dest; uint8_t *_dest;
int _dest_y; int _dest_y;
@ -91,6 +93,8 @@ namespace swrenderer
uint32_t _srccolor; uint32_t _srccolor;
fixed_t _srcalpha; fixed_t _srcalpha;
fixed_t _destalpha; fixed_t _destalpha;
uint32_t _dynlight;
fixed_t _light;
}; };
class DrawColumnPalCommand : public PalColumnCommand { public: using PalColumnCommand::PalColumnCommand; void Execute(DrawerThread *thread) override; }; class DrawColumnPalCommand : public PalColumnCommand { public: using PalColumnCommand::PalColumnCommand; void Execute(DrawerThread *thread) override; };