Commit Graph

11171 Commits

Author SHA1 Message Date
Vincent Lejeune
1481a110a5 Use utils function for renderbloom/blend 2014-03-30 20:49:14 +02:00
Marianne Gagnon
9a5e3d9c9c Try to handle case where addons XML file cannot be loaded 2014-03-30 11:48:38 -04:00
Marianne Gagnon
7cd93708cf Merge remote-tracking branch 'konstin/spaces' : Remove trailing spaces, use spaces and not tabs for indentation 2014-03-30 11:25:16 -04:00
Marianne Gagnon
d08e81ab56 Improve behavior when using instancing with physics objects 2014-03-29 18:39:15 -04:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
badf97dc77 whitespaces.py update 1 2014-03-29 11:32:50 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f0.
2014-03-29 11:32:04 +01:00
vlj
91c4e9de94 Fix orientations. 2014-03-29 02:19:08 +01:00
Marianne Gagnon
b7c07536f0 Merge branch 'Instancing' 2014-03-28 21:10:52 -04:00
Marianne Gagnon
d90c3753df Pass absolute rotation, not relative rotation 2014-03-28 21:05:21 -04:00
vlj
1bac60c48a Attempt to fix orientations. 2014-03-29 02:04:20 +01:00
vlj
f4eeb68fd4 Merge branch 'Instancing' 2014-03-29 01:22:57 +01:00
vlj
ca1a1e37d9 Fix normals for normal object. 2014-03-29 01:22:08 +01:00
Marianne Gagnon
fb90388e10 Apply patch by Marc Coll to improve upon his work on GP progress display 2014-03-28 19:16:56 -04:00
Marianne Gagnon
9406d69a72 Cleanup instancing nodes when cleaning track 2014-03-28 18:46:52 -04:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
konstin
233f9947ff Adding whitespaces.py, a small script for code clean 2014-03-28 20:08:02 +01:00
vlj
81b1e9fb94 Move the wind portion into the world matrix
It should make the normal correct although I didnt notice any visual difference.
2014-03-28 02:39:20 +01:00
vlj
35c8a14938 Forgot to clean some VAOs. 2014-03-28 01:55:10 +01:00
vlj
008b070aab Properly clean GL buffers in instancing node. 2014-03-28 01:43:59 +01:00
vlj
c70b9ba0f8 Explicitly build the inverse matrix
Some drivers does not support inverse function although they advertise
glsl 140 support, and it's faster  to do it manually as we know the
structure of the matrix.
2014-03-27 19:12:55 +01:00
vlj
3538fd46d2 Look like instance orientation was wrong. 2014-03-27 01:33:02 +01:00
vlj
b384716cc4 getWind() changes. 2014-03-27 01:25:04 +01:00
Marianne Gagnon
348a20288f Apply patch by Marc Coll to have better progress reports during long GPs, thanks! 2014-03-26 20:14:29 -04:00
Vincent Lejeune
1740407e1e Use GS instancing to speed up shadow gen a little. 2014-03-26 22:27:11 +01:00
Vincent Lejeune
b9d0088ff9 Parse more context in windows build. 2014-03-26 22:13:02 +01:00
Vincent Lejeune
14500d65ab Reverse order of templates in glwrapp.hpp 2014-03-26 21:18:36 +01:00
Vincent Lejeune
f49dfbc51f Fix flip particle shader. 2014-03-26 20:58:13 +01:00
Vincent Lejeune
0f451c8f9d List files when shader link fails. 2014-03-26 20:49:58 +01:00
Vincent Lejeune
9f0620c122 Add a #define to switch between dof and non dof 2014-03-26 19:42:25 +01:00
vlj
8b652ababb Merge object_pass*.vert 2014-03-26 19:04:46 +01:00
vlj
ae5c7b8c3d Implement UI single color overload 2014-03-26 19:04:45 +01:00
vlj
71881ac64d Add orientation to grass material 2014-03-25 16:49:03 +01:00
hiker
24dc70427f Fixed compiler warnings. 2014-03-25 20:54:20 +11:00
Vincent Lejeune
9fef40318e Fixes for grass instancied material. 2014-03-25 00:09:32 +01:00
Vincent Lejeune
72556fddc3 Don't use glDebugMessageCallbackARB if null 2014-03-24 21:47:24 +01:00
vlj
a866b3f416 Add Grass material support for instancing. 2014-03-24 16:40:40 +01:00
Marianne Gagnon
d798398478 Merge branch 'Instancing' of https://github.com/supertuxkart/stk-code into Instancing 2014-03-23 18:55:51 -04:00
Marianne Gagnon
bb28e26eff Cleanup for instancing 2014-03-23 18:55:45 -04:00
vlj
3423cbf60b Some fixes. 2014-03-23 20:05:51 +01:00
Vincent Lejeune
76cf04f548 Clean code to make it extendable later 2014-03-23 19:50:33 +01:00
Vincent Lejeune
5c8ef365a5 Merge instanced_object_pass vertex shaders. 2014-03-23 19:28:07 +01:00
Vincent Lejeune
5dd2d28134 Merge branch 'master' into Instancing 2014-03-23 19:20:23 +01:00
Marianne Gagnon
ae92b4007b Add initial basic support for loading instancing nodes 2014-03-22 20:55:30 -04:00
vlj
73755a3431 clamp overload was ambiguous. 2014-03-23 01:09:14 +01:00
samuncle
f7f3cb1cbe Add depth of field to the color_level shader. As vincent requested. Something cleaner need to be done 2014-03-23 00:59:06 +01:00
Marianne Gagnon
5750b860c9 Add missing icon 2014-03-22 19:49:48 -04:00
Marianne Gagnon
ce1cbd44da Use new single-color overload in font where possible 2014-03-22 19:38:48 -04:00
vlj
a21d162d5a Add an overload for draw2DImage with a single color 2014-03-23 00:29:47 +01:00
vlj
6fc2248d7a GPUParticles: some factorisation 2014-03-23 00:19:57 +01:00