Commit Graph

1651 Commits

Author SHA1 Message Date
vincentlj
4f36e43b14 Fix unexported FragData
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:28:35 +00:00
vincentlj
5512a72d62 Lights: Remove hard edge and attenuate specular
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 18:00:54 +00:00
samuncle
067564c7cf A little change to make the SSAO better (IMHO) other opinions are welcome)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 02:55:10 +00:00
samuncle
122567f0d3 Increase the max distance of the displacement effect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14793 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 01:01:12 +00:00
vincentlj
c2b18a0a1c Light: Export the correct value for specmap in grass/splatting shaders
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:48:27 +00:00
vincentlj
3a6e75b656 Light: Fix skybox bug with specmap and update grass/splatting shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:40:14 +00:00
vincentlj
ec3fd4fa13 Light: Support for specularmap
The specular map is embedded in the alpha component of texture.
Alpha value of 1. means no specular, alpha of 0. means 100% specular.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-25 20:19:18 +00:00
vincentlj
c9b8734717 Plug-in energy parameter into pointlight shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 23:07:42 +00:00
vincentlj
65b32757f3 Separate Diffuse and Specular components
This allows to bypass alpha test, and have colored specular lights.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14777 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 20:51:53 +00:00
vincentlj
5f23483bd9 Fix some shaders not building with mesa
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 02:47:33 +00:00
vincentlj
7f51c9737b Test commit, to be reverted
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:59:35 +00:00
vincentlj
88ac0ba6cf Attempt to mimic blender light behavior.
The attenuation assumes a power distributed on the whole sphere surface.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:44:40 +00:00
vincentlj
bd52770ceb SSAO: Avoid sampling outside of RTT_NORMAL_AND_DEPTH textures.
It should remove artifact at the edge of the screen.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14767 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:37:58 +00:00
vincentlj
49131c68af Rain: Fade instead of intersecting geometry
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14765 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 00:33:57 +00:00
vincentlj
f17f8b62cb SSAO: Use the correct distance for range checking
It should remove halo around kart heads.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14763 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 23:25:14 +00:00
vincentlj
3fc63a9f27 SSAO:Ensure sampled point are inside the unit sphere.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14760 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:25:58 +00:00
vincentlj
a3cc62a985 SSAO: Use a costheta factor to ease transition
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 20:02:11 +00:00
vincentlj
a9db4c7c3f Generate random value for SSAO sampling
It should improve SSAO at least with grass.
However this make the algorithm even more sensitive to bad normals.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14758 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 18:14:02 +00:00
vincentlj
34d83859cd Add support for specular light
Note that specular light is applied unconditionnaly, thus every object will shine.
TODO : Specular map should be defined using texture or a material flag.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14756 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:34 +00:00
vincentlj
5db6705889 Move SSAO code into renderLight in order to use a lighter rtt (8 bits instead of 32)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14755 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:27 +00:00
vincentlj
45db87de8a Merge normals and depth RTT into a single one
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14754 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 16:59:55 +00:00
deveee
8b76971a54 Minor changes in soccer setup gui
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 17:44:09 +00:00
vincentlj
07abdebbfa Add range check for ssao + fix for nvidia
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 03:03:07 +00:00
deveee
1a2d26b894 - Fixed crash when goal is scored after time limit
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 17:04:46 +00:00
auria
c6fd5cde1c Apply patch by vlj to improve rendering, thanks a lot!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 00:11:57 +00:00
samuncle
73f9779324 Animated texture corrected. Thanks to vlj :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 23:58:26 +00:00
auria
118705f19a Apply patch by Vlj to put normals in eyespace coordinates and reenable normal mapping, thanks!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-19 00:13:17 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +00:00
funto66
2c1853e54d Remove some more useless autotools files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 23:21:37 +00:00
samuncle
08f211129b Now the sunlight doesn't kill point light. Thanks to Vlj for the correction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14722 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 18:33:00 +00:00
auria
e9e3a8afff remove seemingly useless if in shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14711 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 23:46:40 +00:00
auria
1fb46ca162 Reduce intensity of glowing objects like giftboxes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:16:40 +00:00
auria
b09b879238 typo fix
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14699 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:01:24 +00:00
auria
b27a5363bd Fix objects that are unaffected by lights
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:37:07 +00:00
samuncle
14432a8689 Now the grass shader can be used with the new pipeline.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14695 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 01:58:22 +00:00
hikerstk
0076bec269 Converted glow color back fro floating point to integers (upon artists requests).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 20:02:43 +00:00
nixt
5113dc3337 SVN messed up data/shaders in my branch. 76 files in local copy, 21 on SF. Re-adding folder to branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 13:11:09 +00:00
hikerstk
09dc33d07e Moved the glowing data from stk_config.xml to items.xml.
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:24:26 +00:00
auria
31c29c7a92 Fix visible line in front of kart in SSAO
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:39:07 +00:00
auria
db0a3d37a2 Undo samuncle's commit that added specular lights, but in a way that would only work on nvidia gpus
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:19:46 +00:00
samuncle
b0ce591330 Better outline (glow) color for: banana, bubblegum, box and nitro
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:18:49 +00:00
deveee
ec13bcf802 Merge branch 'hilnius'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:55 +00:00
samuncle
7f214d4458 Restore flip shader and put the color correction in a dedicated shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-04 14:24:02 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-03 23:02:06 +00:00
hikerstk
bc2432bb57 Merged with trunk, final part.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:43:14 +00:00
hikerstk
63d5961dd0 Merged with trunk, part 3.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:39:40 +00:00
samuncle
0a1431aed5 Corrected a bug on intel driver
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 23:46:12 +00:00
samuncle
9fdfb27a67 Add color correction
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 22:48:12 +00:00
samuncle
77db3a2a6e A basic test (TODO, if this is accepted I should make a new shader for only this effect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 21:52:07 +00:00
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:05:44 +00:00