From a5ad0e245dec661aa1c2c9b9fafdfd8aa8706672 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 13 Jul 2025 23:11:43 +0200 Subject: [PATCH] use c++ template for HWR_DrawSprites works just as well without code dupe --- src/hardware/hw_main.cpp | 83 +++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index a358bdcdd..b39f1003b 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -4488,6 +4488,15 @@ static void HWR_RenderDrawNodes(void) // -------------------------------------------------------------------------- // Draw all vissprites // -------------------------------------------------------------------------- +namespace +{ + enum class DrawSpritesType + { + kSprites, + kModels, + }; + +template static void HWR_DrawSprites(void) { UINT32 i; @@ -4502,56 +4511,44 @@ static void HWR_DrawSprites(void) continue; } - HWR_DrawSprite(spr); - } -} - -static void HWR_DrawModels(void) -{ - UINT32 i; - - for (i = 0; i < gl_visspritecount; i++) - { - gl_vissprite_t *spr = gl_vsprorder[i]; - - if (spr->precip) + if constexpr (Type == DrawSpritesType::kModels) { - HWR_DrawPrecipitationSprite(spr); - continue; - } - - if (!spr->mobj) - continue; - - if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) - { - md2_t *md2; - - if (spr->mobj->localskin) + if (spr->mobj && spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) { - if (spr->mobj->skinlocal) - md2 = &md2_localplayermodels[(skin_t *)spr->mobj->localskin - localskins]; + md2_t *md2; + + if (spr->mobj->localskin) + { + if (spr->mobj->skinlocal) + md2 = &md2_localplayermodels[(skin_t *)spr->mobj->localskin - localskins]; + else + md2 = &md2_playermodels [(skin_t *)spr->mobj->localskin - skins]; + } else - md2 = &md2_playermodels [(skin_t *)spr->mobj->localskin - skins]; + md2 = &md2_playermodels[(skin_t *)spr->mobj->skin - skins]; + + // 8/1/19: Only don't display player models if no default SPR_PLAY is found. + if (((md2->notfound || md2->scale < 0.0f) && ((!cv_glfallbackplayermodel.value) || md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)) || spr->mobj->state == &states[S_PLAY_SIGN]) + HWR_DrawSprite(spr); + else + HWR_DrawMD2(spr); } else - md2 = &md2_playermodels[(skin_t *)spr->mobj->skin - skins]; - - // 8/1/19: Only don't display player models if no default SPR_PLAY is found. - if (((md2->notfound || md2->scale < 0.0f) && ((!cv_glfallbackplayermodel.value) || md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)) || spr->mobj->state == &states[S_PLAY_SIGN]) - HWR_DrawSprite(spr); - else - HWR_DrawMD2(spr); + { + if (md2_models[spr->mobj->sprite].notfound || md2_models[spr->mobj->sprite].scale < 0.0f) + HWR_DrawSprite(spr); + else + HWR_DrawMD2(spr); + } } - else + + if constexpr (Type == DrawSpritesType::kSprites) { - if (md2_models[spr->mobj->sprite].notfound || md2_models[spr->mobj->sprite].scale < 0.0f) - HWR_DrawSprite(spr); - else - HWR_DrawMD2(spr); + HWR_DrawSprite(spr); } } } +} // -------------------------------------------------------------------------- // HWR_AddSprites @@ -5609,10 +5606,10 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_ HWR_SortVisSprites(); PS_STOP_TIMING(ps_hw_spritesorttime); PS_START_TIMING(ps_hw_spritedrawtime); - if (LIKELY(!cv_glmdls.value)) - HWR_DrawSprites(); + if (UNLIKELY(cv_glmdls.value)) + HWR_DrawSprites(); else - HWR_DrawModels(); + HWR_DrawSprites(); PS_STOP_TIMING(ps_hw_spritedrawtime); ps_numdrawnodes.value.i = 0;