1
0
Fork 0
Commit graph

260 commits

Author SHA1 Message Date
Frederic Bouvier
3ac767a974 SSAO: Special case for ATI owners 2012-07-14 11:48:08 +02:00
Frederic Bouvier
48c9664e83 Remove unnecessary unsigned keyword and dependancy on GL_EXT_gpu_shader4 extension 2012-07-13 19:32:31 +02:00
Emilian Huminiuc
6a992c65d6 Fix overdark runway in rembrandt
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-13 18:47:19 +03:00
Emilian Huminiuc
fb58a3211f some tweaks to runway shader
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-13 17:53:00 +03:00
Frederic Bouvier
129eefcc3e Improve light reflections on water 2012-07-13 14:46:31 +02:00
Frederic Bouvier
fd4f42da0f Fix 'Phong distortion' artifact on specular lighting and shininess factor on additional lights in Rembrandt 2012-07-12 00:31:22 +02:00
Frederic Bouvier
d06e249f16 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt 2012-07-11 23:59:10 +02:00
Emilian Huminiuc
9d49f9643f Make water-inland.eff Rembrandt compatible.
Fix a longstanding ati bug in transition.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 15:58:42 +03:00
Stuart Buchanan
ab21e069f7 Correct atmospheric scattering for trees, where we were applying ambient lighting twice, making them too dark, and not using an alpha test.
Also fix the tropical trees, where only half the texture was defined.
2012-07-02 23:27:44 +01:00
Emilian Huminiuc
8174ea8593 More transition.frag cleanups
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-02 23:34:00 +03:00
Emilian Huminiuc
a31dfa779e Cleanup a bit the transition shaders
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-02 23:17:17 +03:00
Emilian Huminiuc
a76a84d287 fix runway shader normals in Rembrandt.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-01 23:20:02 +03:00
Stuart Buchanan
145a759fb8 Add support for atmospheric scattering to the random vegetation shader. 2012-06-30 00:38:14 +01:00
Emilian Huminiuc
8fa569e77f make transition effect Rembrandt compatible.
Note: this is the transition effect used by the materials-dds.xml
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-28 23:43:08 +03:00
Emilian Huminiuc
c001b6d679 transition.frag: fix shading
ubershader.frag: fix ambient
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-28 14:37:45 +03:00
Frederic Bouvier
59e0f41283 Get rid of TexGen magic and do the projective texturing for shadow mapping ourself 2012-06-27 21:04:51 +02:00
Frederic Bouvier
4e241640b6 Add a bloom strength property and a slider in the Rembrandt dialog 2012-06-26 09:02:21 +02:00
Emilian Huminiuc
f6b74fc128 Add material ID to provide increased specular effect in Rembrandt for water and ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-26 02:18:00 +03:00
Emilian Huminiuc
ce18b24ba9 fix water specular with Rembrandt
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-25 21:15:32 +03:00
Emilian Huminiuc
eeefbc596b Fix wrong water-gbuffer.frag from previous commit
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-24 20:37:34 +03:00
Emilian Huminiuc
174f40d52b Adapt water shader to Rembrandt
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-24 20:18:46 +03:00
Emilian Huminiuc
333d70aeca Make runway shader work with Rembrandt
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-23 23:13:49 +03:00
Emilian Huminiuc
42e4428f8d adapt water_lightfield shader to the previous changes
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-16 21:27:59 +03:00
Emilian Huminiuc
6ef4f5eca0 Make water efect use png textures by default, and rely on their dds counterparts only when using the dds materials file.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-16 18:57:14 +03:00
Flightgear Development
23536748f7 Terrain haze bugfixes 2012-06-11 20:23:31 +02:00
Frederic Bouvier
1932ddb014 Allow to select debugged buffers in Rembrandt 2012-05-18 12:42:34 +02:00
Frederic Bouvier
58c5a389ce Allow to adjust ambient occlusion strength 2012-05-18 09:00:48 +02:00
Emilian Huminiuc
e21807bb33 formatting cleanup
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-17 20:16:29 +03:00
Frederic Bouvier
41ff7da797 Show bloom buffer 2012-05-12 23:38:40 +02:00
Frederic Bouvier
be5a51ec5d Bloom effect for the Rembrandt renderer 2012-05-12 13:06:45 +02:00
Frederic Bouvier
2163651c43 Avoid duplication of fullscreen vertex shader 2012-05-12 11:47:18 +02:00
Frederic Bouvier
1a5cc682a9 Add condition on ambient occlusion and a menu item to switch it on and off if the stage is enabled in the pipeline 2012-05-12 09:20:13 +02:00
Frederic Bouvier
961219a091 Add ambient occlusion to default pipeline 2012-05-12 09:20:09 +02:00
Frederic Bouvier
140263d611 Screen space ambient occlusion effect 2012-05-12 09:20:07 +02:00
Frederic Bouvier
c5732c38ba Generic blur effect 2012-05-12 09:20:05 +02:00
Vivian Meazza
f0d21c1f60 Optimisation and tidying
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 19:11:34 +01:00
Vivian Meazza
0a8f9d71c3 Tidy up
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 17:22:15 +01:00
Vivian Meazza
b6fd097920 Opotimize in line with water shaders
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 12:46:25 +01:00
Vivian Meazza
0235f95ed5 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-05-05 20:07:43 +01:00
Vivian Meazza
9657518663 Optimise water shaders after ideas and suggestions by Thorsten Renk
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-05 19:59:22 +01:00
Frederic Bouvier
3fc1a36201 Fix a shader problem. It seems a bad idea to set gl_FragData in a conditional block. It seems better to assign a value unconditionally even if there is no buffer attached. 2012-05-05 00:10:56 +02:00
Frederic Bouvier
7e1ed19307 Put encode_gbuffer in a separate shader to please ATI and/or Mac OSX that doesn't like to have gl_FragData and gl_FragColor in the same program, even if one is never called 2012-05-04 09:34:00 +02:00
Emilian Huminiuc
f26472f614 Remove useless include_fog.vert from some of the effects.
Fis c/p error in ubershader-deferred.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-03 00:01:59 +03:00
Stuart Buchanan
de70c6404e Emissive lighting for random buildings. Part 1. 2012-05-01 22:35:10 +01:00
Emilian Huminiuc
5fbc5bddf6 Ubershader: some spring cleaning, readability
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-01 15:03:18 +03:00
Frederic Bouvier
6775ecdfd2 Display the depth buffer when stored in a color texture 2012-05-01 09:34:14 +02:00
Frederic Bouvier
6be18a5c99 Add the ability to record depth in color buffer. This should solve depth buffer resolution problem for older NVidia cards. 2012-05-01 08:47:38 +02:00
Frederic Bouvier
76a11c2d48 Fix bug #750: allow cards or drivers not supporting dynamic indexing in fragment shaders to have simple shadows 2012-04-29 13:35:30 +02:00
Frederic Bouvier
72be8cdcf7 Merge commit 'refs/merge-requests/99' of git://gitorious.org/fg/fgdata into thorsten/haze_1.3 2012-04-27 08:29:03 +02:00
Frederic Bouvier
ef9f0d222d Remove incomplete and unused shaders 2012-04-26 20:49:01 +02:00