Xonotic » Xonotic Merge Requests

Purpose of the branch:

Use the new r_bloom_scenebrightness cvar in Xonotic, which reduces bloom over-brightness on most map without decreasing the intensity of the bloom effect. What this does is reducing scene brightness (exactly like r_hdr_scenebrightness) but only when bloom is enabled. Most engines handle HDR this way to avoid the same issue. Here are some screenshots showing how this helps:

http://pics.nexuizninjaz.com/viewer.php?file=btasun4zmod7jtiifm4g.jpg

http://pics.nexuizninjaz.com/viewer.php?file=o13gxdgaocolkss952p.jpg

http://pics.nexuizninjaz.com/viewer.php?file=11e83fozgeeq0izo0u8.jpg

Repository: xonotic/xonotic-data.pk3dir.git
Commit: f839eb5485ea9c494954e580e8d3e398159a5047
Branch: mirceakitsune/bloom_scenebrightness

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'f839eb5485ea9c494954e580e8d3e398159a5047'..'origin/mirceakitsune/bloom_scenebrightness'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/mirceakitsune/bloom_scenebrightness'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'mirceakitsune/bloom_scenebrightness'

Diffstat:

 defaultXonotic.cfg |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

Revision log:

commit f839eb5485ea9c494954e580e8d3e398159a5047
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    Add the existing (darkplaces default) bloom settings to defaultXonotic.cfg, plus an r_bloom_scenebrightness of 0.85. This darkens the scene slightly when bloom is on, to avoid over-brightening

User agreed to the GPLv2+.

Diff:

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0c399bb..dd19d2a 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -146,6 +146,14 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b
 r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic)

+r_bloom_blur 4
+r_bloom_brighten 2
+r_bloom_colorexponent 1
+r_bloom_colorscale 1
+r_bloom_colorsubtract 0.125
+r_bloom_resolution 320
+r_bloom_scenebrightness 0.85
+
 seta vid_x11_display ""    "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" 
 // This can have three possible settings:
 //    ""        run as usual