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

7634 Commits

Author SHA1 Message Date
Vincent Lejeune
e93cfd8b8e Also factorize particles related state changes. 2014-01-29 02:18:19 +01:00
Vincent Lejeune
a9258500b8 Factorize displace and glow state changes. 2014-01-29 02:08:52 +01:00
Vincent Lejeune
4c7ba19642 This shouldnt be there 2014-01-29 01:57:56 +01:00
Vincent Lejeune
5ae0d2f4dc Factorize solid state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
c6e466fdcc Factorise transparent state changes. 2014-01-29 01:57:55 +01:00
Vincent Lejeune
57808f0815 Disable water, bgnodes and textbillboards. 2014-01-29 01:57:34 +01:00
Vincent Lejeune
8b46454859 Add an assertion 2014-01-29 01:35:43 +01:00
Vincent Lejeune
1fa0a9e9cc Display unhandled materials in debug mode 2014-01-29 01:35:43 +01:00
Vincent Lejeune
c994ed720d Fix a typo 2014-01-29 01:33:07 +01:00
Vincent Lejeune
e9d995504d Fix normal maps 2014-01-29 01:21:53 +01:00
auriamg
35405e43b8 Merge pull request #15 from sachith500/master 
Ticket #1149 - clarify story mode for players.
 2014-01-28 15:01:48 -08:00
Vincent Lejeune
098303dced GPUParticles: Use transparent_effect pass 2014-01-28 21:40:53 +01:00
Vincent Lejeune
5be8dbedab Increase buffer size in displayfps 2014-01-28 21:35:12 +01:00
Vincent Lejeune
fd968a0acf OGL32CTX: Factorize UI shaders 
This should fix UI disappearing after resolution change.
 2014-01-28 21:26:16 +01:00
Vincent Lejeune
9955aa6970 STKMeshes: Support for transparent_add_color mat 2014-01-28 20:12:56 +01:00
Vincent Lejeune
143e3a355d Display rendered objects count instead of ktris. 
Things go well untill we have more than 200 objects on my system, no
matter how big they are.
 2014-01-28 20:05:16 +01:00
Sachith Hasaranga Seneviratne
e50c902bf2 Ticket #1149 
Message in story mode now additionally points players to the minimap.

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
 2014-01-28 21:51:46 +05:30
hiker
9192557cd4 Merge branch 'resoCrashFix' of https://github.com/KristofDM/stk-code into KristofDM-resoCrashFix 2014-01-28 22:00:32 +11:00
hiker
1709ccc36d Started to set the gravity for selected material based on the 
normal of the triangle where the kart is on.
 2014-01-28 21:42:23 +11:00
Marianne Gagnon
f1f8900c5d Add a couple profiler markers 2014-01-27 18:59:53 -05:00
Vincent Lejeune
f50e6f817d Use another normal encoding method from a crytek slide. 2014-01-27 23:29:46 +01:00
Vincent Lejeune
d642bc1489 Lightprepass: Only store normals in rtt 
Use a more economical rtt format.
 2014-01-27 21:47:25 +01:00
Vincent Lejeune
0bbba17e5e STKBillboard: Fix a typo 2014-01-27 20:33:56 +01:00
Vincent Lejeune
22ccf3bab3 GPUParticle: Use depthbuffer 2014-01-27 20:33:21 +01:00
Vincent Lejeune
dbcf60003b SunLight: Use DepthBuffer 2014-01-27 20:25:45 +01:00
Vincent Lejeune
ecac127dd6 Fog: Use depthbuffer. 2014-01-27 20:25:19 +01:00
Vincent Lejeune
bc57d246e7 Fog: Factorize setUnifors() 2014-01-27 20:25:07 +01:00
Vincent Lejeune
0b531b20f7 SSAO: Use depth buffer. 2014-01-27 20:24:57 +01:00
Vincent Lejeune
5515f51f65 SSAO: Factorize setUniforms() 2014-01-27 20:24:47 +01:00
Vincent Lejeune
5e68334ce9 PointLight: Use depthbuffer 2014-01-27 20:22:01 +01:00
Vincent Lejeune
ac25b2b8b7 PointLight: Factorize setUniforms 2014-01-27 20:21:51 +01:00
KristofDM
fca20ae088 Final fix for issue #13. 2014-01-27 18:14:50 +01:00
Vincent Lejeune
c77ffb1882 STKBillboard: Create new SceneNode wrapper. 2014-01-27 17:33:08 +01:00
Marianne Gagnon
9c29ae0b26 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-26 19:21:50 -05:00
Marianne Gagnon
601726db70 Fix harmless GCC warning 2014-01-26 19:21:07 -05:00
Vincent Lejeune
8a04c48cec Reset skybox texture when loading track. 2014-01-27 01:14:20 +01:00
Vincent Lejeune
684d265924 SSAO: Disable alpha test and simplify code 2014-01-27 00:53:52 +01:00
Vincent Lejeune
63882318a7 SSAO: Fix typo and use 16 samples 2014-01-27 00:47:35 +01:00
Vincent Lejeune
31991ecd7e SSAO: Improve randomness using NEAREST filtering 2014-01-27 00:09:36 +01:00
Vincent Lejeune
bf22a1122b GPUParticles: Force alpha additive for flip particles 2014-01-26 23:34:21 +01:00
Vincent Lejeune
a6c9f11374 SSAO: Use sampling points proposed by Auria. 2014-01-26 23:17:32 +01:00
Vincent Lejeune
270c2e2c52 Lightprepass: Handle skybox ourselves 2014-01-26 23:00:17 +01:00
hiker
41a9b14859 Fixed missing collisions in mansionl (caused by negative default mass 
for objects). Added assert to bullet to catch this kind of problem early.
 2014-01-26 23:36:44 +11:00
