X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_video.qc;h=39d952826455c2d4432e14a7ccf335a8cca0fced;hb=060a811f3d8b7aaf8c15b5e450c9975e41a29922;hp=c43e0af9949c255a8f4f6d521b9add1074511f2f;hpb=d44927502027bfa3ccd6ccc98d9b7d6285c182c3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index c43e0af99..39d952826 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -59,25 +59,16 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "vid_fullscreen", _("Full screen")));
 			e.applyButton = videoApplyButton;
 		me.TD(me, 1, 2, e = makeXonoticCheckBox_T(0, "vid_vsync", _("Vertical Synchronization"),
-			_("Enable vertical synchronization to prevent tearing, will cap your fps to the screen refresh rate")));
-
+			_("Vsync prevents tearing, but increases latency and caps your fps at the screen refresh rate")));
 	me.TR(me);
-		if(cvar("developer") > 0)
-		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "v_flipped", _("Flip view horizontally"),
-				_("Poor man's left handed mode")));
-		}
+		me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
+			setDependent(e, "vid_samples", 0, 1);
+
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Anisotropy:")));
-		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("gl_texture_anisotropy",
-			_("Anisotropic filtering quality")));
-			e.addValue(e, ZCTX(_("ANISO^Disabled")), "1");
-			e.addValue(e, _("2x"), "2");
-			e.addValue(e, _("4x"), "4");
-			e.addValue(e, _("8x"), "8");
-			e.addValue(e, _("16x"), "16");
-			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
+	if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
+	{
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Antialiasing:")));
 			setDependent(e, "r_viewfbo", 0, 0);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("vid_samples",
@@ -88,9 +79,23 @@ void XonoticVideoSettingsTab_fill(entity me)
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "r_viewfbo", 0, 0);
 			e.applyButton = videoApplyButton;
+	}
+	else
+	{
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Resolution scaling:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider_T(0.5, 2, 0.25, "r_viewscale",
+			_("Screen or window size multiplier, above 1x does antialiasing, below 1x may help slow GPUs")));
+	}
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer")));
-			setDependent(e, "vid_samples", 1, 1);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Anisotropy:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("gl_texture_anisotropy",
+			_("Anisotropic filtering quality")));
+			e.addValue(e, ZCTX(_("ANISO^Disabled")), "1");
+			e.addValue(e, _("2x"), "2");
+			e.addValue(e, _("4x"), "4");
+			e.addValue(e, _("8x"), "8");
+			e.addValue(e, _("16x"), "16");
+			e.configureXonoticTextSliderValues(e);
 
 	me.TR(me);
 	me.TR(me);
@@ -101,22 +106,6 @@ void XonoticVideoSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("DF^World")), "1");
 			e.addValue(e, ZCTX(_("DF^All")), "2");
 			e.configureXonoticTextSliderValues(e);
-	me.TR(me);
-	if(cvar_type("gl_vbo") & CVAR_TYPEFLAG_ENGINE)
-	{
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "gl_vbo", "0", ZCTX(_("VBO^Off"))));
-		me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "3", _("Vertices, some Tris (compatible)"),
-			_("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "2", _("Vertices"),
-			_("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
-		me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "1", _("Vertices and Triangles"),
-			_("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
-	}
 
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Brightness:")));
@@ -128,21 +117,27 @@ void XonoticVideoSettingsTab_fill(entity me)
 			_("Brightness of white")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gamma:")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(0.5, 2.0, 0.05, "v_gamma",
 			_("Inverse gamma correction value, a brightness effect that does not affect white or black")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Contrast boost:")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(1.0, 5.0, 0.1, "v_contrastboost",
 			_("By how much to multiply the contrast in dark areas")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Saturation:")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(0.5, 2.0, 0.05, "r_glsl_saturation",
 			_("Saturation adjustment (0 = grayscale, 1 = normal, 2 = oversaturated), requires GLSL color control")));
+		if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 	me.TR(me);
@@ -165,11 +160,16 @@ void XonoticVideoSettingsTab_fill(entity me)
 	}
 	if(cvar("developer") > 0)
 	{
+		me.TR(me);
+			me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "v_flipped", _("Flip view horizontally"),
+				_("Poor man's left handed mode")));
 		me.TR(me);
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_psycho", _("Psycho coloring (easter egg)")));
+			if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 				setDependent(e, "vid_gl20", 1, 1);
 		me.TR(me);
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_trippy", _("Trippy vertices (easter egg)")));
+			if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE)
 				setDependent(e, "vid_gl20", 1, 1);
 	}