From ab93865255bd125842bda45c6f5a42f586721a84 Mon Sep 17 00:00:00 2001 From: lug420 Date: Mon, 18 Sep 2023 15:39:13 +0200 Subject: [PATCH] make flashpals toggable could be a bit distracting for some --- src/hardware/hw_main.c | 5 ++++- src/hardware/hw_main.h | 1 + src/m_menu.c | 5 +++-- src/r_main.c | 1 + src/st_stuff.c | 10 ++++++++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index d07c3d4c0..f5dec1d58 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -124,6 +124,8 @@ consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE consvar_t cv_grpaletteshader = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletteshader_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_grflashpal = {"gr_flashpal", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static void CV_filtermode_ONChange(void) { HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_grfiltermode.value); @@ -6093,6 +6095,7 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_portalonly); CV_RegisterVar(&cv_secbright); CV_RegisterVar(&cv_grpaletteshader); + CV_RegisterVar(&cv_grflashpal); } // -------------------------------------------------------------------------- @@ -6199,7 +6202,7 @@ void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if (player->flashcount && !cv_grpaletteshader.value) + if (player->flashcount && !cv_grpaletteshader.value || player->flashcount && cv_grpaletteshader.value && !cv_grflashpal.value) { FOutVector v[4]; FSurfaceInfo Surf; diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 019b921c6..5098c754e 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -182,6 +182,7 @@ extern consvar_t cv_grbatching; extern consvar_t cv_grrenderdistance; extern consvar_t cv_grusecustomshaders; extern consvar_t cv_grpaletteshader; +extern consvar_t cv_grflashpal; extern consvar_t cv_grportals; extern consvar_t cv_nostencil; extern consvar_t cv_secbright; diff --git a/src/m_menu.c b/src/m_menu.c index acaf7cb99..86759d8dc 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1706,8 +1706,9 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 80}, {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 90}, {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 110}, - {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 130}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 145}, + {IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_grflashpal, 120}, + {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 140}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 155}, {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 170}, // uwu }; diff --git a/src/r_main.c b/src/r_main.c index 512a2b65c..34efa13b8 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1956,6 +1956,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_grshaders); CV_RegisterVar(&cv_grusecustomshaders); CV_RegisterVar(&cv_grpaletteshader); + CV_RegisterVar(&cv_grflashpal); #endif #ifdef HWRENDER diff --git a/src/st_stuff.c b/src/st_stuff.c index 2baa39c1a..10be523aa 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -235,7 +235,7 @@ void ST_doPaletteStuff(void) palette = min(max(palette, 0), 13); #ifdef HWRENDER - if (rendermode == render_opengl && !cv_grpaletteshader.value) + if (rendermode == render_opengl && !cv_grpaletteshader.value || rendermode == render_opengl && cv_grpaletteshader.value && !cv_grflashpal.value) palette = 0; // No flashpals here in OpenGL #endif @@ -244,7 +244,7 @@ void ST_doPaletteStuff(void) st_palette = palette; #ifdef HWRENDER - if (rendermode != render_none && cv_grpaletteshader.value) + if (rendermode != render_none && cv_grpaletteshader.value && cv_grflashpal.value) #else if (rendermode != render_none) #endif @@ -2167,6 +2167,12 @@ void ST_Drawer(void) st_palette = -1; // Do red-/gold-shifts from damage/items +#ifdef HWRENDER + //25/08/99: Hurdler: palette changes is done for all players, + // not only player1! That's why this part + // of code is moved somewhere else. + if (rendermode == render_soft || rendermode == render_opengl && cv_grpaletteshader.value && cv_grflashpal.value) +#endif if (rendermode != render_none) ST_doPaletteStuff(); if (st_overlay)