ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,230 Commits 9 Branches 28 Tags 433 MiB
fd7427a1cf
Commit Graph

2150 Commits

Author SHA1 Message Date
vlj
9c98012e09 Fix dof and transparent fog. 2014-05-17 03:09:21 +02:00
vlj
883b39591f Width and height are passed by UBO 2014-05-17 02:39:55 +02:00
hiker
71603816fa Merge remote-tracking branch 'origin/master' into new_login 2014-05-16 14:21:13 +10:00
hiker
0459c33f66 Added a tabbed version of the user screen, and integrated it into 
the option menu of STK.
 2014-05-15 22:59:21 +10:00
Marianne Gagnon
aae7d01e57 Try to make the custom GUI settings popup work on any resolution 2014-05-14 19:29:39 -04:00
hiker
71d4e380b3 Disabled guest account. 2014-05-15 08:56:46 +10:00
hiker
ce52bf90e4 Merge branch 'new_login' of github.com:supertuxkart/stk-code into new_login 2014-05-14 14:10:10 +10:00
hiker
d9daf928e5 Merge remote branch 'origin/master' into new_login 2014-05-14 14:06:06 +10:00
vlj
229b461a6c SSAO: Less abrupt transition 2014-05-14 03:26:43 +02:00
vlj
1d4bcd5ade SSAO: Increase beta constant to avoid error 2014-05-14 02:27:17 +02:00
vlj
86c8b9f83d Some tweaking to make ssao more apparent 2014-05-14 02:12:18 +02:00
vlj
0ccac5d316 Replace texture2D by texture in dof.frag 2014-05-14 00:59:51 +02:00
Vincent Lejeune
59484ea09a DS buffer is not linear and cant be mipmapped 
Use the method provided by SAO paper (ie convert to linear and then
mipmap)
 2014-05-13 19:40:30 +02:00
vlj
26d48cdad0 SSAO: Stronger blur + tweak param 
Use another algorithm to have gaussian blur that lets us customise
radius more easily.
 2014-05-12 23:59:17 +02:00
vlj
bba9e3ca2c Add a 17 tap blur filter 
and use it for SSAO
 2014-05-12 20:49:47 +02:00
vlj
8e17ae90b6 Resolution independent ssao 2014-05-12 20:13:12 +02:00
Vincent Lejeune
96babc81ad Reenable custom light radius 2014-05-12 19:37:00 +02:00
vlj
23ba597a1c SSAO: Use int rounding 2014-05-12 18:39:33 +02:00
vlj
229b72f84a Render SSAO at fullscreen resolution. 2014-05-12 01:06:33 +02:00
vlj
4fcec02123 Remove ssao depth guard. 2014-05-12 00:34:44 +02:00
vlj
7e1625da5e Tweak SSAO params. 2014-05-12 00:30:36 +02:00
vlj
f8544493b6 Improve SSAO perf 2014-05-12 00:14:50 +02:00
vlj
11b7d20ad8 Use the mipmap trick to speed up ssao. 2014-05-12 00:03:42 +02:00
Vincent Lejeune
567974aeed Use dFdX/dFdY to compute normals in SSAO. 2014-05-11 18:09:48 +02:00
Vincent Lejeune
e5410e23a2 Use Alchemy SSAO 2014-05-11 18:00:30 +02:00
samuncle
518a5fd8ef Fix pre-c++2011 + improved waterfall effect 2014-05-11 02:58:23 +02:00
Vincent Lejeune
648d076e00 Premultiply alpha for particles too. 2014-05-10 20:58:43 +02:00
Vincent Lejeune
6936f30b36 Premultiply alpha for billboards. 2014-05-10 20:49:30 +02:00
Guillaume P
deb74f4a00 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 
Conflicts:
	src/graphics/glwrap.cpp
 2014-05-08 18:40:14 +02:00
hiker
8d4b33f221 Removed tabs, and use a separate screen instead. Some more refactoring 
to make remember-me a global setting.
 2014-05-08 22:17:15 +10:00
