zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove useRt

This commit is contained in:
Magnus Norddahl 2016-12-25 08:01:21 +01:00
parent 6f86c11058
commit 08fd81802d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/r_segs.cpp
View File

@ -153,7 +153,7 @@ inline bool IsFogBoundary (sector_t *front, sector_t *back)
float *MaskedSWall; float *MaskedSWall;
float MaskedScaleY; float MaskedScaleY;
static void BlastMaskedColumn (FTexture *tex, bool useRt) static void BlastMaskedColumn (FTexture *tex)
{ {
// calculate lighting // calculate lighting
if (fixedcolormap == NULL && fixedlightlev < 0) if (fixedcolormap == NULL && fixedlightlev < 0)
@ -176,7 +176,7 @@ static void BlastMaskedColumn (FTexture *tex, bool useRt)
// when forming multipatched textures (see r_data.c). // when forming multipatched textures (see r_data.c).
// draw the texture // draw the texture
R_DrawMaskedColumn(tex, maskedtexturecol[dc_x], useRt); R_DrawMaskedColumn(tex, maskedtexturecol[dc_x]);
rw_light += rw_lightstep; rw_light += rw_lightstep;
spryscale += rw_scalestep; spryscale += rw_scalestep;
} }
@ -415,7 +415,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
{ {
for (dc_x = x1; dc_x < x2; ++dc_x) for (dc_x = x1; dc_x < x2; ++dc_x)
{ {
BlastMaskedColumn (tex, false); BlastMaskedColumn (tex);
} }
} }
} }
@ -2309,7 +2309,7 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
{ // calculate lighting { // calculate lighting
R_SetColorMapLight(usecolormap, rw_light, wallshade); R_SetColorMapLight(usecolormap, rw_light, wallshade);
} }
R_WallSpriteColumn (false); R_WallSpriteColumn ();
dc_x++; dc_x++;
} }
} }

14
src/r_things.cpp
View File

@ -258,7 +258,7 @@ double sprtopscreen;
bool sprflipvert; bool sprflipvert;
void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool useRt, bool unmasked) void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool unmasked)
{ {
fixed_t saved_iscale = dc_iscale; // Save this because we need to modify it for mipmaps fixed_t saved_iscale = dc_iscale; // Save this because we need to modify it for mipmaps
@ -374,12 +374,12 @@ void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool useRt, bool unmaske
dc_iscale = saved_iscale; dc_iscale = saved_iscale;
} }
void R_DrawMaskedColumn (FTexture *tex, fixed_t col, bool useRt, bool unmasked) void R_DrawMaskedColumn (FTexture *tex, fixed_t col, bool unmasked)
{ {
// Handle the linear filtered version in a different function to reduce chances of merge conflicts from zdoom. // Handle the linear filtered version in a different function to reduce chances of merge conflicts from zdoom.
if (r_swtruecolor && !drawer_needs_pal_input && !useRt) // To do: add support to R_DrawColumnHoriz_rgba if (r_swtruecolor && !drawer_needs_pal_input) // To do: add support to R_DrawColumnHoriz_rgba
{ {
R_DrawMaskedColumnBgra(tex, col, useRt, unmasked); R_DrawMaskedColumnBgra(tex, col, unmasked);
return; return;
} }
@ -669,14 +669,14 @@ void R_DrawWallSprite(vissprite_t *spr)
R_SetColorMapLight(usecolormap, rw_light, shade); R_SetColorMapLight(usecolormap, rw_light, shade);
} }
if (!R_ClipSpriteColumnWithPortals(spr)) if (!R_ClipSpriteColumnWithPortals(spr))
R_WallSpriteColumn(false); R_WallSpriteColumn();
dc_x++; dc_x++;
} }
} }
R_FinishSetPatchStyle(); R_FinishSetPatchStyle();
} }
void R_WallSpriteColumn (bool useRt) void R_WallSpriteColumn ()
{ {
float iscale = swall[dc_x] * MaskedScaleY; float iscale = swall[dc_x] * MaskedScaleY;
dc_iscale = FLOAT2FIXED(iscale); dc_iscale = FLOAT2FIXED(iscale);
@ -687,7 +687,7 @@ void R_WallSpriteColumn (bool useRt)
sprtopscreen = CenterY - dc_texturemid * spryscale; sprtopscreen = CenterY - dc_texturemid * spryscale;
dc_texturefrac = 0; dc_texturefrac = 0;
R_DrawMaskedColumn(WallSpriteTile, lwall[dc_x], useRt); R_DrawMaskedColumn(WallSpriteTile, lwall[dc_x]);
rw_light += rw_lightstep; rw_light += rw_lightstep;
} }

4
src/r_things.h
View File

@ -129,8 +129,8 @@ extern double pspriteyscale;
extern FTexture *WallSpriteTile; extern FTexture *WallSpriteTile;
void R_DrawMaskedColumn (FTexture *texture, fixed_t column, bool useRt, bool unmasked = false); void R_DrawMaskedColumn (FTexture *texture, fixed_t column, bool unmasked = false);
void R_WallSpriteColumn (bool useRt); void R_WallSpriteColumn ();
void R_CacheSprite (spritedef_t *sprite); void R_CacheSprite (spritedef_t *sprite);
void R_SortVisSprites (int (*compare)(const void *, const void *), size_t first); void R_SortVisSprites (int (*compare)(const void *, const void *), size_t first);

2
src/v_draw.cpp
View File

@ -281,7 +281,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
while (dc_x < x2_i) while (dc_x < x2_i)
{ {
R_DrawMaskedColumn(img, frac, false, !parms.masked); R_DrawMaskedColumn(img, frac, !parms.masked);
dc_x++; dc_x++;
frac += xiscale_i; frac += xiscale_i;
} }