- made gl_menu_blur into a menu option

- made bluramount also into a gameinfo option
- negative gl_menu_blur cvar now uses gameinfo option, 0 disables it
- removed gl_menu_blur_enabled since gl_menu_blur==0 does that anyway
- made gl_menu_blur default to -1 to use gameinfo option
- add default gameinfo bluramount options

src/gi.cpp

@@ -369,6 +369,7 @@ void FMapInfoParser::ParseGameInfo()
 		GAMEINFOKEY_BOOL(nightmarefast, "nightmarefast")
 		GAMEINFOKEY_COLOR(dimcolor, "dimcolor")
 		GAMEINFOKEY_FLOAT(dimamount, "dimamount")
+		GAMEINFOKEY_FLOAT(bluramount, "bluramount")
 		GAMEINFOKEY_INT(definventorymaxamount, "definventorymaxamount")
 		GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime")
 		GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime")

src/gi.h

@@ -155,6 +155,7 @@ struct gameinfo_t
 	FString CursorPic;
 	uint32_t dimcolor;
 	float dimamount;
+	float bluramount;
 	int definventorymaxamount;
 	int defaultrespawntime;
 	int defaultdropstyle;

src/gl/renderer/gl_postprocess.cpp

@@ -145,8 +145,7 @@ CUSTOM_CVAR(Bool, gl_paltonemap_reverselookup, true, CVAR_ARCHIVE | CVAR_NOINITC
 		GLRenderer->ClearTonemapPalette();
 }
 
-CVAR(Float, gl_menu_blur, 1.0f, CVAR_ARCHIVE)
-CVAR(Bool, gl_menu_blur_enabled, true, CVAR_ARCHIVE)
+CVAR(Float, gl_menu_blur, -1.0f, CVAR_ARCHIVE)
 
 EXTERN_CVAR(Float, vid_brightness)
 EXTERN_CVAR(Float, vid_contrast)
@@ -475,10 +474,17 @@ void FGLRenderer::BloomScene(int fixedcm)
 //
 //-----------------------------------------------------------------------------
 
-void FGLRenderer::BlurScene()
+void FGLRenderer::BlurScene(float gameinfobluramount)
 {
+	// first, respect the CVar
 	float blurAmount = gl_menu_blur;
-	if ((!gl_menu_blur_enabled) || (gl_menu_blur <= 0.0) || !FGLRenderBuffers::IsEnabled())
+
+	// if CVar is negative, use the gameinfo entry
+	if (gl_menu_blur < 0)
+		blurAmount = gameinfobluramount;
+
+	// if blurAmount == 0 or somehow still returns negative, exit to prevent a crash, clearly we don't want this
+	if ((blurAmount <= 0.0) || !FGLRenderBuffers::IsEnabled())
 		return;
 
 	FGLDebug::PushGroup("BlurScene");

src/gl/renderer/gl_renderer.h

@@ -180,7 +180,7 @@ public:
 	void ClearTonemapPalette();
 	void LensDistortScene();
 	void ApplyFXAA();
-	void BlurScene();
+	void BlurScene(float gameinfobluramount);
 	void CopyToBackbuffer(const GL_IRECT *bounds, bool applyGamma);
 	void DrawPresentTexture(const GL_IRECT &box, bool applyGamma);
 	void Flush();

src/menu/menu.cpp

@@ -782,7 +782,7 @@ void M_Drawer (void)
 		{
 			screen->Dim(fade);
 			if (GLRenderer)
-				GLRenderer->BlurScene();
+				GLRenderer->BlurScene(gameinfo.bluramount);
 			V_SetBorderNeedRefresh();
 		}
 		CurrentMenu->CallDrawer();

wadsrc/static/language.enu

@@ -2696,6 +2696,7 @@ GLPREFMNU_SPRBILLFACECAMERA 	= "Sprites face camera";
 GLPREFMNU_PARTICLESTYLE 		= "Particle style";
 GLPREFMNU_AMBLIGHT 				= "Ambient light level";
 GLPREFMNU_RENDERQUALITY 		= "Rendering quality";
+GLPREFMNU_MENUBLUR				= "Menu Blur";
 GLPREFMNU_VRMODE 				= "Stereo 3D VR";
 GLPREFMNU_VRQUADSTEREO 			= "Enable Quad Stereo";
 GLPREFMNU_MULTISAMPLE			= "Multisample";

wadsrc/static/mapinfo/chex.txt

@@ -38,6 +38,7 @@ gameinfo
 	weaponslot = 7, "LAZDevice"
 	dimcolor = "ff d7 00"
 	dimamount = 0.2
+	bluramount = 0.5
 	definventorymaxamount = 25
 	defaultrespawntime = 12
 	defaultdropstyle = 1

wadsrc/static/mapinfo/doomcommon.txt

@@ -38,6 +38,7 @@ gameinfo
 	weaponslot = 7, "BFG9000"
 	dimcolor = "ff d7 00"
 	dimamount = 0.2
+	bluramount = 0.5
 	definventorymaxamount = 25
 	defaultrespawntime = 12
 	defaultdropstyle = 1

wadsrc/static/mapinfo/heretic.txt

@@ -37,6 +37,7 @@ gameinfo
 	weaponslot = 7, "Mace"
 	dimcolor = "00 00 ff"
 	dimamount = 0.2
+	bluramount = 0.5
 	definventorymaxamount = 16
 	defaultrespawntime = 12
 	defaultdropstyle = 1

wadsrc/static/mapinfo/hexen.txt

@@ -36,6 +36,7 @@ gameinfo
 	weaponslot = 4, "FWeapQuietus", "CWeapWraithverge", "MWeapBloodscourge"
 	dimcolor = "00 00 ff"
 	dimamount = 0.2
+	bluramount = 0.5
 	definventorymaxamount = 25
 	defaultrespawntime = 12
 	defaultdropstyle = 1

wadsrc/static/mapinfo/mindefaults.txt

@@ -27,6 +27,7 @@ gameinfo
 	intermissioncounter = true
 	dimcolor = "6f 00 6b"
 	dimamount = 0.8
+	bluramount = 0.0
 	definventorymaxamount = 25
 	defaultrespawntime = 12
 	defaultdropstyle = 1

wadsrc/static/mapinfo/strife.txt

@@ -38,6 +38,7 @@ gameinfo
 	weaponslot = 8, "Sigil"
 	dimcolor = "ff d7 00"
 	dimamount = 0.2
+	bluramount = 0.5
 	definventorymaxamount = 25
 	defaultrespawntime = 16
 	defaultdropstyle = 2

wadsrc/static/menudef.txt

@@ -2169,6 +2169,8 @@ OptionMenu "OpenGLOptions"
 	Option "$GLPREFMNU_PARTICLESTYLE",			gl_particles_style,				"Particles"
 	Option "$GLPREFMNU_RENDERQUALITY",			gl_render_precise,				"Precision"
 	StaticText " "
+	Slider "$GLPREFMNU_MENUBLUR",				gl_menu_blur, 0, 5.0, 0.5, 2
+	StaticText " "
 	Option "$GLPREFMNU_VRMODE",					vr_mode, 						"VRMode"
 	Option "$GLPREFMNU_VRQUADSTEREO",			vr_enable_quadbuffered,			"OnOff"
 	StaticText " "