hiker
15f43a0537 Merge branch 'master' into new_login 2014-05-08 13:35:40 +10:00
Vincent Lejeune
a73f03a2c4 Make use of gl_amd_vertex_shader_layer when available 2014-05-08 01:16:02 +02:00
vlj
fd7399d983 Use instancing to expand shadows instead of GS 2014-05-07 23:57:07 +02:00
hiker
6fb9832fc2 Added box around screen, hide 'guest' if no online login is requested. 2014-05-07 17:10:02 +10:00
hiker
83c29b0778 Instead of individual 'remember-me' settings, use one global setting. 2014-05-07 16:39:09 +10:00
hiker
6fab5e89fd Merge remote branch 'origin/master' into new_login 2014-05-07 13:04:35 +10:00
hiker
737c8a9983 Added 'delete player' functionality. 2014-05-06 16:52:36 +10:00
Stephen Just
efb85943d1 Fix for #1297. DoF shader compiles in mesa now. The other problem noted 
in the issue was just texture compression + intel.
 2014-05-05 07:59:20 -06:00
hiker
d847e8de00 Renamed StoryModeLobby to UserScreen. 2014-05-05 21:17:46 +10:00
hiker
6010831654 Removed original login screen, made the new login screen a tab. 
Removed guest tab (and started to use a checkbox for that for now).
Work in progress.
 2014-05-05 20:46:48 +10:00
Vincent Lejeune
65e4177f5c Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-05 01:47:00 +02:00
Vincent Lejeune
d316263660 Tweak light extent again to improve perf 2014-05-05 01:46:57 +02:00
hiker
00cf9a3dbe Merge remote branch 'origin/master' into new_login 2014-05-05 09:20:37 +10:00
Marianne Gagnon
654651215a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-05-04 18:54:46 -04:00
Marianne Gagnon
5acb763ac8 Work on cutscenes 2014-05-04 18:54:37 -04:00
Vincent Lejeune
d6d7c6179c Simplify pointlight.vert 2014-05-04 19:46:21 +02:00
Vincent Lejeune
94ae8fb21e Use a more tighly fitting quad for pointlights. 2014-05-04 19:21:09 +02:00
vlj
35df307c3f Tweak light extend. 2014-05-03 23:44:27 +02:00
vlj
5e62347d11 Fix attempt for #1308 2014-05-03 17:36:27 +02:00
Guillaume P
a863757365 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 
Conflicts:
	data/gui/custom_video_settings.stkgui
	src/states_screens/dialogs/custom_video_settings.cpp
 2014-05-03 10:32:47 +02:00
Marianne Gagnon
423a833bb8 Add DOF checkbox to the graphics options 2014-05-02 19:02:58 -04:00
Guillaume P
14508bc2ac Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 2014-05-02 19:18:58 +02:00
vlj
2a1623d8ca Use a more efficient screen to view conversion 
Also use the opportunity to use UBO where possible.
 2014-05-02 18:11:34 +02:00
vlj
2f1578ba32 Potential fix for #1305 2014-05-02 13:54:23 +02:00
hiker
d7219f3a2d Added 'ok' button to 'new player' dialog. I can't seem to get them next 
to each other, so for now they are just on top of each other.
 2014-04-30 16:57:22 +10:00
hiker
af9fb24d2e Handle disabled internet (and provide a message to the user if he 
tries to login with internet disabled).
 2014-04-30 16:37:05 +10:00
hiker
5124ba2bed Merge remote-tracking branch 'origin/master' into new_login 2014-04-30 11:28:13 +10:00
hiker
ecef685b32 Adding new players now works. 2014-04-30 07:54:49 +10:00
hiker
b412d0507d Merge pull request #1303 from leyyin/master 
Fix some bugs in the online screens
 2014-04-29 16:25:18 +10:00
hiker
396e3bb54e Merge remote-tracking branch 'origin/master' into new_login 2014-04-29 09:10:37 +10:00
hiker
812da3e0c0 Some work on new login screen, though wip atm. 2014-04-29 09:02:44 +10:00
Guillaume P
03fbdc260d Add a new option for high-definition textures. 2014-04-28 18:42:23 +02:00
hiker
2f17264f39 Very eary first version of a new login screen. 2014-04-28 16:41:47 +10:00
Vincent Lejeune
18aa119890 Tweak light attenuation. 
Doesnt really change the look of the light but reduce their extent.
 2014-04-27 18:31:00 +02:00
