Commit Graph

7632 Commits

Author SHA1 Message Date
Vincent Lejeune
c9ad17cae1 OGL32CTX: Fix draw of karts and minimap
But it is rendered upside down...
2014-01-22 01:45:21 +01:00
hiker
a6108181e8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-22 10:01:41 +11:00
Vincent Lejeune
4cbbf91e4e Light: Sunlight uses the new shaders. 2014-01-21 23:45:53 +01:00
gl3nn
4438db3bbf Fixes #11 2014-01-21 23:11:22 +01:00
Vincent Lejeune
5f942a9d8b OGL32CTX: Replace a couple of draw2DImage/draw2DRectangle 2014-01-21 23:01:58 +01:00
hiker
0d51477f5b Disabled online menu by default (use --online to get access to it). 2014-01-22 08:52:22 +11:00
hiker
5918f43ce6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-22 08:06:28 +11:00
Vincent Lejeune
5c2b39794c Render fog on top of transparent and fix bubbles 2014-01-21 21:49:19 +01:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
Vincent Lejeune
cebcfabf05 GPUParticle: Simulation uses vao now. 2014-01-21 21:21:03 +01:00
Vincent Lejeune
9da56ddefc STKMesh, GPUParticles: Some factorization. 2014-01-21 20:58:24 +01:00
Vincent Lejeune
63a611b9ea GPUParticles: Use VAO 2014-01-21 20:34:20 +01:00
Vincent Lejeune
43e4db99b1 GPUParticles: Factorize shader loading in shader.h/cpp 2014-01-21 19:36:55 +01:00
Vincent Lejeune
0d57f4db0d Hack to make displacing object non animated and thus STKMeshes. 2014-01-21 18:42:19 +01:00
Vincent Lejeune
f95c6f0277 STKMesh:Displace support 2014-01-21 18:42:18 +01:00
Vincent Lejeune
7faed75a84 STKMesh: Add support for Displacing 2014-01-21 18:42:18 +01:00
Vincent Lejeune
478a9ab5d3 STKMesh: Some simplifications. 2014-01-21 18:42:18 +01:00
hiker
f0365fc7a0 Removed old login dialog. Fixed tabs in login screen that
were not properly focused.
2014-01-21 17:14:23 +11:00
hiker
50ef878e39 Enabled at least VERIFYPEER. 2014-01-21 11:24:07 +11:00
hiker
b9b2f9626e Support running stk from the cmake bin directory. 2014-01-21 08:59:55 +11:00
hiker
f346bc444e Fixed linux compilation. 2014-01-21 08:59:00 +11:00
hiker
6c02f99bca Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-21 08:13:55 +11:00
hiker
0cefc1d79c Fixed crash in first-time-start of STK when glsl reported to
be available, but doesn't work.
2014-01-21 08:13:03 +11:00
hiker
f33d547c54 Moved verbose option to be done even if a file is downloaded. 2014-01-21 08:12:08 +11:00
Vincent Lejeune
a67f5bf511 STKMesh: Use forward rendering for transparent
Transparent objects may be double sided (like bubble),
it doesn't make sense to use a deferred renderer.
2014-01-20 21:42:38 +01:00
Vincent Lejeune
f3a9b24880 STKMesh: Start support for transparent object.
Highly experimental, only applies on the blob shadow under karts.
2014-01-20 20:43:39 +01:00
Vincent Lejeune
aeba31c4cf Profiler: Fix the rendering and use finer grain. 2014-01-20 20:06:04 +01:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still
work in progress (and guest login does not work yet).
2014-01-20 21:39:59 +11:00
Vincent Lejeune
0817ec4ee0 STKMesh:Another round of factorization. 2014-01-19 21:35:09 +01:00
Vincent Lejeune
e26f8d4bc8 Some welcomed factorization. 2014-01-19 21:17:51 +01:00
Vincent Lejeune
24443829db STKMesh: Support grass shader 2014-01-19 20:56:10 +01:00
Vincent Lejeune
99dad9c304 Remove unused normalmap/splatting providers 2014-01-19 19:54:20 +01:00
Vincent Lejeune
bf52c2abf8 Undefine ARB_DEBUG_OUTPUT 2014-01-19 19:00:59 +01:00
Vincent Lejeune
e4acf49e91 Fix a crash with snow enabled tracks. 2014-01-19 18:54:00 +01:00
Vincent Lejeune
fb6649eaad texture2D is deprecated, use texture instead 2014-01-19 18:53:35 +01:00
Vincent Lejeune
496146b617 Use linear filtering for glow effect 2014-01-19 18:21:19 +01:00
Vincent Lejeune
d6d8301f17 SSAO: Use a noise texture rather than a function 2014-01-19 18:20:57 +01:00
Vincent Lejeune
ab3cb86359 Use nearest sampling for some others rtts 2014-01-19 02:38:52 +01:00
Vincent Lejeune
f54b9efebd Use nearest filtering for some rtt 2014-01-19 02:28:10 +01:00
Vincent Lejeune
4d66503dae STKMesh: Use objectref now 2014-01-19 02:15:17 +01:00
Marianne Gagnon
5ce82f9f55 Add a bunch of profiling markers. Gives us some idea where time is spent. Not perfect but better than nothing 2014-01-18 19:48:20 -05:00
Vincent Lejeune
2609e5c709 LightPrepass: start porting object_ref 2014-01-19 01:32:08 +01:00
Vincent Lejeune
9ddfa9261a Revert to a specific define for ARB_DEBUG_OUTPUT
It does not work well with nvidia driver.
2014-01-19 00:43:12 +01:00
Vincent Lejeune
bd972be83a Remove some unused shaders 2014-01-19 00:26:54 +01:00
Vincent Lejeune
e8f8aae5f3 Fix build on linux 2014-01-19 00:02:30 +01:00
Vincent Lejeune
a33195bc15 STKMesh: Avoid recomputing MVP several times 2014-01-18 22:15:55 +01:00
Vincent Lejeune
603fdbb70a Factorize mesh shader. 2014-01-18 21:59:48 +01:00
Vincent Lejeune
6df85e260c Shaders: FullScreenShader are not loaded at startup.
Besides being cleaner it also help finding error in shaders.
2014-01-18 21:35:52 +01:00
Vincent Lejeune
6a995ab178 STKMesh: Clean our buffers when deleted. 2014-01-18 20:47:53 +01:00
Vincent Lejeune
a1f5e47cba Use ARB_DEBUG_OUTPUT on windows in Debug mode.
Hopefully the extension will work properly with every driver...
2014-01-18 20:28:13 +01:00
Vincent Lejeune
47099fb1a3 Use glow vao. 2014-01-18 19:56:35 +01:00
Vincent Lejeune
5f7e6b2834 Some fixes to the renderer. 2014-01-18 19:47:18 +01:00
Vincent Lejeune
dec2cb29ec STKMesh: Support splatting 2014-01-18 19:03:10 +01:00
Vincent Lejeune
fbe9b26127 STKMesh: Support spheremap material 2014-01-18 18:10:22 +01:00
Vincent Lejeune
42e6da443a Simplify Spheremap shader. 2014-01-18 03:25:54 +01:00
gl3nn
0058002260 Merge branch 'master' of https://github.com/supertuxkart/stk-code.git 2014-01-18 02:31:19 +01:00
gl3nn
27a28514e7 Fix the game state of when dialogs should be popped up. 2014-01-18 02:28:22 +01:00
Marianne Gagnon
2e21d40ce4 Support tangent meshes in MeshTools 2014-01-17 19:33:54 -05:00
gl3nn
ca8d9560b7 Forgot to take out the log statement. 2014-01-18 01:23:48 +01:00
Vincent Lejeune
32ec3c0f07 STKMesh: Use a better error message instead of crashing 2014-01-18 01:18:40 +01:00
Marianne Gagnon
5a2ad7c8aa Create mesh with tangents if needed in track objects too 2014-01-17 19:16:01 -05:00
gl3nn
9ac3702da4 Merge branch 'master' of https://github.com/supertuxkart/stk-code.git 2014-01-18 01:07:32 +01:00
gl3nn
3941b782b8 Fix for the overloaded toString() function that takes booleans as
parameter.
2014-01-18 01:07:01 +01:00
Marianne Gagnon
95103c988f respect the new flag and avoid creating animated meshes where unecessary 2014-01-17 18:55:47 -05:00
Vincent Lejeune
eb86182710 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-18 00:48:13 +01:00
Vincent Lejeune
605becfbdc OGL32CTX: Enable glsl based on GL major version. 2014-01-18 00:47:31 +01:00
Marianne Gagnon
ec40e2f7fc Undo the hack to always use tangents with LOD meshes, now that the exporter correctly exports the tangent flag 2014-01-17 18:36:38 -05:00
auriamg
18484df443 Merge pull request #4 from thelittlegumnut/Ticket_#1148
Ticket #1148
2014-01-17 15:07:48 -08:00
Vincent Lejeune
787866909d SSAO: Do not use trilinear filtering
Normals RTT is not mipmapped and thus bad things happened above a
certain value in the depth buffer because of trilinear filtering.
2014-01-17 23:59:08 +01:00
Vincent Lejeune
693e2c7e33 STKMesh: Support NormalMapped meshes. 2014-01-17 23:50:06 +01:00
Vincent Lejeune
7da65c15f0 Enable tangents on every lod instance and fix normalmap
This will increase the memory footprint of lod object,
however this is the only way I found to make meshbuffer using
GE_NORMAL_MAP to provide the necessary info to this shader.