Marianne Gagnon
30011be115 My tweaks to SSAO, to improve randomness and final blending 2014-01-25 22:03:47 -05:00
hiker
083c2d42bd Properly fixed position of physical bodies when they are animated 
(thanks to auria).
 2014-01-26 13:35:35 +11:00
Marianne Gagnon
3d054ea91b Bunch of small code cleanup 2014-01-25 21:05:07 -05:00
auriamg
4355c6450e Merge pull request #12 from KroArtem/master 
fix some cppcheck warnings
 2014-01-25 17:23:24 -08:00
Vincent Lejeune
8b5df4143f Fix attempt for black objects. 2014-01-26 01:56:08 +01:00
Vincent Lejeune
88561aa838 STKMesh: Implement (single) texture detail support for objectpass shaded objects. 2014-01-26 01:33:13 +01:00
Vincent Lejeune
2e994502e3 Properly handle unlit object. 2014-01-26 01:09:25 +01:00
KroArtem
fe9cd74934 fix some cppcheck warnings 2014-01-25 23:21:12 +04:00
Vincent Lejeune
06ba2fcb6a STKMesh: Use transparent shader for onttextureblend 2014-01-25 23:09:00 +01:00
Vincent Lejeune
f287cc611d STKMesh: Factorize transparents for reusability 2014-01-25 23:07:07 +01:00
Vincent Lejeune
2e6f95712c Use named passes 2014-01-25 23:02:24 +01:00
Vincent Lejeune
e6c419e695 SSAO: Improve the initial sampling values. 2014-01-25 22:59:09 +01:00
Vincent Lejeune
724aed6609 STKMesh may want to draw rimlimit materials 2014-01-25 22:57:51 +01:00
Marianne Gagnon
825ee2fdfe Fix compilation 2014-01-24 21:02:21 -05:00
Marianne Gagnon
77f36e3e2f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-24 19:13:59 -05:00
Marianne Gagnon
07eba6dfd7 Minor profiler updates 2014-01-24 19:13:53 -05:00
Vincent Lejeune
00b6705624 Revert "Factorize GL state changes to get better performances." 
This reverts commit 17be149e02.
 2014-01-25 01:05:10 +01:00
Vincent Lejeune
17be149e02 Factorize GL state changes to get better performances. 2014-01-25 00:58:35 +01:00
Marianne Gagnon
8295a1e226 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-24 18:49:56 -05:00
Marianne Gagnon
190cc9fa9a Clarify a couple error messages 2014-01-24 18:48:40 -05:00
hiker
8389f4afb6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-25 10:41:00 +11:00
Marianne Gagnon
878d0dcf05 Improve profiler a bit 2014-01-24 18:38:47 -05:00
Vincent Lejeune
c7b2f82e8f Revert "Move final blit in renderGLSL instead of pp" 
This reverts commit 16d87cf820.
 2014-01-25 00:22:44 +01:00
Vincent Lejeune
16d87cf820 Move final blit in renderGLSL instead of pp 2014-01-24 21:37:34 +01:00
Vincent Lejeune
a8ce8c9344 STKAnimatedMesh: Fix setMesh. 
We don't clean our vram however.
 2014-01-24 21:12:55 +01:00