Vincent Lejeune
9ac57c3919 Tigher fit of light extent 2014-04-27 18:04:39 +02:00
Daniel Butum
a769563878 Fix back button size in guest login screen 2014-04-26 14:03:14 +03:00
Marianne Gagnon
924e09b3e9 Very slight tweak 2014-04-25 20:02:16 -04:00
vlj
2ca11c3166 Auria provided tonemap coefficients 2014-04-26 02:00:50 +02:00
vlj
3e4254b3a7 Tonemap: Use J. Hable filmic operator 
It gives better result on stk enterprise, slightly saturating blacks.
 2014-04-25 17:57:10 +02:00
Vincent Lejeune
84ddd7119e Use glPolygonOffset to remove shadow acne 
It's a 2002 trick from M. Kilgard
 2014-04-24 21:02:24 +02:00
vlj
85e720a58f Shadow: tweak bias to remove acnee 2014-04-24 18:33:05 +02:00
vlj
ef07b25202 Make possible to tweak exposure/lwhite in adm 2014-04-24 17:47:17 +02:00
hiker
370e2e4935 Merge remote-tracking branch 'origin/master' into new_login 2014-04-24 12:26:29 +10:00
samuncle
ba3cce6046 Limit the DoF influence 2014-04-24 02:44:34 +02:00
Marianne Gagnon
2e53328847 Add debug sliders for vlj 2014-04-23 19:03:23 -04:00
hiker
d7684668db Fixed comments. 2014-04-24 08:16:19 +10:00
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
Vincent Lejeune
eb0dfb4530 Bigger light extend wrt energy. 2014-04-07 22:20:43 +02:00
vlj
e00ce85d7c Support FresnelSchlick factor. 2014-04-07 21:35:10 +02:00
vlj
858c8c7605 Fix normalmap too 2014-04-07 21:35:10 +02:00
vlj
79c6424703 Use specularmap as glossiness map. 2014-04-07 21:35:09 +02:00
vlj
cafc07680a Use Blinn Phong model. 2014-04-07 21:35:09 +02:00
Vincent Lejeune
0b318b9c7e Improve quad's fit of pointlight extend 2014-04-07 21:04:03 +02:00
vlj
ca2b5a7237 Fix normal map and srgb 2014-04-07 01:03:14 +02:00
Vincent Lejeune
ca214230e3 MLAA: Load the right shader for step 2 
No wonder why it didnt work as expected before...
 2014-04-04 19:42:05 +02:00
vlj
6a3556b4ba Shaders'outputs use premultiplied alphas 2014-04-03 14:46:35 +02:00
vlj
8552ddae1c MLAA: Fix gamma in the shaders. 
MLAA looks correct now.
 2014-04-03 14:15:51 +02:00
Vincent Lejeune
964d9a25f1 Some port fixes for MLAA 2014-04-03 00:27:46 +02:00
Vincent Lejeune
33b44c8c97 Port MLAA to new pipeline. 2014-04-03 00:14:58 +02:00
Vincent Lejeune
26c797e79e Fix kart shadows. 2014-04-02 00:09:49 +02:00
Vincent Lejeune
5573ee4e34 Follow more closely Crysis subsurface scatt. 2014-04-01 23:35:32 +02:00
Vincent Lejeune
f41b737913 Merge grass_pass*.vert 2014-04-01 23:16:30 +02:00
Vincent Lejeune
23e5ec709d Add a fake subsurface scattering for grass. 2014-04-01 23:13:16 +02:00
vlj
0fb6515bca Instancing: Support for alpha ref shadow. 2014-03-31 22:06:37 +02:00
vlj
52018bbdea Instancing: Support shadow. 2014-03-31 21:52:42 +02:00
Vincent Lejeune
7ebeaa45e8 Some cleaning. 2014-03-31 20:04:34 +02:00
Vincent Lejeune
bb311618e3 Instancing: Add support for scale transformation. 2014-03-31 18:10:45 +02:00
Vincent Lejeune
33f31dbf30 Disable auto exposure for now. 2014-03-31 17:25:04 +02:00
vlj
251e7f669e Using formula from an article suggested by samuncle 2014-03-31 17:25:04 +02:00
vlj
af93a04987 Improve bright attenuation although not perfect 2014-03-31 17:25:03 +02:00
vlj
58615c0207 Plug in brightness adaptation 2014-03-31 17:25:03 +02:00