zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 23:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dynamic lights to the flats in pal mode

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-25 07:49:44 +01:00
parent d428634c58
commit a76cd35333
3 changed files with 183 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

152
src/r_draw_pal.cpp
View file

@ -2384,6 +2384,47 @@ namespace swrenderer
_color = ds_color; _color = ds_color;
_srcalpha = dc_srcalpha; _srcalpha = dc_srcalpha;
_destalpha = dc_destalpha; _destalpha = dc_destalpha;
_dynlights = dc_lights;
_num_dynlights = dc_num_lights;
_viewpos_x = dc_viewpos.X;
_step_viewpos_x = dc_viewpos_step.X;
}
uint8_t PalSpanCommand::AddLights(const TriLight *lights, int num_lights, float viewpos_x, uint8_t fg, uint8_t material)
{
uint32_t lit_r = GPalette.BaseColors[fg].r;
uint32_t lit_g = GPalette.BaseColors[fg].g;
uint32_t lit_b = GPalette.BaseColors[fg].b;
uint32_t material_r = GPalette.BaseColors[material].r;
uint32_t material_g = GPalette.BaseColors[material].g;
uint32_t material_b = GPalette.BaseColors[material].b;
for (int i = 0; i < num_lights; i++)
{
uint32_t light_color_r = RPART(lights[i].color);
uint32_t light_color_g = GPART(lights[i].color);
uint32_t light_color_b = BPART(lights[i].color);
// L = light-pos
// dist = sqrt(dot(L, L))
// attenuation = 1 - MIN(dist * (1/radius), 1)
float Lyz2 = lights[i].y; // L.y*L.y + L.z*L.z
float Lx = lights[i].x - viewpos_x;
float dist2 = Lyz2 + Lx * Lx;
float dist = dist2 * _mm_cvtss_f32(_mm_rsqrt_ss(_mm_load_ss(&dist2)));
uint32_t attenuation = (uint32_t)(256.0f - MIN(dist * lights[i].radius, 256.0f));
lit_r += (light_color_r * material_r * attenuation) >> 16;
lit_g += (light_color_g * material_g * attenuation) >> 16;
lit_b += (light_color_b * material_b * attenuation) >> 16;
}
lit_r = MIN<uint32_t>(lit_r, 255);
lit_g = MIN<uint32_t>(lit_g, 255);
lit_b = MIN<uint32_t>(lit_b, 255);
return RGB256k.All[((lit_r >> 2) << 12) | ((lit_g >> 2) << 6) | (lit_b >> 2)];
} }
void DrawSpanPalCommand::Execute(DrawerThread *thread) void DrawSpanPalCommand::Execute(DrawerThread *thread)
@ -2411,7 +2452,12 @@ namespace swrenderer
xstep = _xstep; xstep = _xstep;
ystep = _ystep; ystep = _ystep;
if (_xbits == 6 && _ybits == 6) const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
if (_xbits == 6 && _ybits == 6 && num_dynlights == 0)
{ {
// 64x64 is the most common case by far, so special case it. // 64x64 is the most common case by far, so special case it.
do do
@ -2428,6 +2474,24 @@ namespace swrenderer
yfrac += ystep; yfrac += ystep;
} while (--count); } while (--count);
} }
else if (_xbits == 6 && _ybits == 6)
{
// 64x64 is the most common case by far, so special case it.
do
{
// Current texture index in u,v.
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
// Lookup pixel from flat texture tile,
// re-index using light/colormap.
*dest++ = AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]);
// Next step in u,v.
xfrac += xstep;
yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count);
}
else else
{ {
uint8_t yshift = 32 - _ybits; uint8_t yshift = 32 - _ybits;
@ -2441,11 +2505,12 @@ namespace swrenderer
// Lookup pixel from flat texture tile, // Lookup pixel from flat texture tile,
// re-index using light/colormap. // re-index using light/colormap.
*dest++ = colormap[source[spot]]; *dest++ = AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]);
// Next step in u,v. // Next step in u,v.
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2475,6 +2540,11 @@ namespace swrenderer
xstep = _xstep; xstep = _xstep;
ystep = _ystep; ystep = _ystep;
const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
if (_xbits == 6 && _ybits == 6) if (_xbits == 6 && _ybits == 6)
{ {
// 64x64 is the most common case by far, so special case it. // 64x64 is the most common case by far, so special case it.
@ -2486,11 +2556,12 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
*dest = colormap[texdata]; *dest = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
} }
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2506,11 +2577,12 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
*dest = colormap[texdata]; *dest = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
} }
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2544,6 +2616,11 @@ namespace swrenderer
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
if (!r_blendmethod) if (!r_blendmethod)
{ {
if (_xbits == 6 && _ybits == 6) if (_xbits == 6 && _ybits == 6)
@ -2552,7 +2629,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
@ -2560,6 +2637,7 @@ namespace swrenderer
*dest++ = RGB32k.All[fg & (fg >> 15)]; *dest++ = RGB32k.All[fg & (fg >> 15)];
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2570,7 +2648,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
@ -2578,6 +2656,7 @@ namespace swrenderer
*dest++ = RGB32k.All[fg & (fg >> 15)]; *dest++ = RGB32k.All[fg & (fg >> 15)];
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2589,7 +2668,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2598,6 +2677,7 @@ namespace swrenderer
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2608,7 +2688,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2617,6 +2697,7 @@ namespace swrenderer
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2641,6 +2722,11 @@ namespace swrenderer
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -2664,7 +2750,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
@ -2674,6 +2760,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2689,7 +2776,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
fg = fg2rgb[fg]; fg = fg2rgb[fg];
bg = bg2rgb[bg]; bg = bg2rgb[bg];
@ -2699,6 +2786,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2715,7 +2803,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2725,6 +2813,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2740,7 +2829,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2750,6 +2839,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2773,6 +2863,11 @@ namespace swrenderer
uint32_t *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -2791,7 +2886,8 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
uint32_t a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t a = fg2rgb[fg] + bg2rgb[*dest];
uint32_t b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
@ -2802,6 +2898,7 @@ namespace swrenderer
*dest++ = RGB32k.All[a & (a >> 15)]; *dest++ = RGB32k.All[a & (a >> 15)];
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2812,7 +2909,8 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
uint32_t a = fg2rgb[colormap[source[spot]]] + bg2rgb[*dest]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t a = fg2rgb[fg] + bg2rgb[*dest];
uint32_t b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
@ -2823,6 +2921,7 @@ namespace swrenderer
*dest++ = RGB32k.All[a & (a >> 15)]; *dest++ = RGB32k.All[a & (a >> 15)];
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2834,7 +2933,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6)); spot = ((xfrac >> (32 - 6 - 6))&(63 * 64)) + (yfrac >> (32 - 6));
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2843,6 +2942,7 @@ namespace swrenderer
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2853,7 +2953,7 @@ namespace swrenderer
do do
{ {
spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift); spot = ((xfrac >> xshift) & xmask) + (yfrac >> yshift);
uint32_t fg = colormap[source[spot]]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[source[spot]], source[spot]) : colormap[source[spot]];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2862,6 +2962,7 @@ namespace swrenderer
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2885,6 +2986,11 @@ namespace swrenderer
uint32_t *bg2rgb = _destblend; uint32_t *bg2rgb = _destblend;
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
const TriLight *dynlights = _dynlights;
int num_dynlights = _num_dynlights;
float viewpos_x = _viewpos_x;
float step_viewpos_x = _step_viewpos_x;
xfrac = _xfrac; xfrac = _xfrac;
yfrac = _yfrac; yfrac = _yfrac;
@ -2908,7 +3014,8 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t a = fg2rgb[colormap[texdata]] + bg2rgb[*dest]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t a = fg2rgb[fg] + bg2rgb[*dest];
uint32_t b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
@ -2921,6 +3028,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2936,7 +3044,8 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t a = fg2rgb[colormap[texdata]] + bg2rgb[*dest]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t a = fg2rgb[fg] + bg2rgb[*dest];
uint32_t b = a; uint32_t b = a;
a |= 0x01f07c1f; a |= 0x01f07c1f;
@ -2949,6 +3058,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }
@ -2965,7 +3075,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -2975,6 +3085,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
else else
@ -2990,7 +3101,7 @@ namespace swrenderer
texdata = source[spot]; texdata = source[spot];
if (texdata != 0) if (texdata != 0)
{ {
uint32_t fg = colormap[texdata]; uint32_t fg = num_dynlights != 0 ? AddLights(dynlights, num_dynlights, viewpos_x, colormap[texdata], texdata) : colormap[texdata];
uint32_t bg = *dest; uint32_t bg = *dest;
int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -3000,6 +3111,7 @@ namespace swrenderer
dest++; dest++;
xfrac += xstep; xfrac += xstep;
yfrac += ystep; yfrac += ystep;
viewpos_x += step_viewpos_x;
} while (--count); } while (--count);
} }
} }

