zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 16:07:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove WallSpriteTile global

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-09 14:51:34 +01:00
parent b9024f87a0
commit bb2806c9ca
6 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/swrenderer/scene/r_things.cpp
View file

@ -79,17 +79,6 @@ namespace swrenderer
{ {
using namespace drawerargs; using namespace drawerargs;
FTexture *WallSpriteTile;
//
// INITIALIZATION FUNCTIONS
//
//
// GAME FUNCTIONS
//
bool DrewAVoxel; bool DrewAVoxel;
static vissprite_t **spritesorter; static vissprite_t **spritesorter;

2
src/swrenderer/scene/r_things.h
View file

@ -38,8 +38,6 @@ EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor);
namespace swrenderer namespace swrenderer
{ {
extern FTexture *WallSpriteTile;
bool R_ClipSpriteColumnWithPortals(vissprite_t* spr); bool R_ClipSpriteColumnWithPortals(vissprite_t* spr);

6
src/swrenderer/things/r_decal.cpp
View file

@ -115,7 +115,7 @@ namespace swrenderer
} }
} }
WallSpriteTile = TexMan(decal->PicNum, true); FTexture *WallSpriteTile = TexMan(decal->PicNum, true);
flipx = (BYTE)(decal->RenderFlags & RF_XFLIP); flipx = (BYTE)(decal->RenderFlags & RF_XFLIP);
if (WallSpriteTile == NULL || WallSpriteTile->UseType == FTexture::TEX_Null) if (WallSpriteTile == NULL || WallSpriteTile->UseType == FTexture::TEX_Null)
@ -290,7 +290,7 @@ namespace swrenderer
{ // calculate lighting { // calculate lighting
R_SetColorMapLight(usecolormap, light, wallshade); R_SetColorMapLight(usecolormap, light, wallshade);
} }
R_DecalColumn(x, maskedScaleY, sprflipvert, mfloorclip, mceilingclip); R_DecalColumn(x, WallSpriteTile, maskedScaleY, sprflipvert, mfloorclip, mceilingclip);
light += lightstep; light += lightstep;
x++; x++;
} }
@ -311,7 +311,7 @@ namespace swrenderer
WallC = savecoord; WallC = savecoord;
} }
void R_DecalColumn(int x, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip) void R_DecalColumn(int x, FTexture *WallSpriteTile, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip)
{ {
float iscale = swall[x] * maskedScaleY; float iscale = swall[x] * maskedScaleY;
double spryscale = 1 / iscale; double spryscale = 1 / iscale;

2
src/swrenderer/things/r_decal.h
View file

@ -22,5 +22,5 @@ namespace swrenderer
void R_RenderDecals(side_t *wall, drawseg_t *draw_segment, int wallshade, float lightleft, float lightstep, seg_t *curline, const FWallCoords &wallC); void R_RenderDecals(side_t *wall, drawseg_t *draw_segment, int wallshade, float lightleft, float lightstep, seg_t *curline, const FWallCoords &wallC);
void R_RenderDecal(side_t *wall, DBaseDecal *first, drawseg_t *clipper, int wallshade, float lightleft, float lightstep, seg_t *curline, FWallCoords wallC, int pass); void R_RenderDecal(side_t *wall, DBaseDecal *first, drawseg_t *clipper, int wallshade, float lightleft, float lightstep, seg_t *curline, FWallCoords wallC, int pass);
void R_DecalColumn(int x, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip); void R_DecalColumn(int x, FTexture *WallSpriteTile, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip);
} }

6
src/swrenderer/things/r_wallsprite.cpp
View file

@ -185,7 +185,7 @@ namespace swrenderer
calclighting = true; calclighting = true;
// Draw it // Draw it
WallSpriteTile = spr->pic; FTexture *WallSpriteTile = spr->pic;
if (spr->renderflags & RF_YFLIP) if (spr->renderflags & RF_YFLIP)
{ {
sprflipvert = true; sprflipvert = true;
@ -222,7 +222,7 @@ namespace swrenderer
R_SetColorMapLight(usecolormap, light, shade); R_SetColorMapLight(usecolormap, light, shade);
} }
if (!R_ClipSpriteColumnWithPortals(spr)) if (!R_ClipSpriteColumnWithPortals(spr))
R_WallSpriteColumn(x, maskedScaleY, sprflipvert, mfloorclip, mceilingclip); R_WallSpriteColumn(x, WallSpriteTile, maskedScaleY, sprflipvert, mfloorclip, mceilingclip);
light += lightstep; light += lightstep;
x++; x++;
} }
@ -230,7 +230,7 @@ namespace swrenderer
R_FinishSetPatchStyle(); R_FinishSetPatchStyle();
} }
void R_WallSpriteColumn(int x, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip) void R_WallSpriteColumn(int x, FTexture *WallSpriteTile, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip)
{ {
float iscale = swall[x] * maskedScaleY; float iscale = swall[x] * maskedScaleY;
double spryscale = 1 / iscale; double spryscale = 1 / iscale;

2
src/swrenderer/things/r_wallsprite.h
View file

@ -19,5 +19,5 @@ namespace swrenderer
{ {
void R_ProjectWallSprite(AActor *thing, const DVector3 &pos, FTextureID picnum, const DVector2 &scale, int renderflags, int spriteshade); void R_ProjectWallSprite(AActor *thing, const DVector3 &pos, FTextureID picnum, const DVector2 &scale, int renderflags, int spriteshade);
void R_DrawWallSprite(vissprite_t *spr, const short *mfloorclip, const short *mceilingclip); void R_DrawWallSprite(vissprite_t *spr, const short *mfloorclip, const short *mceilingclip);
void R_WallSpriteColumn(int x, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip); void R_WallSpriteColumn(int x, FTexture *WallSpriteTile, float maskedScaleY, bool sprflipvert, const short *mfloorclip, const short *mceilingclip);
} }