 vlj
|
4e079b0e14
|
Fixes shader errors reported by Auria
|
2014-07-17 02:17:49 +02:00 |
|
|
vlj
|
23bc1f9344
|
Remove use of texture2d in rh.frag
|
2014-07-17 02:11:04 +02:00 |
|
|
vlj
|
c4238d2089
|
Use emplace_back instead of push_back(std::make_tuple())
|
2014-07-17 01:44:57 +02:00 |
|
|
vlj
|
14e3ccd059
|
Duplicate singleton code for abstract/non abstract cases
|
2014-07-17 01:30:45 +02:00 |
|
|
vlj
|
366439bdd0
|
Reenable transparents.
|
2014-07-17 01:07:59 +02:00 |
|
|
vlj
|
6e4cca81d1
|
Fix material identification.
|
2014-07-17 01:06:17 +02:00 |
|
|
vlj
|
25c5fb326f
|
Do not use srgb texture for splatting.
|
2014-07-17 00:56:11 +02:00 |
|
|
vlj
|
6710f61863
|
Do not convert normal map to srgb.
|
2014-07-17 00:46:17 +02:00 |
|
|
vlj
|
be55a1a1c6
|
Reenable normal map material.
|
2014-07-17 00:36:10 +02:00 |
|
|
vlj
|
f5a5988967
|
Fix instanced and reenable displace.
|
2014-07-17 00:24:09 +02:00 |
|
|
vlj
|
40a7ab0780
|
Raise one of ssao tolerance value.
|
2014-07-17 00:12:54 +02:00 |
|
|
vlj
|
e6bade24ad
|
Fix RSM
|
2014-07-17 00:10:34 +02:00 |
|
|
vlj
|
55ab93a4e6
|
More work.
|
2014-07-16 23:44:16 +02:00 |
|
|
vlj
|
1d0fb9ca68
|
Simplify material
|
2014-07-16 23:15:07 +02:00 |
|
|
vlj
|
27020c0c92
|
Move draw template function to render_geometry.cpp
|
2014-07-16 21:38:38 +02:00 |
|
|
vlj
|
1aa43814b0
|
Partially unroll template for grass shadow.
|
2014-07-16 19:41:28 +02:00 |
|
|
vlj
|
b79cebba40
|
Use singleton template again.
|
2014-07-16 00:16:57 +02:00 |
|
|
vlj
|
82b5097391
|
Turn pass1 shaders to singleton template.
|
2014-07-15 02:43:27 +02:00 |
|
|
vlj
|
5e0fb8dcf7
|
Use the singleton template
|
2014-07-15 02:15:12 +02:00 |
|
|
vlj
|
c06879a8b4
|
Fix animated transparent texture.
|
2014-07-15 00:03:33 +02:00 |
|
|
vlj
|
9230cab9dd
|
Add shadow for instanced grass.
|
2014-07-15 00:02:17 +02:00 |
|
|
vlj
|
146e99b13d
|
Port instanced shadow shaders to singleton.
|
2014-07-14 23:49:00 +02:00 |
|
|
vlj
|
ffe77e4aa4
|
Port instanced pass2 shaders to singleton
|
2014-07-14 23:41:47 +02:00 |
|
|
vlj
|
098eb7f595
|
Port remaining pass 1 Instanced shaders to singleton
|
2014-07-14 23:25:52 +02:00 |
|
|
vlj
|
732aefc2dc
|
Turn instanced pass1 shader to singleton.
|
2014-07-14 23:14:20 +02:00 |
|
|
vlj
|
5838af5f3e
|
Remove useless function.
|
2014-07-14 23:13:33 +02:00 |
|
|
Vincent Lejeune
|
e310ad5628
|
Move skybox/lights code out of render.cpp
|
2014-07-14 19:44:11 +02:00 |
|
|
Vincent Lejeune
|
62bf54b8f3
|
Simplify displace handling
Should be faster now
|
2014-07-14 18:54:40 +02:00 |
|
|
Vincent Lejeune
|
d52d1c0409
|
oops
|
2014-07-14 18:52:41 +02:00 |
|
|
Vincent Lejeune
|
160d8c1634
|
Fix linux build
|
2014-07-14 18:51:01 +02:00 |
|
|
Vincent Lejeune
|
d035b86bc4
|
Turn displace shaders into singleton.
|
2014-07-14 18:42:19 +02:00 |
|
|
vlj
|
db4457655b
|
Fix for real torch in chocolate.
|
2014-07-14 03:00:46 +02:00 |
|
|
vlj
|
b186bc7f18
|
Try to fix chocolate torch displaced effect.
|
2014-07-14 02:25:04 +02:00 |
|
|
vlj
|
f1ddf87a5f
|
Plugin displacement material.
|
2014-07-14 02:25:03 +02:00 |
|
|
vlj
|
d0f6e54bba
|
Add a isDisplacement bool
|
2014-07-14 00:35:23 +02:00 |
|
|
Vincent Lejeune
|
4e1fd9b4af
|
Move geometry rendering code to another file.
|
2014-07-13 21:49:25 +02:00 |
|
|
Vincent Lejeune
|
f2acac7230
|
Inadverly inverted shadow and shadow_grass.vert
|
2014-07-13 21:37:12 +02:00 |
|
|
Vincent Lejeune
|
54b1ce39e4
|
Add Grass shadows.
For non instancing object.
|
2014-07-13 21:33:44 +02:00 |
|
|
Vincent Lejeune
|
b2fc9eb682
|
Turn shadow shaders into singletons.
|
2014-07-13 21:08:49 +02:00 |
|
|
Vincent Lejeune
|
7b9fc60f9c
|
Factorise grass material
|
2014-07-13 18:56:17 +02:00 |
|
|
Vincent Lejeune
|
adba84969e
|
Remove unneeded templates
|
2014-07-13 17:58:51 +02:00 |
|
|
Vincent Lejeune
|
67ab653aa0
|
Wrap setUniformsHelper inside a struct
|
2014-07-13 17:58:39 +02:00 |
|
|
vlj
|
d5bc6819fe
|
Factorize splatting shader.
|
2014-07-13 11:33:44 +02:00 |
|
|
vlj
|
c71a2c131f
|
Factorize transparent shaders.
|
2014-07-13 11:25:31 +02:00 |
|
|
vlj
|
8ec57b7683
|
Factorize unlit shader.
|
2014-07-13 02:39:33 +02:00 |
|
|
vlj
|
fbcc430e0e
|
Fix linux build.
|
2014-07-13 02:33:17 +02:00 |
|
|
vlj
|
fd7427a1cf
|
Factorize detail and spheremap
|
2014-07-13 02:30:37 +02:00 |
|
|
vlj
|
12af5eee9a
|
Factorize some pass2 shaders init code
|
2014-07-13 02:18:20 +02:00 |
|
|
vlj
|
a249ee8835
|
Add userconfig param
|
2014-07-13 01:34:20 +02:00 |
|
|
vlj
|
cc24407f09
|
Try another (dirty) fix.
|
2014-07-13 01:30:00 +02:00 |
|
|
vlj
|
6d643d973c
|
try to fix shader.hpp.
|
2014-07-13 01:23:49 +02:00 |
|
|
vlj
|
ff2ebfe731
|
Try to fix linux compilation.
|
2014-07-13 01:13:09 +02:00 |
|
|
vlj
|
22be386247
|
Turn Pass 1 shader to singleton, and factorize the setUniforms.
|
2014-07-13 01:10:28 +02:00 |
|
|
vlj
|
ef1bca5424
|
Try to factorize shader using variadic templates.
|
2014-07-13 00:11:35 +02:00 |
|
|
Vincent Lejeune
|
55a5185796
|
Avoid drawing negative color with splatting material.
|
2014-07-12 21:25:11 +02:00 |
|
|
Vincent Lejeune
|
de5499401c
|
Factorize splatting material.
|
2014-07-12 21:15:43 +02:00 |
|
|
Vincent Lejeune
|
97971a11b9
|
Fix RSM
|
2014-07-12 21:06:34 +02:00 |
|
|
Vincent Lejeune
|
ff92825531
|
Fix shadows.
|
2014-07-12 20:58:00 +02:00 |
|
|
Vincent Lejeune
|
df2595f594
|
Some shader factorization
|
2014-07-12 20:31:54 +02:00 |
|
|
Vincent Lejeune
|
51a9a215b6
|
Use a default texture for rubber band
|
2014-07-12 20:24:28 +02:00 |
|
|
Vincent Lejeune
|
d7139920ed
|
Fix position reconstruction formula in ssao
|
2014-07-12 19:54:52 +02:00 |
|
|
vlj
|
e62301c9f6
|
Merge branch 'renderFactorisation'
|
2014-07-12 01:20:19 +02:00 |
|
|
vlj
|
2e1da31278
|
Wrong condition used.
|
2014-07-12 01:19:12 +02:00 |
|
|
vlj
|
8612e49072
|
Early exit renderSkybox without skybox textures
|
2014-07-12 00:57:37 +02:00 |
|
|
vlj
|
a17e4c47f9
|
Disable WIIUSE by default on linux.
|
2014-07-12 00:46:19 +02:00 |
|
|
vlj
|
ba38819fff
|
Enable CPP2011 on linux.
|
2014-07-12 00:38:03 +02:00 |
|
|
vlj
|
e44f68afa2
|
Factorize all first pass materials.
|
2014-07-12 00:21:30 +02:00 |
|
|
Vincent Lejeune
|
5acc53685c
|
Use const ref in recursive variadic template unroll_arg<>::exec
|
2014-07-11 20:39:20 +02:00 |
|
|
Vincent Lejeune
|
3a4cc63602
|
Factorize transparent materials too
|
2014-07-11 20:10:21 +02:00 |
|
|
Vincent Lejeune
|
ebc0d956d4
|
Fix linux compilation
|
2014-07-11 19:32:43 +02:00 |
|
|
Vincent Lejeune
|
04e9daeefd
|
Factorize detail mat too
|
2014-07-11 01:27:20 +02:00 |
|
|
Vincent Lejeune
|
f723a764fc
|
Factorize Unlit material
|
2014-07-11 00:39:20 +02:00 |
|
|
Vincent Lejeune
|
555b2c433c
|
Factorize spheremap too.
|
2014-07-10 22:32:12 +02:00 |
|
|
Vincent Lejeune
|
7f8331a5b5
|
Use variadic recursion to expand tuples
It's quite non trivial to do but it should save a lot of typing later.
|
2014-07-10 22:19:20 +02:00 |
|
|
vlj
|
c2f7c14fdb
|
Try to factorize using tuple
|
2014-07-10 18:49:17 +02:00 |
|
|
vlj
|
feda837de8
|
Factorize some rendering loops.
|
2014-07-10 18:11:35 +02:00 |
|
|
vlj
|
87e07a83d5
|
Factorize and comment generateCubemapFromTextures
|
2014-07-10 01:29:38 +02:00 |
|
|
vlj
|
822c8725dd
|
Remove rimlight material
|
2014-07-10 01:02:52 +02:00 |
|
|
Vincent Lejeune
|
0e4b9040d6
|
Factorize a function and add proper doxy comment.
|
2014-07-10 00:38:13 +02:00 |
|
|
vlj
|
1324fa7b36
|
Readd support for 2tcoord vtx in rsm.
|
2014-07-09 18:06:24 +02:00 |
|
|
vlj
|
114b3f8830
|
Remove unused methods
|
2014-07-09 18:02:25 +02:00 |
|
|
vlj
|
7a989901e8
|
Fix ssao viz on nvidia.
|
2014-07-09 18:00:16 +02:00 |
|
|
vlj
|
481a5bd0d0
|
Fix bubble shader with glsl < 330.
|
2014-07-09 17:49:47 +02:00 |
|
|
vlj
|
5ee410c139
|
Use a default texture for transparent if not provided.
|
2014-07-09 17:47:09 +02:00 |
|
|
vlj
|
2c251ffaa4
|
Fix slip stream effect.
|
2014-07-09 03:59:21 +02:00 |
|
|
vlj
|
4c3db6ca59
|
Mix texture for displace.
|
2014-07-09 03:41:08 +02:00 |
|
|
vlj
|
25b5134881
|
Hack not to add displacement node to scene manager
|
2014-07-09 03:20:31 +02:00 |
|
|
vlj
|
9922047dd1
|
Do not ask GL vendor/renderer in no graphic mode.
|
2014-07-09 02:57:36 +02:00 |
|
|
Vincent Lejeune
|
ac55a70c83
|
Mimic previous motion blur behavior
Depending on zypper + mask on center.
|
2014-07-09 02:29:49 +02:00 |
|
|
Vincent Lejeune
|
aec31b28dd
|
Merge remote-tracking branch 'origin/VAOGatherer'
|
2014-07-09 02:17:25 +02:00 |
|
|
Vincent Lejeune
|
6d7178aff5
|
Fix for missing texture with non advanced pipeline
|
2014-07-09 00:26:28 +02:00 |
|
|
vlj
|
6276cafba2
|
Use global VAO for rendering
|
2014-07-08 18:31:46 +02:00 |
|
|
Vincent Lejeune
|
afd97345f7
|
Add a global VAO manager
|
2014-07-08 18:31:45 +02:00 |
|
|
Vincent Lejeune
|
0a7e1312b5
|
Support for glDrawElements{Instanced}?BaseVertex
|
2014-07-08 18:31:45 +02:00 |
|
|
Vincent Lejeune
|
887438a0d0
|
Reduce blur amount
|
2014-07-08 02:37:00 +02:00 |
|
|
Vincent Lejeune
|
d961a9a8bc
|
Fix vertex color for object_pass2
|
2014-07-08 01:35:04 +02:00 |
|
|
vlj
|
7bf6d4db8b
|
Change location where srgb fbo is disabled.
|
2014-07-08 00:24:21 +02:00 |
|
|
Vincent Lejeune
|
23bebff5c2
|
Forgot to add shaders.cpp to last commit
|
2014-07-07 19:33:01 +02:00 |
|
|
Vincent Lejeune
|
746e910e46
|
Remove some Motion Blur unused vars
|
2014-07-07 19:25:41 +02:00 |
|
|
Vincent Lejeune
|
f23f7b05e5
|
Turn motion blur into camera space motion blur
|
2014-07-07 18:44:25 +02:00 |
|