diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index f22a47f4f..b732c4816 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4582,10 +4582,7 @@ void HWR_DrawSprites(void) void HWR_AddSprites(sector_t *sec) { mobj_t *thing; - fixed_t approx_dist, limit_dist; - - INT32 splitflags; - boolean split_drawsprite; // drawing with splitscreen flags + fixed_t limit_dist; // BSP is traversed by subsector. // A sector might have been split into several @@ -4609,88 +4606,15 @@ void HWR_AddSprites(sector_t *sec) limit_dist = (fixed_t)(cv_drawdist.value) * mapobjectscale; // Handle all things in sector. - // If a limit exists, handle things a tiny bit different. - if (limit_dist == 0) + for (thing = sec->thinglist; thing; thing = thing->snext) { - // Draw everything in sector, no checks - for (thing = sec->thinglist; thing; thing = thing->snext) - { - split_drawsprite = false; + if (!R_ThingWithinDist(thing, limit_dist)) + continue; - if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) - continue; + if (!R_ThingVisible(thing)) + continue; - splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - - if (splitscreen && splitflags) - { - if (thing->eflags & MFE_DRAWONLYFORP1) - if (viewssnum == 0) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP2) - if (viewssnum == 1) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (viewssnum == 2) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (viewssnum == 3) - split_drawsprite = true; - } - else - split_drawsprite = true; - - if (!split_drawsprite) - continue; - - HWR_ProjectSprite(thing); - } - } - else - { - for (thing = sec->thinglist; thing; thing = thing->snext) - { - split_drawsprite = false; - - if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) - continue; - - splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - - if (splitscreen && splitflags) - { - if (thing->eflags & MFE_DRAWONLYFORP1) - if (viewssnum == 0) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP2) - if (viewssnum == 1) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (viewssnum == 2) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (viewssnum == 3) - split_drawsprite = true; - } - else - split_drawsprite = true; - - if (!split_drawsprite) - continue; - - approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y); - - if (approx_dist > limit_dist) - continue; - - HWR_ProjectSprite(thing); - } + HWR_ProjectSprite(thing); } } diff --git a/src/r_bsp.c b/src/r_bsp.c index db897bb9f..926835d07 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -259,7 +259,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, else if (sec->heightsec != -1) { const sector_t *s = §ors[sec->heightsec]; - mobj_t *viewmobj = viewplayer->mo; + mobj_t *pviewmobj = viewplayer->mo; INT32 heightsec; boolean underwater; UINT8 i; @@ -273,8 +273,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, break; } - if (i > splitscreen && viewmobj) - heightsec = R_PointInSubsector(viewmobj->x, viewmobj->y)->sector->heightsec; + if (i > splitscreen && pviewmobj) + heightsec = R_PointInSubsector(pviewmobj->x, pviewmobj->y)->sector->heightsec; else return sec; diff --git a/src/r_main.c b/src/r_main.c index 4cb701fc2..8cbf0cc4b 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1176,7 +1176,7 @@ FUNCINLINE ATTRINLINE subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y) // R_SetupFrame // -static mobj_t *viewmobj; +mobj_t *viewmobj; void R_SkyboxFrame(player_t *player) { diff --git a/src/r_main.h b/src/r_main.h index 81bff3811..9c63028c8 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -38,6 +38,8 @@ extern fixed_t renderdeltatics; // The current render is a new logical tic extern boolean renderisnewtic; +extern mobj_t *viewmobj; + // // Lighting LUT. // Used for z-depth cuing per column/row, diff --git a/src/r_things.c b/src/r_things.c index 02dc8c812..75bf32c69 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -20,6 +20,7 @@ #include "z_zone.h" #include "m_misc.h" #include "i_video.h" // rendermode +#include "r_main.h" // stplyr #include "r_fps.h" #include "r_things.h" #include "r_patch.h" @@ -2001,10 +2002,7 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel) { mobj_t *thing; INT32 lightnum; - fixed_t approx_dist, limit_dist; - - INT32 splitflags; // check if a mobj has spliscreen flags - boolean split_drawsprite; // used for splitscreen flags + fixed_t limit_dist; if (rendermode != render_soft) return; @@ -2035,88 +2033,16 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel) // Handle all things in sector. // If a limit exists, handle things a tiny bit different. - if ((limit_dist = (fixed_t)(cv_drawdist.value) * mapobjectscale)) + limit_dist = (fixed_t)(cv_drawdist.value) * mapobjectscale; + for (thing = sec->thinglist; thing; thing = thing->snext) { - for (thing = sec->thinglist; thing; thing = thing->snext) - { - split_drawsprite = false; + if (!R_ThingWithinDist(thing, limit_dist)) + continue; - if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) - continue; + if (!R_ThingVisible(thing)) + continue; - splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - - if (splitscreen && splitflags) - { - if (thing->eflags & MFE_DRAWONLYFORP1) - if (viewssnum == 0) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP2) - if (viewssnum == 1) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (viewssnum == 2) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (viewssnum == 3) - split_drawsprite = true; - } - else - split_drawsprite = true; - - if (!split_drawsprite) - continue; - - approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y); - - if (approx_dist > limit_dist) - continue; - - R_ProjectSprite(thing); - } - } - else - { - // Draw everything in sector, no checks - for (thing = sec->thinglist; thing; thing = thing->snext) - { - - split_drawsprite = false; - - if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) - continue; - - splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - - if (splitscreen && splitflags) - { - if (thing->eflags & MFE_DRAWONLYFORP1) - if (viewssnum == 0) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP2) - if (viewssnum == 1) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (viewssnum == 2) - split_drawsprite = true; - - if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (viewssnum == 3) - split_drawsprite = true; - } - else - split_drawsprite = true; - - if (!split_drawsprite) - continue; - - R_ProjectSprite(thing); - } + R_ProjectSprite(thing); } } @@ -2920,6 +2846,36 @@ void R_ClipSprites(void) } } +/* Check if thing may be drawn from our current view. */ +boolean R_ThingVisible (mobj_t *thing) +{ + if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW) + return false; + + if (viewmobj && (thing == viewmobj)) + return false; + + if ((viewssnum == 0 && (thing->renderflags & MFE_DRAWONLYFORP1)) + || (viewssnum == 1 && (thing->renderflags & MFE_DRAWONLYFORP2)) + || (viewssnum == 2 && (thing->renderflags & MFE_DRAWONLYFORP2)) + || (viewssnum == 3 && (thing->renderflags & MFE_DRAWONLYFORP4))) + return true; + + return true; +} + +boolean R_ThingWithinDist (mobj_t *thing, fixed_t limit_dist) +{ + const fixed_t dist = P_AproxDistance(viewx-thing->x, viewy-thing->y); + + if (limit_dist && dist > limit_dist) + { + return false; + } + + return true; +} + // // R_DrawMasked // diff --git a/src/r_things.h b/src/r_things.h index 181e12bc7..4a6dbf185 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -75,6 +75,9 @@ void R_InitSprites(void); void R_ClearSprites(void); void R_DrawMasked(void); +boolean R_ThingVisible (mobj_t *thing); +boolean R_ThingWithinDist (mobj_t *thing, fixed_t limit_dist); + // ----------- // SKINS STUFF // -----------