From: Rudolf Polzer Date: Wed, 6 Feb 2019 01:52:27 +0000 (-0500) Subject: Make sRGB the default (and higher), but let lower settings use "wrong but fast" lighting. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4829e489d02138a2b69aa434512a8e08e45cb20;p=xonotic%2Fxonotic-data.pk3dir.git Make sRGB the default (and higher), but let lower settings use "wrong but fast" lighting. Also, adding a menu option for sRGB colorspace. See: http://xonpickbot.designxenon.com:27500/poll/374 --- diff --git a/effects-high.cfg b/effects-high.cfg index 597bb4660..7b75e1d5e 100644 --- a/effects-high.cfg +++ b/effects-high.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 1 cl_decals 1 -cl_decals_models 0 cl_decals_fadetime 4 +cl_decals_models 0 cl_particles 1 cl_particles_quality 1.0 -cl_damageeffect 1 -cl_spawn_point_particles 1 cl_playerdetailreduction 4 +cl_spawn_point_particles 1 gl_flashblend 0 gl_picmip -1 gl_texturecompression_2d 0 gl_texturecompression_sky 0 +hud_postprocessing_maxbluralpha 0.5 +hud_powerup 0 mod_q3bsp_nolightmaps 0 +mod_q3bsp_sRGBlightmaps 1 r_bloom 1 r_coronas 1 r_coronas_occlusionquery 1 -hud_postprocessing_maxbluralpha 0.5 -hud_powerup 0 r_depthfirst 2 r_drawdecals_drawdistance 500 r_drawparticles_drawdistance 1500 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 3 r_texture_dds_load 1 r_water 1 r_water_resolutionmultiplier 0.25 +vid_sRGB 1 menu_sync diff --git a/effects-low.cfg b/effects-low.cfg index c9549581b..e4aa8e218 100644 --- a/effects-low.cfg +++ b/effects-low.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 0 cl_decals 1 -cl_decals_models 0 cl_decals_fadetime 2 +cl_decals_models 0 cl_particles 1 cl_particles_quality 0.4 -cl_damageeffect 0 -cl_spawn_point_particles 0 cl_playerdetailreduction 4 +cl_spawn_point_particles 0 gl_flashblend 1 gl_picmip 1 gl_texturecompression_2d 1 gl_texturecompression_sky 1 +hud_postprocessing_maxbluralpha 0 +hud_powerup 0 mod_q3bsp_nolightmaps 1 +mod_q3bsp_sRGBlightmaps 0 r_bloom 0 r_coronas 1 r_coronas_occlusionquery 0 -hud_postprocessing_maxbluralpha 0 -hud_powerup 0 r_depthfirst 0 r_drawdecals_drawdistance 200 r_drawparticles_drawdistance 500 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 8 r_texture_dds_load 1 r_water 0 r_water_resolutionmultiplier 0.25 +vid_sRGB 0 menu_sync diff --git a/effects-med.cfg b/effects-med.cfg index 4ea20a169..5344f71a9 100644 --- a/effects-med.cfg +++ b/effects-med.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 0 cl_decals 1 -cl_decals_models 0 cl_decals_fadetime 2 +cl_decals_models 0 cl_particles 1 cl_particles_quality 0.8 -cl_damageeffect 0 -cl_spawn_point_particles 0 cl_playerdetailreduction 4 +cl_spawn_point_particles 0 gl_flashblend 0 gl_picmip 0 gl_texturecompression_2d 0 gl_texturecompression_sky 1 +hud_postprocessing_maxbluralpha 0 +hud_powerup 0 mod_q3bsp_nolightmaps 0 +mod_q3bsp_sRGBlightmaps 0 r_bloom 0 r_coronas 1 r_coronas_occlusionquery 0 -hud_postprocessing_maxbluralpha 0 -hud_powerup 0 r_depthfirst 0 r_drawdecals_drawdistance 300 r_drawparticles_drawdistance 750 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 4 r_texture_dds_load 1 r_water 0 r_water_resolutionmultiplier 0.25 +vid_sRGB 0 menu_sync diff --git a/effects-normal.cfg b/effects-normal.cfg index ba708cb9f..ffd9121b3 100644 --- a/effects-normal.cfg +++ b/effects-normal.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 1 cl_decals 1 -cl_decals_models 0 cl_decals_fadetime 2 +cl_decals_models 0 cl_particles 1 cl_particles_quality 1.0 -cl_damageeffect 1 -cl_spawn_point_particles 1 cl_playerdetailreduction 4 +cl_spawn_point_particles 1 gl_flashblend 0 gl_picmip 0 gl_texturecompression_2d 0 gl_texturecompression_sky 0 +hud_postprocessing_maxbluralpha 0 +hud_powerup 0 mod_q3bsp_nolightmaps 0 +mod_q3bsp_sRGBlightmaps 1 r_bloom 0 r_coronas 1 r_coronas_occlusionquery 0 -hud_postprocessing_maxbluralpha 0 -hud_powerup 0 r_depthfirst 1 r_drawdecals_drawdistance 300 r_drawparticles_drawdistance 1000 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 3 r_texture_dds_load 1 r_water 0 r_water_resolutionmultiplier 0.25 +vid_sRGB 1 menu_sync diff --git a/effects-omg.cfg b/effects-omg.cfg index 7614417ce..9eaa5645e 100644 --- a/effects-omg.cfg +++ b/effects-omg.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 0 cl_decals 0 -cl_decals_models 0 cl_decals_fadetime 2 +cl_decals_models 0 cl_particles 1 cl_particles_quality 0.4 -cl_damageeffect 0 -cl_spawn_point_particles 0 cl_playerdetailreduction 4 +cl_spawn_point_particles 0 gl_flashblend 1 gl_picmip 1337 gl_texturecompression_2d 1 gl_texturecompression_sky 1 +hud_postprocessing_maxbluralpha 0 +hud_powerup 0 mod_q3bsp_nolightmaps 1 +mod_q3bsp_sRGBlightmaps 0 r_bloom 0 r_coronas 1 r_coronas_occlusionquery 0 -hud_postprocessing_maxbluralpha 0 -hud_powerup 0 r_depthfirst 0 r_drawdecals_drawdistance 100 r_drawparticles_drawdistance 250 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 16 r_texture_dds_load 1 r_water 0 r_water_resolutionmultiplier 0.25 +vid_sRGB 0 menu_sync diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg index 3ce6f55a7..65706636d 100644 --- a/effects-ultimate.cfg +++ b/effects-ultimate.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 2 cl_decals 1 -cl_decals_models 1 cl_decals_fadetime 10 +cl_decals_models 1 cl_particles 1 cl_particles_quality 1.0 -cl_damageeffect 2 -cl_spawn_point_particles 1 cl_playerdetailreduction 0 +cl_spawn_point_particles 1 gl_flashblend 0 gl_picmip -1 gl_texturecompression_2d 0 gl_texturecompression_sky 0 +hud_postprocessing_maxbluralpha 0.5 +hud_powerup 0.5 mod_q3bsp_nolightmaps 0 +mod_q3bsp_sRGBlightmaps 1 r_bloom 1 r_coronas 1 r_coronas_occlusionquery 1 -hud_postprocessing_maxbluralpha 0.5 -hud_powerup 0.5 r_depthfirst 2 r_drawdecals_drawdistance 500 r_drawparticles_drawdistance 3000 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 1 r_texture_dds_load 0 r_water 1 r_water_resolutionmultiplier 1 +vid_sRGB 1 menu_sync diff --git a/effects-ultra.cfg b/effects-ultra.cfg index d42d7c58b..c90c265af 100644 --- a/effects-ultra.cfg +++ b/effects-ultra.cfg @@ -1,21 +1,22 @@ +cl_damageeffect 2 cl_decals 1 -cl_decals_models 0 cl_decals_fadetime 10 +cl_decals_models 0 cl_particles 1 cl_particles_quality 1.0 -cl_damageeffect 2 -cl_spawn_point_particles 1 cl_playerdetailreduction 0 +cl_spawn_point_particles 1 gl_flashblend 0 gl_picmip -1 gl_texturecompression_2d 0 gl_texturecompression_sky 0 +hud_postprocessing_maxbluralpha 0.5 +hud_powerup 0.5 mod_q3bsp_nolightmaps 0 +mod_q3bsp_sRGBlightmaps 1 r_bloom 1 r_coronas 1 r_coronas_occlusionquery 1 -hud_postprocessing_maxbluralpha 0.5 -hud_powerup 0.5 r_depthfirst 2 r_drawdecals_drawdistance 500 r_drawparticles_drawdistance 2000 @@ -35,5 +36,6 @@ r_subdivisions_tolerance 2 r_texture_dds_load 0 r_water 1 r_water_resolutionmultiplier 0.5 +vid_sRGB 1 menu_sync diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index a9375327e..c64c94b61 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@ -220,6 +220,8 @@ void XonoticEffectsSettingsTab_fill(entity me) _("Fade coronas according to visibility"))); setDependent(e, "r_coronas", 1, 1); me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_sRGB", _("Use sRGB color space"))); + makeMulti(e, "mod_q3bsp_sRGBlightmaps"); me.TR(me); me.TD(me, 1, 1, e = makeXonoticCheckBox_T(0, "r_bloom", _("Bloom"), _("Enable bloom effect, which brightens the neighboring pixels of very bright pixels. Has a big impact on performance."))); diff --git a/sRGB-disable.cfg b/sRGB-disable.cfg deleted file mode 100644 index 930a0e7b1..000000000 --- a/sRGB-disable.cfg +++ /dev/null @@ -1,7 +0,0 @@ -// good non-sRGB settings -vid_sRGB 0 -mod_q3bsp_sRGBlightmaps 0 -r_hdr_scenebrightness 1 -r_ambient 4 - -menu_sync diff --git a/sRGB-enable.cfg b/sRGB-enable.cfg deleted file mode 100644 index 107fdd50c..000000000 --- a/sRGB-enable.cfg +++ /dev/null @@ -1,7 +0,0 @@ -// good sRGB settings -vid_sRGB 1 -mod_q3bsp_sRGBlightmaps 1 -r_hdr_scenebrightness 1 -r_ambient 0.25 - -menu_sync diff --git a/xonotic-client.cfg b/xonotic-client.cfg index a074ea71a..8a080c3d9 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -103,9 +103,10 @@ v_deathtilt 0 // needed for spectators (who are dead to avoid prediction) alias menu_sync "" // will be re-aliased later // we want to use sRGB for our maps! -exec sRGB-disable.cfg vid_sRGB_fallback 2 +r_ambient 0.25 r_hdr_glowintensity 1 +r_hdr_scenebrightness 1 // #define Image_LinearFloatFromsRGBFloat(c) (((c) <= 0.04045f) ? (c) * (1.0f / 12.92f) : (float)pow(((c) + 0.055f)*(1.0f/1.055f), 2.4f)) set rpn_sRGB_to_linear "dup 0.055 add 1.055 div 2.4 pow exch 12.92 div dup 0.0031308 gt when" // #define Image_sRGBFloatFromLinearFloat(c) (((c) < 0.0031308f) ? (c) * 12.92f : 1.055f * (float)pow((c), 1.0f/2.4f) - 0.055f)