Commit Graph

1974 Commits

Author SHA1 Message Date
vlj
b939d06be5 Properly add Depth of Field 2014-04-23 22:08:37 +02:00
vlj
22d993dfbe Merge branch 'tonemap'
Conflicts:
	data/shaders/tonemap.frag
2014-04-23 18:20:30 +02:00
vlj
f83eb399fd Revert "Revert "Fix a typo in tonemap.frag""
This reverts commit 812b2afcd8.
2014-04-23 18:19:46 +02:00
vlj
19d2f1f9ac Revert "Revert "Use a less intrusive delta value""
This reverts commit 230076ffcb.
2014-04-23 18:19:00 +02:00
vlj
77795c796f Revert "Revert "Enable tonemap.""
This reverts commit e57339841b.
2014-04-23 18:18:43 +02:00
vlj
fb56a4086f Fix normalmap roughness 2014-04-23 18:09:48 +02:00
Vincent Lejeune
eb0c948e41 Tweak exposure/whiepoint/saturation 2014-04-23 18:09:47 +02:00
hiker
7bab6fdb82 Removed swap file added accidentally. 2014-04-23 14:39:16 +10:00
Vincent Lejeune
da15aebcda SSAO: Clamp to 0. 2014-04-22 18:22:39 +02:00
Vincent Lejeune
6f16831d00 Revert "Some color are negative, clamp them in loglum"
This reverts commit 43df357cfb.
2014-04-22 18:18:18 +02:00
hiker
2e3adee1a2 Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
	src/achievements/achievement_info.hpp
2014-04-22 17:20:40 +10:00
Vincent Lejeune
17ba0f515c Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050.
2014-04-22 02:32:42 +02:00
Vincent Lejeune
b0e56ca2b0 Use some diffent value/equation for tonemap 2014-04-22 02:29:22 +02:00
Vincent Lejeune
e57339841b Revert "Enable tonemap."
This reverts commit a0e63dea46.
2014-04-22 00:44:58 +02:00
Vincent Lejeune
230076ffcb Revert "Use a less intrusive delta value"
This reverts commit d7e3976ef5.
2014-04-22 00:44:49 +02:00
Vincent Lejeune
812b2afcd8 Revert "Fix a typo in tonemap.frag"
This reverts commit b8d5719a82.
2014-04-22 00:44:39 +02:00
Vincent Lejeune
d4718df127 Revert "Use some realist order of magnitude of light"
This reverts commit 2aa6676050.
2014-04-22 00:44:08 +02:00
Vincent Lejeune
b8d5719a82 Fix a typo in tonemap.frag
Also tweak whitepoint and exposure. They should be manually set by track
somehow.
2014-04-21 22:37:26 +02:00
vlj
2aa6676050 Use some realist order of magnitude of light 2014-04-21 19:40:10 +02:00
vlj
d7e3976ef5 Use a less intrusive delta value 2014-04-21 19:39:39 +02:00
vlj
43df357cfb Some color are negative, clamp them in loglum
I have yet to investigate how the pipeline can produce negative values
somewhere.
2014-04-21 19:29:13 +02:00
vlj
a0e63dea46 Enable tonemap. 2014-04-21 02:33:12 +02:00
vlj
2e1b0ac9f4 Avoid negative value when Yxy->RGB 2014-04-21 02:19:09 +02:00
vlj
8947242de4 Add proper tonemap, although disabled.
It currently generates way too much HDR.
2014-04-21 01:52:44 +02:00
vlj
d0afcce32d Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-20 02:56:10 +02:00
vlj
878a639a84 Another ssao tweak. 2014-04-20 02:56:07 +02:00
Marianne Gagnon
8e579d4874 Add UBOs flag to graphics options 2014-04-19 20:23:49 -04:00
vlj
e8b36f2490 Fix for shadow acne in chocolate. 2014-04-20 02:20:09 +02:00
vlj
87248b46f3 Tweak shadows CSM split. 2014-04-20 02:01:29 +02:00
vlj
1291d0cc93 Increase shadow fidelity. 2014-04-20 00:21:30 +02:00
vlj
a457b9f423 Shadows: Clean shaders. 2014-04-20 00:04:49 +02:00
vlj
dd3e15b298 Debug: display cascade in shadow debug mode 2014-04-19 23:57:27 +02:00
Vincent Lejeune
d7eaaf4885 Add a m_ubo_disabled switch in user config file.
This should be used to workaround a bug in intel windows drivers.
2014-04-19 18:38:57 +02:00
vlj
c695875654 PointLight: Use a 1/(1 + d + k d^2) attenuation
This is not physically accurate, but a 1/d^2 attenuation makes light
extend too broad, and went too high if close from the source.
2014-04-19 02:04:39 +02:00
Marianne Gagnon
583d65d988 Update video settings dialog 2014-04-18 18:16:27 -04:00
samuncle
1620f87dd8 Add a new particle system 2014-04-16 01:19:03 +02:00
Marianne Gagnon
e4afea5cca Reduce rimlight effect to a more reasonable strenght 2014-04-14 19:56:26 -04:00
Marianne Gagnon
70cb9cec59 Update graphics options screen 2014-04-14 19:32:44 -04:00
Marianne Gagnon
9993e31601 First pass to update video options menu 2014-04-14 19:05:33 -04:00
Vincent Lejeune
5b47891514 Apply MLAA after color_in. 2014-04-14 03:30:42 +02:00
Vincent Lejeune
ba27eb42ef Bloom: Weight the different sized contribution. 2014-04-14 02:45:15 +02:00
Vincent Lejeune
59df5a90bc Bloom: Tweak the threshold. 2014-04-14 02:15:28 +02:00
Vincent Lejeune
123a192963 Use half res FBO for SSAO
SSAO is a medium frequency effect, using half res fbo is fine and
improve performance and look by doing an additionnal bilinear filtering.
Also tune up some values.
2014-04-14 01:01:36 +02:00
Vincent Lejeune
f98ff2a5fc Fix skid mark color
We convert the vertex color value to srgb, optimally the vertex color
should already be corrected on cpu side but it would break fallback
colors...
2014-04-13 18:00:15 +02:00
Vincent Lejeune
3cd85a829e Compress/convert to srgb per material basis.
This allows to remove manual conversion in normalmap shader.
2014-04-13 17:53:52 +02:00
Vincent Lejeune
59c50ebbdd Use ITexture instead of GLuint in GLMesh 2014-04-12 22:33:27 +02:00
vlj
42482e0c41 Some more conversion 2014-04-10 23:03:57 +02:00
vlj
3a55bbe796 Generalize use of UBO. 2014-04-10 21:16:44 +02:00
Vincent Lejeune
9ba636f661 Gather View Projection and shadows matrix generation. 2014-04-10 21:16:42 +02:00
Vincent Lejeune
55489bc188 Use UBO instead of copying Shadow VP matrixes. 2014-04-08 21:45:04 +02:00