6
src/r_draw_pal.h
View file

@ -153,6 +153,8 @@ namespace swrenderer
FString DebugInfo() override { return "PalSpanCommand"; } FString DebugInfo() override { return "PalSpanCommand"; }
protected: protected:
inline static uint8_t AddLights(const TriLight *lights, int num_lights, float viewpos_x, uint8_t fg, uint8_t material);
const uint8_t *_source; const uint8_t *_source;
const uint8_t *_colormap; const uint8_t *_colormap;
dsfixed_t _xfrac; dsfixed_t _xfrac;
@ -170,6 +172,10 @@ namespace swrenderer
int _color; int _color;
fixed_t _srcalpha; fixed_t _srcalpha;
fixed_t _destalpha; fixed_t _destalpha;
TriLight *_dynlights;
int _num_dynlights;
float _viewpos_x;
float _step_viewpos_x;
}; };
class DrawSpanPalCommand : public PalSpanCommand { public: void Execute(DrawerThread *thread) override; }; class DrawSpanPalCommand : public PalSpanCommand { public: void Execute(DrawerThread *thread) override; };

93
src/r_plane.cpp
View file

@ -256,63 +256,60 @@ void R_MapPlane (int y, int x1)
R_SetDSColorMapLight(basecolormap, GlobVis * fabs(CenterY - y), planeshade); R_SetDSColorMapLight(basecolormap, GlobVis * fabs(CenterY - y), planeshade);
} }
if (r_swtruecolor) if (r_dynlights)
{ {
if (r_dynlights) // Find row position in view space
float zspan = planeheight / (fabs(y + 0.5 - CenterY) / InvZtoScale);
dc_viewpos.X = (float)((x1 + 0.5 - CenterX) / CenterX * zspan);
dc_viewpos.Y = zspan;
dc_viewpos.Z = (float)((CenterY - y - 0.5) / InvZtoScale * zspan);
dc_viewpos_step.X = (float)(zspan / CenterX);
static TriLight lightbuffer[64 * 1024];
static int nextlightindex = 0;
// Setup lights for column
dc_num_lights = 0;
dc_lights = lightbuffer + nextlightindex;
visplane_light *cur_node = ds_light_list;
while (cur_node && nextlightindex < 64 * 1024)
{ {
// Find row position in view space double lightX = cur_node->lightsource->X() - ViewPos.X;
float zspan = planeheight / (fabs(y + 0.5 - CenterY) / InvZtoScale); double lightY = cur_node->lightsource->Y() - ViewPos.Y;
dc_viewpos.X = (float)((x1 + 0.5 - CenterX) / CenterX * zspan); double lightZ = cur_node->lightsource->Z() - ViewPos.Z;
dc_viewpos.Y = zspan;
dc_viewpos.Z = (float)((CenterY - y - 0.5) / InvZtoScale * zspan);
dc_viewpos_step.X = (float)(zspan / CenterX);
static TriLight lightbuffer[64 * 1024]; float lx = (float)(lightX * ViewSin - lightY * ViewCos);
static int nextlightindex = 0; float ly = (float)(lightX * ViewTanCos + lightY * ViewTanSin) - dc_viewpos.Y;
float lz = (float)lightZ - dc_viewpos.Z;
// Setup lights for column // Precalculate the constant part of the dot here so the drawer doesn't have to.
dc_num_lights = 0; float lconstant = ly * ly + lz * lz;
dc_lights = lightbuffer + nextlightindex;
visplane_light *cur_node = ds_light_list; // Include light only if it touches this row
while (cur_node && nextlightindex < 64 * 1024) float radius = cur_node->lightsource->GetRadius();
if (radius * radius >= lconstant)
{ {
double lightX = cur_node->lightsource->X() - ViewPos.X; uint32_t red = cur_node->lightsource->GetRed();
double lightY = cur_node->lightsource->Y() - ViewPos.Y; uint32_t green = cur_node->lightsource->GetGreen();
double lightZ = cur_node->lightsource->Z() - ViewPos.Z; uint32_t blue = cur_node->lightsource->GetBlue();
float lx = (float)(lightX * ViewSin - lightY * ViewCos); nextlightindex++;
float ly = (float)(lightX * ViewTanCos + lightY * ViewTanSin) - dc_viewpos.Y; auto &light = dc_lights[dc_num_lights++];
float lz = (float)lightZ - dc_viewpos.Z; light.x = lx;
light.y = lconstant;
// Precalculate the constant part of the dot here so the drawer doesn't have to. light.radius = 256.0f / radius;
float lconstant = ly * ly + lz * lz; light.color = (red << 16) | (green << 8) | blue;
// Include light only if it touches this row
float radius = cur_node->lightsource->GetRadius();
if (radius * radius >= lconstant)
{
uint32_t red = cur_node->lightsource->GetRed();
uint32_t green = cur_node->lightsource->GetGreen();
uint32_t blue = cur_node->lightsource->GetBlue();
nextlightindex++;
auto &light = dc_lights[dc_num_lights++];
light.x = lx;
light.y = lconstant;
light.radius = 256.0f / radius;
light.color = (red << 16) | (green << 8) | blue;
}
cur_node = cur_node->next;
} }
if (nextlightindex == 64 * 1024) cur_node = cur_node->next;
nextlightindex = 0;
}
else
{
dc_num_lights = 0;
} }
if (nextlightindex == 64 * 1024)
nextlightindex = 0;
}
else
{
dc_num_lights = 0;
} }
ds_y = y; ds_y = y;