Now the pedestal in overlord looks perfectly normal mapped.
2014-01-17 21:55:25 +01:00
Vincent Lejeune
8e1d76dd8f Throw a fatal error if we ask a normalmap effect and the underlying mesh doesnt have one. 2014-01-17 21:15:43 +01:00
Vincent Lejeune
620be813eb Forget an extra qualifier 2014-01-17 19:33:44 +01:00
Vincent Lejeune
5a5a39f586 OGL32CTX: Use the userconfig parameter to decide to use glsl.
Queried extensions does seems to disable glsl when using a core context.
2014-01-17 19:28:26 +01:00
Vincent Lejeune
2500c6cb49 Fix compilation on non VS build 2014-01-17 19:22:00 +01:00
Vincent Lejeune
ef163b29df LightPrepass: Remove Forced bloom.
This will be implemented using emissive material but our material loaders doesn't support it.
2014-01-17 19:21:23 +01:00
Vincent Lejeune
77c9289645 LightPrepass: Reenable glow pass. 2014-01-17 18:52:44 +01:00
thelittlegumnut
9730e05b1d Changed challenge completion strings. 2014-01-17 19:34:22 +11:00
gl3nn
97c19ece3c Merge branch 'master' of https://github.com/supertuxkart/stk-code.git 2014-01-17 04:58:29 +01:00
Torben Carrington
15401c0b02 Fixed music starting in menu, also corrected using the startRightNow parameter in MusicManager::startMusic() 2014-01-16 19:13:23 -08:00
vlj
6ac970d9a3 STKMesh: Use SSAO 2014-01-16 23:14:59 +01:00
Vincent Lejeune
c7fe307a52 LightPrepass: Split the rendering in 2 phases. 2014-01-16 17:51:33 +01:00
Vincent Lejeune
734f320f75 STKMesh: Filter stkmesh using stencil and disable lightblend on them. 2014-01-16 17:51:30 +01:00
Vincent Lejeune
7cda534451 STKMesh: Enable it unconditionnaly, but dont use it on shader_ref 2014-01-16 17:51:26 +01:00
hiker
da7bad92e6 Don't return error code if a file to be removed does not exist.
Improved error handling in addons.xml download.
2014-01-16 15:29:47 +11:00
Joerg Henrichs
0a1016db71 STKMesh: Some factorisation 2014-01-15 13:19:55 +11:00
Joerg Henrichs
c622ba258c Made stk-assets the default name of the assets data directory. 2014-01-15 11:56:34 +11:00
Joerg Henrichs
4f740fd6a5 Some refactoring 2014-01-15 11:51:48 +11:00
Joerg Henrichs
0464274b84 STKMesh: Fix glUniform wrong call 2014-01-15 11:51:01 +11:00
Joerg Henrichs
949877b826 Fixed compiler warning. 2014-01-15 11:49:37 +11:00
Joerg Henrichs
0adddd4401 STKMesh: Force GL_REPEAT to wrapped texture component.
It fixes bad uv in valley.
2014-01-15 11:48:40 +11:00
Joerg Henrichs
e6bfc695cb SSAO: Honor the user parameter. 2014-01-15 11:47:24 +11:00
hikerstk
9ee06a5fe0 Replaced boolstr with toString specialisation for bool;
fixed translations in current user. Otherwise many many
cosmetic only changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 11:47:25 +00:00
vincentlj
dafc30b2d0 Force blending mode for draw2d.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:31:26 +00:00
vincentlj
23d0b42b5f Light: Simplify slightly shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15069 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:24:28 +00:00
vincentlj
a5c84822cc Fix colortexturedquad shader/vertexpointer.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 01:05:03 +00:00
vincentlj
1cdb8ec8f3 OGL32CTX: Use VAO for draw2DImage, remove ALPHA_TEST as it is deprecated
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 00:00:21 +00:00
vincentlj
492dae5358 Fix windows build
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:56:59 +00:00
vincentlj
6697a2d7af Another batch of conversion to draw2DImage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:19:47 +00:00
vincentlj
c283f82729 Use draw2DImage for other components in race gui
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15063 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 23:07:29 +00:00
vincentlj
a60f549760 Fix draw2drectangle and spread use of draw2Dimage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15062 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 22:59:45 +00:00
vincentlj
43a206ff2c Characters are now black again.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 22:16:04 +00:00
vincentlj
df62ac5949 OGL32CTX: Render gui using shaders.
Font is temporarily white.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:31:47 +00:00
vincentlj
a16402e676 OGL32CTX: Missed a draw2DImage call
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:22:47 +00:00
vincentlj
6f680c1a8e OGL32CTX: Use our draw2DImage for scalable_font.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15056 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:18:40 +00:00
vincentlj
e23d9c23e9 Clean SSAO Provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 18:02:39 +00:00
vincentlj
d84bc88d47 SSAO: Use direct gl calls.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:56:05 +00:00
vincentlj
e2a6ce7889 Remove an unneeded drawAll.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15053 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:41:19 +00:00
vincentlj
959ad054de Clean Fog provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:37:33 +00:00
vincentlj
badb01c68b Use custom gl calls for fog.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 17:30:25 +00:00
vincentlj
6f2f7c480a Use direct call for some gaussian3blur invokation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15050 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:54:48 +00:00
vincentlj
f2ef95a7b5 Found another instance of PassThrough Shader usage.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:40:31 +00:00
vincentlj
4063fe83a9 Remove rain effect provider it's not used anymore.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 16:05:46 +00:00
vincentlj
c520db663f OGL32CTX: Some fixes.
The track is now displayed (even with light) but not the karts, animations...

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 15:28:37 +00:00
vincentlj
6a8396ea33 Forget a passthrough call and fix texturedquad shader.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15045 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 15:22:58 +00:00
vincentlj
3504f04a4e Remove unneeded flip shader.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15044 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:54:07 +00:00
vincentlj
7d1df19342 Use a passthrough shader for some fullscreen effect.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15043 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:50:16 +00:00
vincentlj
645d4504ab Clean GaussianBlur6 shaders.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:31:31 +00:00
vincentlj
62e5fbf6ad Use direct call for Gaussian 6 Blur.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15041 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 14:23:30 +00:00
vincentlj
9b4288b576 Lights: Clean lightblend provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15040 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:43:18 +00:00
vincentlj
a21f77706a Lights: Also use direct calls for lightblend.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15039 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:38:59 +00:00
vincentlj
4f209d38c6 Light: Readd blending so that sunlight is not killed by pointlight.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15038 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:15:51 +00:00
vincentlj
1edba6d394 Clean PointLight Provider and snow provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15037 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 13:07:12 +00:00
vincentlj
f654967b07 Lights: Use custom gl calls.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 12:56:27 +00:00
hikerstk
d53e3180ac Fixed enabling internet in the GUI (i.e. re-init of
news manager and addons manager will happen now).
For online menu a dialog is now presented to explain why 
it can't be selected if internet is disabled. Addons can
be selected with internet is disabled if there are
existing addons (so that it's possible to remove addons
without internet access).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 11:35:12 +00:00
hikerstk
428f74d859 Removed old network_http and related data structure. Its function
is now either in the addons/news_manager, or in Online::RequestManager.
Also added leack check and copy-preventing to online/Request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 05:21:48 +00:00
hikerstk
c8d066ce37 Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 03:02:08 +00:00
vincentlj
468d5458bc Clean color_level shader providers.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 00:11:31 +00:00
vincentlj
164f1dda11 Use direct gl calls for color_levels.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 00:04:53 +00:00
vincentlj
6d57947c73 Remove some leftover comments.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:52:13 +00:00
vincentlj
1da42b81a6 Remove PPDisplace provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:47:34 +00:00
vincentlj
47d7f4fdd4 Use direct gl calls for ppdisplace.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15028 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:43:00 +00:00
vincentlj
98f58d257c Clean bloom shader provider.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:27:31 +00:00
vincentlj
f8e17ecffa Use direct gl calls for BloomBlend too.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15026 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 23:19:28 +00:00
hikerstk
a49d85fa3e Replaced pop_back, which is not available on all compilers (for
std::string).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15025 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 22:43:45 +00:00
vincentlj
9968ff1ccf Use custom opengl call for bloom fullscreen shader.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 21:07:14 +00:00
auria
37851c7508 Add absolute position getter to trackobject
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 20:19:58 +00:00
vincentlj
c5edf82a6c GPUParticles: This should fix boxemitters.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15017 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 19:49:23 +00:00
vincentlj
e4dd3c9ed6 GPUParticle: Fix sudden amount of particle for boxemitter
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15015 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 18:40:04 +00:00
auria
03618a5bc5 Apply slighly modified version of patch from ticket #1121
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15013 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 18:04:00 +00:00
vincentlj
55d085bf6d STKMesh: Now use separate shader for ref/noref object
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15012 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 17:40:39 +00:00
vincentlj
8e7e84c984 STKMesh: Use VAO for faster rendering
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15011 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 17:03:02 +00:00
vincentlj
1e84b57269 STKMesh: Some improvements
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 16:25:47 +00:00
vincentlj
61003eda91 STKMesh: Some refactorisation work
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 15:53:41 +00:00
vincentlj
fda86ed45c STKMesh: Rendering in minel is working (except transparent part)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 15:27:24 +00:00
vincentlj
f6b7fb3853 Fix what looks like type
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15007 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 14:34:34 +00:00
hikerstk
b136e16f7a Preparation to remove network_http (its work will be
taken over by the reqeust manager).
Initialise news and addons manager in a separate thread
and not from the network_http thread anymore. Icons are
also downloaded now from the request manager instead
of the network_http.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15006 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 11:20:32 +00:00
vincentlj
ebaec55f4d STKMesh: Rendering works...sortof
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15002 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 00:26:18 +00:00
vincentlj
b5a9932169 STKMesh: Forget to add byref modifier
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 23:26:58 +00:00
vincentlj
15dc149799 STKMesh: Rendering implemented although it's a big red shader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15000 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 22:57:48 +00:00
vincentlj
d255f4f049 STKMesh: Some more code to load vertex data, but rendering is still using old path
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-11 18:12:04 +00:00
vincentlj
2aea7a2624 STKMesh: Add some code that just mimic CMeshNode behavior
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14998 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 22:10:21 +00:00
vincentlj
c3a4f7d8ce Use a custom stk mesh
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14997 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 21:30:17 +00:00
vincentlj
9b1853ef21 GPUParticles: Remove the unused PointEmitter class.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14996 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-10 21:12:38 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
auria
0829c150ca Simplify code to use the file manager instead of hardcoding paths
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 23:10:43 +00:00
auria
392f63d1a1 More work for library nodes. Remove some code that hardcoded search paths, let's just use our file manager for that, it does it right and easier
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 23:00:59 +00:00
vincentlj
fc5a802135 GPUParticles: Subclass CParticleSystemSceneNode to make implementation cleaner
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 22:52:32 +00:00
auria
36fc36c7fb Add initial library object loading code. Not complete yet. Samuncle, this is for you ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14840 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 22:32:30 +00:00
vincentlj
7645883508 GPUParticles: Remove PE when the particle emitter is removed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14839 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 14:10:32 +00:00
vincentlj
d4b9ccf499 GPUParticles: Particles don't follow their source.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14838 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-30 13:57:55 +00:00
vincentlj
ebb45f8de6 GPUParticles: Use an ugly hack to get correct position
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14837 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 23:55:55 +00:00
vincentlj
88f39e4186 GPUParticles: Properly handle parent for gpuparticles
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:53:28 +00:00
vincentlj
ab447c1bed GPUParticle: Disable depth write instead of disabling depth test.
It's probably faster.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14835 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:53:17 +00:00
vincentlj
ea1e5077a2 GPUParticles: Disable depth test to avoid rendering artifacts
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:26:59 +00:00
vincentlj
64fa58d198 GPUParticles: Add them to scenemanager root instead of a percamera node
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14833 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 22:26:50 +00:00
vincentlj
871e2b998b GPUParticles: Implement softness and use maxangle spread
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 20:36:21 +00:00
vincentlj
636f6412ab GPUParticles: Use some parameters, and texture, to display particles.
Still not enabled.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 19:24:19 +00:00
vincentlj
a2d1a86bac Lights: Make possible for gpu drivers to unroll loop.
GPU doesn't like indirect addressing and thus it's better to have unrolled loop. This is only possible for loop with a static iteration count.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:37:45 +00:00
vincentlj
4c725ac8f4 GPUParticles: Got PointEmitter to draw something at last.
Still WIP, uses a #ifdef to disable it but I wanted to keep a working commit
somewhere in case I mess up somewhere.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-29 18:23:36 +00:00
auria
db44852d8b Make lights fade in when they appear
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 22:02:29 +00:00
auria
ad3ea6c5e0 Remove uneeded code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 02:10:12 +00:00
auria
4c2c76088a Change pt-BR name to be more accurate
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-28 02:09:08 +00:00
auria
6b4d91effa Misc code style improvements and warning fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14819 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-27 23:56:42 +00:00
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
auria
c10ed78570 remove problematic code that crashes for some people only, will figure that out later
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 01:10:28 +00:00
auria
ae337751de Remove cand's water-wave node for now and revert back to irrlicht's for the moment. The problem with cand's is that it ignores all our material flags, which is not acceptable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 00:50:27 +00:00
auria
22d6dd56ea Undo change that would limit STK to 35 FPS
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 00:39:19 +00:00
hikerstk
bce4a075ba Added support for a texture specific minimum speed. This fixes issues with
AI karts (esp. EndController) not being able to do long jumps. Added setting
for minimum speed to Enterprise track (EndController were not able to finish
the jump on the ramp).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 22:12:14 +00:00
samuncle
1a776381d5 Correction of the ssao vs fog bug (thanks to vlj). Minor tweaks for fps display and debug menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 22:11:32 +00:00
auria
d18068f2f4 Remove forgotten debug log
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:03:59 +00:00
auria
afe826a814 Fix disabling lights on additive materials; fix disabling fog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:02:20 +00:00
auria
aa848f0afd small fixes to material
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:40:51 +00:00
auria
b27a5363bd Fix objects that are unaffected by lights
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:37:07 +00:00
samuncle
7e8159ccd6 Now the grass shader can be used with the new pipeline. Todo make a basic ubershader
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-10 01:57:20 +00:00
auria
95ffca1bf0 Remove alpha to coverage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 23:38:53 +00:00
hikerstk
0076bec269 Converted glow color back fro floating point to integers (upon artists requests).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 20:02:43 +00:00
samuncle
f2df11e5a0 Now there the FPS display has a background so it's more readable
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 14:07:42 +00:00
hikerstk
09dc33d07e Moved the glowing data from stk_config.xml to items.xml.
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:24:26 +00:00
deveee
375b1a1f06 Revert r14655. It is already fixed in r14660 and redeclaration breaks compilation.
Tested on VC2010 - it compiles and runs.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 09:50:37 +00:00
hikerstk
3af325d672 Fixed VS 2012 compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 03:15:50 +00:00
samuncle
fe2c682ed1 Use the color violet for displaying FPS. Everything related to debug/etc should be in violet
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:59:29 +00:00
samuncle
4c1dd1ada4 Minor tweak to change the background of the debug menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:28:11 +00:00
auria
aebd8d2996 Minor tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:15:54 +00:00
auria
0383a9ec55 more debug menu love
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 02:03:16 +00:00
auria
55018ee089 Extend funto's debug menu
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 01:51:03 +00:00
funto66
39046749d2 Add a debug menu + option to reload shaders (memory leak, yeah, but it's just for debugging)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 00:09:35 +00:00
auria
9a2b4cc3ab Further modularisation of rendering
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 21:27:56 +00:00