Commit Graph

7055 Commits

Author SHA1 Message Date
auria
14655bcdb9 Change lights to be TrackObjects, so that they can be animated. Exporter part not yet committed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 23:55:57 +00:00
vincentlj
e72e2de8ca GPUParticle: Make RainNode a child of GPUParticle
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 22:52:44 +00:00
deveee
4dd0c066df Fixed problem with distance in my previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 22:02:52 +00:00
vincentlj
187abe584b GPUParticles: Reenable rain, windows build is fixed
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 22:02:12 +00:00
vincentlj
df2bd304ab GPUParticles: Put it in its own file
Disable rain while doing ping-pong between os to get windows opengl callback

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 20:56:29 +00:00
vincentlj
616a2e7a75 Rain: Precompute as many shader data as possible
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 17:01:45 +00:00
vincentlj
9826af0747 Rain: Avoid making a draw call that won't be used and make some cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 16:37:24 +00:00
auria
f1aac9e317 Adjust logging to make STK less annoying to debug under visual studio : output the logging directly to VS's output pane, instead of having to reply on the small cmd.exe popup that closes as soon as the application exits
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 03:02:33 +00:00
vincentlj
053170fc27 Rain: Use transform feedback to decouple simulation from rendering
It's the base for a future gpu based particle system

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:50:25 +00:00
deveee
27e397d2c7 Fixed #1086 - Popup message was displayed constantly when you were in garage in overworld.
TODO: Compare distance between garage and kart with for example length
of the kart or distance of object defined in scene.xml.
Currently (m_garage_pos-m_kart_pos).length2_2d() gives much higher values than
getKart(0)->getKartModel()->getLength() and I must look at this closer.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 02:12:16 +00:00
vincentlj
0506b98540 Lights: Add a metric to measure light count pressure in a scene.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14802 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 01:00:20 +00:00
vincentlj
30a030bd4c Light: Pseudo sort lights distance using bucket to evict them fast.
Lower max light level to 16 as it proves sufficient.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 00:34:41 +00:00
vincentlj
4d0b9236b2 Lights: improve bandwidth usage
It should improve performance a lot, but it handles at most 32 simultaneous lights on screen.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14800 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 22:55:15 +00:00
vincentlj
508d866a2b Lights: Improve culling system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14799 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-26 20:14:49 +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
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
dec4cd1453 Change light visualization.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14768 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-24 01:33:42 +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
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
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
352009b2ce RTT_COLOR uses float format.
This allows for hdr, however there is no tone mapping at the moment.
color_level.frag can be currently used for such purpose, it gives a nice look
in harvest, although it is way too bright.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14757 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-23 17:00:42 +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
bc2eefe1dc Fixed displaying more than 2 karts in soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14751 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 16:14:26 +00:00
samuncle
43d919ec6a Reduced the LOD distance of the kart. The player won't notice since he is focused on the race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14744 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-22 00:08:17 +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
samuncle
52ebb9a300 Little value for the distance of animated kart. You won't notice the difference (expect that the christmas hat isn't displayed with the non animated version
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14742 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 14:36:40 +00:00
deveee
49be95b966 Some code cleanup in soccer world
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14741 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 21:11:22 +00:00
deveee
ae2a41f2d0 Fixed problem with karts which were assigned to wrong team in soccer mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-20 00:29:37 +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
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
c450c97472 Allowed the music directory to be external. Renamed
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 22:29:08 +00:00
deveee
0337ae19e0 Some code cleanup in soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14735 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 19:40:36 +00:00
deveee
b7a80dd686 Wait for animation before continue using mouse - soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 12:15:53 +00:00
deveee
25d4bf488a Fixed start game with disabled shaders
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14733 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 10:09:03 +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
deveee
248551bcb6 Minor modification in previous commit - play sound only once
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:13:27 +00:00
deveee
8947227175 Allow to confirm players using mouse in soccer setup screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14729 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:01:20 +00:00
deveee
79e01c5c56 Hopefully fixed problem with tutorial which sometimes was starting in a loop
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14728 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 21:00:56 +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
deveee
0188e90a65 Fixed crash when you start tutorial
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14724 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-16 21:37:20 +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
deveee
5c58d07278 Avoid code duplication in debug.cpp file
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-13 10:34:58 +00:00
deveee
3ba8f1bd38 Add parachute to debug menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14720 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-13 09:06:54 +00:00
deveee
052b7eb07f Add powerups for all local players in debug mode.
Often I need to check something in multiplayer mode - for example bubblegum shield.
Why F1, F2, F3 etc. was removed? ;-(

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 17:51:14 +00:00
hikerstk
55cd9dd09a Made 'min_speed' available for zipper only, re-exported spaceship track.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 05:37:15 +00:00