Commit Graph

10293 Commits

Author SHA1 Message Date
vincentlj
aa1bdcf10f GPUParticles: Move opengl function to newly created glwrap.cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14902 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 16:09:33 +00:00
auria
4e4a6bc6d5 Re-export a bunch of tracks to go along the new LOD format
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14896 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 23:45:37 +00:00
auria
d095e14039 Bugfix with new lod
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14895 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 23:44:13 +00:00
vincentlj
10947608d8 GPUParticles: Honor decrease in emission rate.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14894 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 20:01:09 +00:00
vincentlj
ccf226d8e8 GPUParticles: Use a struct instead of hardcoded stride/offset values
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14893 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:52:48 +00:00
vincentlj
977494c88f GPUParticles: More refactoring
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14892 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:21:13 +00:00
vincentlj
d8302dcaee GPUParticles: Refactoring
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 18:07:11 +00:00
vincentlj
d63b5af530 GPUParticles: Tell irrlicht that we disable cullface test.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 17:40:14 +00:00
vincentlj
96841f5731 GPUParticles: Avoid particle respawning at too old location.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 17:20:26 +00:00
vincentlj
39d79c555a GPUParticles: Reset irrlicht blending state.
It fixes some flickering artifact.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14888 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 16:53:55 +00:00
vincentlj
1b564a81a7 GPUParticles: Attribute initial lifetime to box emitter.
This is needed so that effect looks stationnary.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14887 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 15:59:39 +00:00
auria
5da3b32be9 support rotation and scale on library objects
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14886 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:42:45 +00:00
auria
4c11ca65f0 Properly parent light nodes and add them to the scene manager
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:35:42 +00:00
auria
ea7231170a Remove unused light distance property
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14884 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:27:15 +00:00
vincentlj
c25e1c2472 GPUParticles: Use a better fake material that modelize well which states we touch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14883 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 01:06:21 +00:00
vincentlj
2a1a28c459 GPUParticles: Avoid emitting particle at (0,0,0)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-02 00:53:41 +00:00
vincentlj
66ab51789f GPUParticles: Implements SphereEmitter.
Explosion looks a bit like a geyser of flame, needs tweaking.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14881 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 21:36:13 +00:00
auria
93643d660f misc minor stuff
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 21:21:48 +00:00
auria
0f97aee66a Remove the old LOD loading code, we now support only the new much cleaner way. Will need to re-export all tracks that use LOD, meanwhile LOD objects will be missing from tracks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14879 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 21:18:06 +00:00
vincentlj
9fe6b6a6e9 GPUParticles: Clean vbo memory when ParticleSystemProxy is deleted
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 20:32:18 +00:00
vincentlj
419bea3bfd GPUParticles: Avoid recompiling the same shaders over and over, and use a global vbo for quads.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14877 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 20:20:21 +00:00
vincentlj
9c163db7c7 GPUParticles: Add an parameter to turn alpha additive particle on/off.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14876 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:52:32 +00:00
vincentlj
be93478687 GPUParticles: Fix orientation of reemitted particles.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:13:57 +00:00
auria
6b7e33a267 Convert a bunch of prints to our logging system, it's long overdue we fix that
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14874 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 19:11:01 +00:00
vincentlj
09926f6f4e GPUParticles: Modulate direction length to avoid banding with lot of particles.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14873 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:59:15 +00:00
auria
3abc10338e Add Krobonil's new song for lighthouse
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14871 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:20:51 +00:00
vincentlj
28ebf0c08c GPUParticles: Implement box emitter
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 18:11:28 +00:00
auria
245910d3a7 Apply patch to improve paths on osx
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 16:43:03 +00:00
vincentlj
823a40e45e GPUParticles: Fix particles randomly becoming blocky in some track.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14868 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 03:06:23 +00:00
vincentlj
7f45adeeb0 GPUParticles: Enforce GL_BLEND
This fixes some issue with Harvest experienced by samuncle

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14867 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:45:47 +00:00
samuncle
baefa0a4ec I added an alpha channel to the texture to see if it works with the new GPU particle system
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14866 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:45:25 +00:00
vincentlj
217d512d5f This shouldn't have been added to previous commit, sorry.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14865 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 02:17:58 +00:00
vincentlj
94d9eb056a GPUParticle: Use Irrlicht blending state
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14864 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:59:02 +00:00
vincentlj
0fc2f664b6 GPUParticles: Forgot to reset vertexattrib divisor
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14863 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:51:52 +00:00
vincentlj
a38522da70 GPUParticle: Implement size parameter.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14862 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 01:11:44 +00:00
vincentlj
1d3a33bf8e GPUParticles: Use quad instead of POINT_SPRITE
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 20:39:00 +00:00
auria
be691c9afc Do not report the new <lod> XML node as an unknown node type
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 20:27:13 +00:00
auria
56dcb9b3a2 Add support for a new way of loading LOD definitions, that should eventually fully replace the previous method (instead of exporting LOD definitions as standard objects that can appear anywhere in the XML file, group them in a <lod> section, this way we can load all LOD definitions right at the start of the load sequence, instead of the delayed creation hacks we do atm). Old code still in place for now, since we have a lot of tracks using the old way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 19:49:53 +00:00
auria
6fb8188e07 Fix finding data files on OSX
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 19:22:05 +00:00
auria
692d5a582d Fix OSX compilation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14855 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 19:11:23 +00:00
auria
5cd71bdc96 Fix LOD objects in a library
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14854 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 18:45:18 +00:00
auria
3cdf3409bf Refactor LOD to allow parenting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 18:09:13 +00:00
vincentlj
9fbd2b19b1 GPUParticle: Implements generic fade out and rework particles lifetime.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 17:25:10 +00:00
hikerstk
9417541adf Uodated list of dependencies.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14851 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 09:30:41 +00:00
samuncle
a152cf4577 I have corrected missing texture in harvest. I also added a skybox, to test my new skybox shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 01:06:36 +00:00
samuncle
d5e598f7f6 I had some problem with -fno-rtti when I tried to build then trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14849 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 01:03:46 +00:00
vincentlj
8670aa86dc GPUParticle: Fix some parameters not used correctly.
Some previous value (like dt) came from debug attempt.
This fixes the particles behind the wheels of the wagon in minel.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14848 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:58:42 +00:00
auria
43f4d1cdfb Update track objects with the ability to have a parent, getting us one step closer to the library
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14847 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:24:07 +00:00
vincentlj
e2dc4d98df GPUParticle: Fix typo in header file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:18:31 +00:00
vincentlj
e7a355c38e GPUParticle: Use a fake material to avoid Irrlicht to bypass material update.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14845 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-31 00:06:08 +00:00