ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,379 Commits 9 Branches 28 Tags 433 MiB
ba61e2cbe4
Commit Graph

10379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vincentlj
ba61e2cbe4 GPUParticles: Finish refactorisation. 
Heightmap are enabled again for snow.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14994 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 17:40:25 +00:00
vincentlj
af81015fcd GPUParticles: Use different shaders to avoid unneeded uniforms. 
Heightmap affector is temporarly disabled.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14993 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 17:26:57 +00:00
vincentlj
45067e59cf OGL32CTX: Revert to use gl_TextureMatrix[] 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14992 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 01:29:32 +00:00
vincentlj
0a50518fb9 Remove code loading snow shaders. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 00:59:15 +00:00
vincentlj
90f701c42d OGL32CTX: Attempt to replace implicitly defined uniforms for objectpass 
This breaks animated textures in xr591...

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 00:31:22 +00:00
vincentlj
857f675f35 OGL32CTX: Replace another series of implicit declared uniforms 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14989 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-10 00:30:56 +00:00
hikerstk
ba1e6465ef Fixed #1146 - removing directories didn't work (listFiles() returns absolute 
paths (now??)).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 23:07:01 +00:00
hikerstk
0566d785b1 Fix crash when re-trying to delete an addon (that was deleted 
previously, but had an error).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14987 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 23:03:00 +00:00
hikerstk
e2f636153b Fixed crash #1146 ('install' widgets is removed in case 
of an installed icon, so m_install was NULL).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 22:52:18 +00:00
vincentlj
9a99c3dae6 OGL32CTX: Replace implicitly defined uniforms in displace 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:32:51 +00:00
vincentlj
75b492b871 OGL32CTX: Replace implicitly declared uniforms in bubble 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:32:38 +00:00
vincentlj
751d09d35f GPUParticles: Remove snow shader as we use another now. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14983 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:09:50 +00:00
vincentlj
986f3a6098 OGL32CTX: Remove implicitly defined uniforms in normalmap 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:08:23 +00:00
vincentlj
e6d774a3ac OGL32CTX: Remove implicitly defined uniforms in splatting 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14981 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:08:15 +00:00
vincentlj
9ba803140a OGL32CTX: Remove implicitly defined uniforms in grass 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 17:08:03 +00:00
vincentlj
9d7ab41c11 OGL32CTX: Replace ftransform by gl_ModelViewProjectionMatrix * gl_Vertex. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14979 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 16:09:27 +00:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request 
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 04:57:58 +00:00
vincentlj
99fde5faa4 GPUParticles: Kill snow flake when it hit the ground according to the heightmap. 
(Actually we move it outside of the player view)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 01:49:06 +00:00
vincentlj
105761151d GPUParticles: Another snow tweak 
Slightly more particles, constrained rotation direction, lower speed (vector and rotation)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 01:32:17 +00:00
vincentlj
73ba827763 GPUParticles: Tweak snow parameters. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14975 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 01:16:46 +00:00
vincentlj
42c16b32cb OGL32CTX: Replace deprecated "varying" by in/out semantic and make them explicit. 
gl_Texcoord[]/gl_Color should be explocitly passed as in/out.
Compilers can pack varyings if the architecture does benefit from it (for instance intel mesa driver) but on the other hand they usually don't change size of varying even if there is only a single component used.
So storing vec2 into vec4 may waste performances.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 00:17:28 +00:00
vincentlj
2ba340b6cb OGL32CTX: Add vertex shader where default one was assumed. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 23:11:10 +00:00
vincentlj
632f75c130 OGL32CTX: Create a GL 3.1 context on windows (backward compatible) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14972 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 21:50:46 +00:00
vincentlj
53e32a9848 GPUParticles: bump shaders version to 140 to enable texture buffer support. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 19:09:04 +00:00
vincentlj
35ed664a8e GPUParticles: Fix folded snow particles. 
I forgot I was using instanced quad...

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14970 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 19:02:56 +00:00
vincentlj
28d02f9622 GPUParticles: Implement particle flip. 
Snow quads suffers from folding, I have to investigate and/or ask hiker.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14969 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 18:34:57 +00:00
hikerstk
c5c17747cb Fixed linux compilation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14968 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 12:13:26 +00:00
hikerstk
a1c964f71d Some refactoring and cleanup of the online request handling: 
added setter/getter, renamed functions to have better names,
removed synchronousRequest from http_manager. Should be no
change in functionality.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 12:08:46 +00:00
samuncle
ff7a3d01c4 Minor update on the skybox shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14966 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 08:48:46 +00:00
auria
31b03dc50e tweak reset planes to minimize their impact on the snow particles heightmap 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14964 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 23:46:21 +00:00
auria
26e0f61e23 Properly clean up LOD nodes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 23:24:43 +00:00
vincentlj
17667d9be0 GPUParticles: Also clean texture when object is deleted. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 21:27:18 +00:00
vincentlj
5b8ca4fcd7 GPUParticles: Implement HeightMapAffector equivalent. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14961 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 21:06:06 +00:00
deveee
0be4825ef2 Minor correction in garage action 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 08:17:22 +00:00
hikerstk
b6e98d9e2f Fixed #1143 - untextured ground is not a valid start position. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 05:48:16 +00:00
auria
4f75e31b72 Fix billboard fade effect when billboard is parented 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 02:22:03 +00:00
auria
bbcc2afa61 Use light absolute position for culling, the relative position was incorrectly used 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14957 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 02:12:17 +00:00
hikerstk
1265abd4a0 Remove definition of NDEBUG for VS (since VS will define this 
automatically in release builds), and add -DDEBUG in VS only
for debug builds.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14956 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 02:04:31 +00:00
auria
fb3b2a9f80 ozoneone provided a new version of the snow song 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14954 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 01:20:30 +00:00
auria
e4fdbc6724 Fix LOD issues in snow mountain, causing assertion failures 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 01:17:16 +00:00
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