From 2ea14f6b797b6d804da9ae0a69a711ac871b2f57 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 9 Jul 2026 06:45:03 +0200 Subject: [PATCH] cleanup opengl wipe stuff a little split it like srb2.2 --- src/hardware/hw_main.cpp | 52 +++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index b19916700..8c34f8939 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -6014,6 +6014,10 @@ static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD static void HWR_DoPostProcessor(void) { + // no flashes or screen waving if we want less vfx! + if (cv_reducevfx.value) + return; + // Armageddon Blast Flash! // Could this even be considered postprocessor? if (!HWR_ShouldUsePaletteRendering()) @@ -6053,7 +6057,7 @@ static void HWR_DoPostProcessor(void) return; // Not supported in splitscreen - someone want to add support? - if (splitscreen || cv_reducevfx.value) + if (splitscreen) return; //UINT8 viewnum = R_GetViewNumber(); @@ -6111,44 +6115,60 @@ static void HWR_DoPostProcessor(void) // Flipping of the screen isn't done here anymore } -void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum) +// +// wipes +// +static lumpnum_t wipelumpnum; + +// puts wipe lumpname in wipename[9] +static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum) { static char lumpname[9] = "FADEmmss"; - lumpnum_t lumpnum; size_t lsize; + // screen textures disabled completely if (cv_glscreentextures.value == 0) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; + return false; } - if (wipenum > 99 || scrnnum > 99) // not a valid wipe number + // not a valid wipe number + if (wipenum > 99 || scrnnum > 99) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; // shouldn't end up here really, the loop should've stopped running beforehand + return false; // shouldn't end up here really, the loop should've stopped running beforehand } // puts the numbers into the lumpname sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum); - lumpnum = W_CheckNumForName(lumpname); + wipelumpnum = W_CheckNumForName(lumpname); - if (lumpnum == LUMPERROR) // again, shouldn't be here really + // again, shouldn't be here really + if (wipelumpnum == LUMPERROR) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; + return false; } - lsize = W_LumpLength(lumpnum); + lsize = W_LumpLength(wipelumpnum); if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000)) { CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname); - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; // again, shouldn't get here if it is a bad size + return false; // again, shouldn't get here if it is a bad size } - HWR_GetFadeMask(lumpnum); + return true; +} + +void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum) +{ + if (!HWR_WipeCheck(wipenum, scrnnum)) + { + // just draw a black screen instead of rapidly flashing a white screen + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + return; + } + + HWR_GetFadeMask(wipelumpnum); GL_DoScreenWipe(HWD_SCREENTEXTURE_WIPE_START, HWD_SCREENTEXTURE_WIPE_END); }