OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'zdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
This commit is contained in:
Magnus Norddahl 2016-12-05 08:22:04 +01:00
commit 8a12d040de
18 changed files with 287 additions and 1477 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/v_draw.cpp
View file

@ -134,7 +134,8 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
{
#ifndef NO_SWRENDER
using namespace swrenderer;
using namespace drawerargs;
static short bottomclipper[MAXWIDTH], topclipper[MAXWIDTH];
const BYTE *translation = NULL;
@ -1362,6 +1363,7 @@ void DCanvas::FillSimplePoly(FTexture *tex, FVector2 *points, int npoints,
{
#ifndef NO_SWRENDER
using namespace swrenderer;
using namespace drawerargs;
// Use an equation similar to player sprites to determine shade
fixed_t shade = LIGHT2SHADE(lightlevel) - 12*FRACUNIT;