Commit Graph

10466 Commits

Author SHA1 Message Date
vincentlj
7778a71c0a OGL32CTX: Use correct type in coloredquad.frag
Spotted by arb debug output too.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14927 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:54:40 +00:00
vincentlj
aad565a9bf GPUParticles: Use size value so that it doesn't get optimized away
Spotted by arb debug output.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 18:44:52 +00:00
vincentlj
ce62c0b3b7 OGL32CTX: Fix osx build
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14925 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:57:22 +00:00
vincentlj
8a33f14da5 OGL32CTX: Request a 3.0 backward compatible context in linux.
This allows to enable ARB_DEBUG_OUTPUT extension.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14924 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:48:36 +00:00
vincentlj
d44c28ca9e OGL32CTX: GL_QUADS was deprecated, use TRIANGLE_STRIP
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14923 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 17:34:01 +00:00
samuncle
d7a26c7c67 Add smooth transition between textures
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14922 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 12:55:08 +00:00
samuncle
5f2955ec63 I added a screenshoot to avoid the error in log console
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14921 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:31:02 +00:00
vincentlj
d28a869444 Fix skybox frag shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14920 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:11 +00:00
vincentlj
fa068d7810 OGL32CTX: Ask #version 130 for all our shaders
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14919 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 00:08:00 +00:00
vincentlj
57d5d658a0 OGL32CTX: Fixes sourcerect in draw2DImage replacement
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14918 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 23:28:59 +00:00
vincentlj
1a883f740f OGL32CTX: Fix build issue
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14917 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 22:15:28 +00:00
vincentlj
7bb1e671b2 OGL32CTX: Port draw2DRectangle too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 22:10:56 +00:00
vincentlj
3598643332 OGL32CTX: Uses draw2DImage in skin.cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14915 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:43:49 +00:00
vincentlj
bfc7efa5cc OGL32CTX: Remove it in default build.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14914 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:34:06 +00:00
vincentlj
169f29f7b2 OGL32CTX: Spread use of Draw2DImage custom function.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14913 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 21:31:57 +00:00
samuncle
2731d07df0 Add a pink lantern to test the library
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:47:49 +00:00
samuncle
bd69c8c0d7 Add the skybox shader for harvest. For the moment it's still an object in the transparent pass. The object should be in the skybox pass
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14909 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:43:18 +00:00
samuncle
b2f2cb62f7 Add the first object to test the library (It's programmer's art for the moment :P)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14908 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:42:04 +00:00
samuncle
54a9a94ed2 Oups I forget to remove some debug printf :3
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14907 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:34:38 +00:00
samuncle
aedb68a88a Minor correction for a window path
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:29:02 +00:00
vincentlj
c18248220a OGL32CTX: Move an include outside of win32 #ifdef, and always define OGL32CTX for apple
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14905 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:32:42 +00:00
vincentlj
9555bf8c7f OGL32CTX: Use alpha when required
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:15:29 +00:00
vincentlj
b28044e603 OGL32CTX: Implement a draw2DImage function using shaders.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 17:12:30 +00:00
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