X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_video.qc;h=849fa435bf752c65b603f01556d8b3aa7d044b6f;hb=8902733275bfdde8518216069bbe7d3e29812756;hp=9320a6ebf2101603fe79e478d3b1abf347f8fe7e;hpb=7c9209dca6c1a4796dc1567f836671dd9fd2f938;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 9320a6ebf..849fa435b 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@ -46,6 +46,7 @@ void XonoticVideoSettingsTab_fill(entity me) e.addValue(e, ZCTX(_("SZ^Gigantic")), "0.75"); e.addValue(e, ZCTX(_("SZ^Colossal")), "1"); e.configureXonoticTextSliderValues(e); + e.applyButton = videoApplyButton; me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Color depth:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider_T("vid_bitsperpixel", @@ -58,18 +59,18 @@ 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 (default: disabled)"))); + _("Enable vertical synchronization to prevent tearing, will cap your fps to the screen refresh rate"))); me.TR(me); - if(cvar("developer")) + if(cvar("developer") > 0) { me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "v_flipped", _("Flip view horizontally"), - _("Poor man's left handed mode (default: off)"))); + _("Poor man's left handed mode"))); } 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 (default: 1x)"))); + _("Anisotropic filtering quality"))); e.addValue(e, ZCTX(_("ANISO^Disabled")), "1"); e.addValue(e, _("2x"), "2"); e.addValue(e, _("4x"), "4"); @@ -80,7 +81,7 @@ void XonoticVideoSettingsTab_fill(entity me) 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", - _("Enable antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot (default: disabled)"))); + _("Enable antialiasing, which smooths the edges of 3D geometry. Note that it might decrease performance by quite a lot"))); e.addValue(e, ZCTX(_("AA^Disabled")), "1"); e.addValue(e, _("2x"), "2"); e.addValue(e, _("4x"), "4"); @@ -95,7 +96,7 @@ void XonoticVideoSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Depth first:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider_T("r_depthfirst", - _("Eliminate overdraw by rendering a depth-only version of the scene before the normal rendering starts (default: disabled)"))); + _("Eliminate overdraw by rendering a depth-only version of the scene before the normal rendering starts"))); e.addValue(e, ZCTX(_("DF^Disabled")), "0"); e.addValue(e, ZCTX(_("DF^World")), "1"); e.addValue(e, ZCTX(_("DF^All")), "2"); @@ -106,62 +107,60 @@ void XonoticVideoSettingsTab_fill(entity 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 (default: Vertex and Triangles)"))); + _("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 (default: Vertex and Triangles)"))); + _("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 (default: Vertex 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:"))); me.TD(me, 1, 2, e = makeXonoticSlider_T(0.0, 0.5, 0.02, "v_brightness", - _("Brightness of black (default: 0)"))); + _("Brightness of black"))); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Contrast:"))); me.TD(me, 1, 2, e = makeXonoticSlider_T(1.0, 3.0, 0.05, "v_contrast", - _("Brightness of white (default: 1)"))); + _("Brightness of white"))); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gamma:"))); - setDependentAND(e, "vid_gl20", 1, 1, "v_glslgamma", 1, 1); + 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 (default: 1.125)"))); - setDependentAND(e, "vid_gl20", 1, 1, "v_glslgamma", 1, 1); + _("Inverse gamma correction value, a brightness effect that does not affect white or black"))); + setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Contrast boost:"))); - setDependentAND(e, "vid_gl20", 1, 1, "v_glslgamma", 1, 1); + 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 (default: 1)"))); - setDependentAND(e, "vid_gl20", 1, 1, "v_glslgamma", 1, 1); + _("By how much to multiply the contrast in dark areas"))); + setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Saturation:"))); 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 (default: 1)"))); + _("Saturation adjustment (0 = grayscale, 1 = normal, 2 = oversaturated), requires GLSL color control"))); setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("LIT^Ambient:")))); me.TD(me, 1, 2, e = makeXonoticSlider_T(0, 20.0, 0.25, "r_ambient", - _("Ambient lighting, if set too high it tends to make light on maps look dull and flat (default: 4)"))); + _("Ambient lighting, if set too high it tends to make light on maps look dull and flat"))); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Intensity:"))); me.TD(me, 1, 2, e = makeXonoticSlider_T(0.5, 2.0, 0.05, "r_hdr_scenebrightness", - _("Global rendering brightness (default: 1)"))); + _("Global rendering brightness"))); me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "gl_finish", _("Wait for GPU to finish each frame"), - _("Make the CPU wait for the GPU to finish each frame, can help with some strange input or video lag on some machines (default: disabled)"))); + _("Make the CPU wait for the GPU to finish each frame, can help with some strange input or video lag on some machines"))); me.TR(me); + if(cvar_type("vid_gl20") & CVAR_TYPEFLAG_ENGINE) + { me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_gl20", _("Use OpenGL 2.0 shaders (GLSL)"))); e.applyButton = videoApplyButton; - me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox_T(0, "v_glslgamma", _("Use GLSL to handle color control"), - _("Enable use of GLSL to apply gamma correction, note that it might decrease performance by a lot (default: disabled)"))); - setDependent(e, "vid_gl20", 1, 1); - if(cvar("developer")) + } + if(cvar("developer") > 0) { me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_psycho", _("Psycho coloring (easter egg)")));