vincentlj
d776fdc4e7
OGL32CTX: Add vao functions even if we don't use them atm.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:52:49 +00:00
hikerstk
7cdca13d7b
Fixed all(?) warnings about signed and unsigned comparisons.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:09:19 +00:00
auria
b1c8898b54
Bump track XML version number to 6
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:05:40 +00:00
vincentlj
51023ceb81
GPUParticles: Fix adjusted_initial_velocity computation.
...
Thank to Auria and hiker for their help.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14947 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:04:43 +00:00
auria
6e3466c838
load material.xml from libraries
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14946 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 23:29:12 +00:00
vincentlj
88bb3a8da8
GPUParticles: Add support for increase factor
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14945 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:58:04 +00:00
vincentlj
7a95d46448
GPUParticles: Use smoothstep for fade out and remove direction modulation by size.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 22:35:54 +00:00
hikerstk
6808a9df1a
Fixed warning and incorrect color values (for non-shader).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14943 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 21:10:50 +00:00
deveee
75cfde3d69
Fixed compilation in debug mode.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14942 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 20:05:23 +00:00
vincentlj
841aa05cc0
GPUParticles: Use gl_vertexID to improve particle emission rate handling.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14941 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 18:05:21 +00:00
hikerstk
3e8741c442
Fixed typo.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14940 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:28:24 +00:00
hikerstk
6ee751e3c3
Added new class to handle command line parameters, which
...
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts).
All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.
Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:23:16 +00:00
auria
068eb8ece2
Add ozoneone's new snow song
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 02:55:37 +00:00
samuncle
47a2d1529a
Add more lanterns using the library
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14937 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 02:03:42 +00:00
samuncle
d9fd3ccfe0
Add high adhesion for the tunnel so we can do the sunt featured in top gear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14936 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 00:29:11 +00:00
vincentlj
fb57b75cc0
GPUParticles: Attempt at fixing the green flash bug in minel
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14935 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 23:32:24 +00:00
stephenjust
78ca6f2b9c
Don't crash when shaders are disabled when drawing snow
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14934 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 22:56:27 +00:00
vincentlj
62f815ff68
Debug output: Use a comment to tell not to remove that code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14933 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:39:54 +00:00
vincentlj
ffc1524bf7
GPUParticles: Use fallback if glsl is disabled.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14932 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:39:42 +00:00
samuncle
e03c1cf13e
Better splat map
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14931 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:34:54 +00:00
stephenjust
9bf632fb4b
Fix crash loading tracks when shaders are disabled
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14930 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:14:28 +00:00
vincentlj
2fe8eafbe1
OGL Debug : looks like not all driver on linux support arb debug output :(
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14929 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:14:10 +00:00
vincentlj
869386c338
Centralize view and proj matrix to avoid recomputation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14928 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-05 21:12:19 +00:00
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