Vincent Lejeune
324c1c1e95 STKMesh: Properly handle setMesh 2014-01-24 21:07:49 +01:00
Vincent Lejeune
c9ecaffb2b STKAnimatedMesh: First pass id is 0, not 1 2014-01-24 20:34:23 +01:00
Vincent Lejeune
8bd6d7945c STKAnimatedMesh: Support for rimlit karts 2014-01-24 20:29:54 +01:00
hiker
fb8347e135 When the physics are updated from the graphics, subtract the 
graphical offset again to make sure physics and graphics are in sync.
 2014-01-24 23:46:52 +11:00
hiker
93cb4b2090 The position and rotation of an IPO animated physical object from a library 
must be transformed by the transform of its (graphical) parent (only library
nodes have a graphical parents) to be correct.
 2014-01-24 23:44:46 +11:00
hiker
9651a9f224 Minor code cleanup, renamed a variable and function. 2014-01-24 22:25:55 +11:00
Vincent Lejeune
a257c1a35c STKAnimatedMesh: 
Avoid copying mesh in the second pass.
 2014-01-24 00:19:10 +01:00
Vincent Lejeune
b362185593 STKAnimatedMesh: Plug the Light prepass system 
Now animated object are rendered like static object with our pipelines.
rimlimit shader needs to be ported though.
 2014-01-23 23:26:43 +01:00
Vincent Lejeune
24fa173c60 STKMesh: Staticify draw function for reusability. 2014-01-23 22:12:03 +01:00
Vincent Lejeune
176e46e5a9 STKAnimatedMesh: Uses custom render. 
But not direct gl draw call yet.
 2014-01-23 21:35:56 +01:00
Vincent Lejeune
b738b1eab3 Revert fog move after transparent pass. 2014-01-23 20:17:17 +01:00
Vincent Lejeune
12f961ee97 Fix lightviz always actived 2014-01-23 20:15:29 +01:00
Vincent Lejeune
f60af23ecd LightPrepass: Disable light on non stkmeshes 2014-01-23 20:05:35 +01:00
Vincent Lejeune
4ebb0ee8d8 OGL32CTX: Fix minimap/kart selection orientation 2014-01-23 20:05:07 +01:00
Vincent Lejeune
9a5bf69ca8 STKMesh: Add an animated variant 
Not customised atm.
 2014-01-23 19:14:13 +01:00
hiker
2bfdfc0373 Fixed crash when trying to vote. 2014-01-23 13:25:50 +11:00
hiker
6066dba9d0 Fixed compiler error. 2014-01-23 13:24:08 +11:00
Marianne Gagnon
70fed45ec1 Fix skin crash 2014-01-22 20:15:35 -05:00
Marianne Gagnon
069f15937a Improve profiler a little 2014-01-22 19:40:40 -05:00
Marianne Gagnon
1d2473e585 Colorize profiler bars so we can see something 2014-01-22 19:21:45 -05:00
Marianne Gagnon
583092bbf8 Don't return pointer to temporary object 2014-01-22 19:03:55 -05:00
hiker
1e721906e7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-23 09:55:52 +11:00
hiker
57ff391cc3 Re-enable voting for addons. 2014-01-23 09:55:32 +11:00
hiker
d4b95e81b4 Moved hash function from StringUtils into player, there is no 
other use of that function.
 2014-01-23 09:54:48 +11:00
Vincent Lejeune
66894dfeaf LightPrepass: Reenable light debug view 2014-01-22 23:11:49 +01:00
Vincent Lejeune
fc9144786b Use texture swizzle when SSAO is disabled 2014-01-22 22:52:46 +01:00
Vincent Lejeune
d13032ca9b STKMesh: Support for untextured object 
The color are not the correct one though...
 2014-01-22 18:47:22 +01:00
hiker
6b27179b96 Added missing initialisation, some cosmetic changes. 2014-01-22 17:26:03 +11:00
hiker
c72544b49d Added missing calls to Screen::init(). 2014-01-22 16:54:57 +11:00
hiker
476d7db741 Disable online/login widget while login/logout are in progress (to 
avoid race conditions, i.e. a new login arriving at server before
previous logout was processed).
 2014-01-22 16:43:59 +11:00
hiker
2821913b47 Go back to main menu when login out. 2014-01-22 16:34:45 +11:00
Vincent Lejeune
23e5a6c304 Fix kart selection upside down bug 2014-01-22 03:26:04 +01:00
Vincent Lejeune
0926c7be51 Fix Water 2014-01-22 03:16:01 +01:00
Vincent Lejeune
3410b3df6f OGL32CTX: Fix mipmap in gui 2014-01-22 02:11:28 +01:00
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