sRGB stuff (not enabled yet)

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7eff69f02e545f3f58a84c967beff8970265cdb1..d7f9336581804b251b82b9c177936bb9d8ad5fbc 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -247,6 +247,9 @@ vid_conheight 600
 // menu_conwidth, menu_conheight are set inside quake.rc
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 
+// we want to use sRGB for our maps!
+exec sRGB-disable.cfg
+
 // these settings determine how much the view is affected by movement/damage
 cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
 cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
@@ -911,7 +914,6 @@ gl_picmip_other 1 // so, picmip -1 is best possible quality
 r_mipsprites 1
 r_mipskins 1
 r_shadow_realtime_world_lightmaps 1
-seta r_ambient 4
 cl_decals_fadetime 5
 cl_decals_time 2
 seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
@@ -2080,10 +2082,6 @@ scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 2
 
-// sRGB configuration (EXPERIMENTAL, needs maps to be relit)
-alias sRGBcorrect_on  "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart"
-alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0;r_texture_sRGB_skin_glow 0;r_texture_sRGB_reflect 0;r_texture_sRGB_skybox 0;v_gamma 1.0;r_restart"
-
 // other config files
 exec balanceXonotic.cfg
 exec ctfscoring-ai.cfg

diff --git a/effects-high.cfg b/effects-high.cfg
index b385001d5eb235147e34d186fc87fe2704153513..0e011fe56be28f6516e54bd5cf76fab65031acac 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -30,6 +30,7 @@ r_subdivisions_tolerance 3
 r_texture_dds_load 1
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 2
+vid_samples 1
+r_viewfbo 2
 
 menu_sync

diff --git a/effects-low.cfg b/effects-low.cfg
index 17f88444c6d238ba316eb238238ce257ead41562..a9cff5abe5e85b3f5bd38c64bd5a5293cda43e89 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -31,5 +31,6 @@ r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
 vid_samples 1
+r_viewfbo 0
 
 menu_sync

diff --git a/effects-med.cfg b/effects-med.cfg
index ab4356da768e182e3ddab34d6125cabfa0e9c265..5be8356e2e11c52fca16d0f258372bb05eaddd9f 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -31,5 +31,6 @@ r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
 vid_samples 1
+r_viewfbo 0
 
 menu_sync

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 8d558fc5a7ea9157c6f0f44351ea00c2c43143da..0aebfb79dfd709737399f73b5e83721720415bda 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -31,5 +31,6 @@ r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
 vid_samples 1
+r_viewfbo 0
 
 menu_sync

diff --git a/effects-omg.cfg b/effects-omg.cfg
index eede2b12fae570e19efab4cd1e855b37cc39dbd5..db851e1ca8d6f128389610f82cc0c20858c7e73e 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -31,5 +31,6 @@ r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
 vid_samples 1
+r_viewfbo 0
 
 menu_sync

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 268101e31839f9e31c20b7267d840d6a2edaa1cd..7e4125bf45bf224371e234cf601e70c2e46ff1df 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -30,6 +30,7 @@ r_subdivisions_tolerance 1
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 1
-vid_samples 4
+vid_samples 1
+r_viewfbo 2
 
 menu_sync

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 0ec7293fc78954102135ae6933b0e17f648f0b9b..1c9b9db3012a4f9d05d76aacac7180feea54880e 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -30,6 +30,7 @@ r_subdivisions_tolerance 2
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 4
+vid_samples 1
+r_viewfbo 2
 
 menu_sync

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index fc8756b4b7a9ca314adbe12bbce645136dd84b41..385252bcb106f9d1c432212b8042a8792ccfa8c6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -65,7 +65,10 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        e.addValue(e, _("2x"), "2");
                        e.addValue(e, _("4x"), "4");
                        e.configureXonoticTextSliderValues(e);
+                       setDependent(e, "r_viewfbo", 0, 0);
        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.TR(me);
                me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Texture resolution:")));
                me.TD(me, 1, 2, e = makeXonoticPicmipSlider());

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index e5f5da237bc73be61dc3e2ab264bece41d243758..474798c1785fdd98e601d941adaa8072034586ea 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -50,6 +50,7 @@ void XonoticVideoSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "v_glslgamma", _("Use GLSL to handle color control")));
                        setDependent(e, "vid_gl20", 1, 1);
+       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
        me.TR(me);
@@ -60,16 +61,6 @@ void XonoticVideoSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "gl_vbo", "2", _("Vertices")));
                me.TD(me, 1, 1.9, e = makeXonoticRadioButton(1, "gl_vbo", "1", _("Vertices and Triangles")));
-       me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Frame Buffer Objects (FBOs)")));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "0", _("None")));
-               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "1", _("8bit")));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "2", _("16bit HDR")));
-               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "3", _("32bit HDR")));
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Depth first:")));
@@ -105,7 +96,7 @@ void XonoticVideoSettingsTab_fill(entity me)
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("LIT^Ambient:"))));
-               me.TD(me, 1, 2, e = makeXonoticSlider(0, 20.0, 1.0, "r_ambient"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(0, 20.0, 0.25, "r_ambient"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Intensity:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));

diff --git a/sRGB-disable.cfg b/sRGB-disable.cfg
new file mode 100644 (file)
index 0000000..de04760
--- /dev/null
+++ b/sRGB-disable.cfg
@@ -0,0 +1,7 @@
+// good non-sRGB settings
+vid_sRGB 0
+mod_q3bsp_sRGBlightmaps 0
+r_hdr_scenebrightness 1
+r_ambient 4
+
+menu_cmd sync

diff --git a/sRGB-enable.cfg b/sRGB-enable.cfg
new file mode 100644 (file)
index 0000000..790d29e
--- /dev/null
+++ b/sRGB-enable.cfg
@@ -0,0 +1,7 @@
+// good sRGB settings
+vid_sRGB 1
+mod_q3bsp_sRGBlightmaps 1
+r_hdr_scenebrightness 2.500000
+r_ambient 1
+
+menu_cmd sync