Merge remote-tracking branch 'origin/paletteshader' into Saturn-Next

This commit is contained in:
alufolie91 committed 2023-09-18 15:41:14 +02:00
commit a4f5f3b7dc
5 files changed
+17 -5

No files matched your search

+4 -1
View File
@@ -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;
+1
View File
@@ -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;
+3 -2
View File
@@ -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
};
+1
View File
@@ -2010,6 +2010,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_grshaders);
CV_RegisterVar(&cv_grusecustomshaders);
CV_RegisterVar(&cv_grpaletteshader);
CV_RegisterVar(&cv_grflashpal);
#endif
#ifdef HWRENDER
+8 -2
View File
@@ -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)