fly/fgdata
1
0
Fork 0
Code Activity
6759 commits 7 branches 0 tags 4.4 GiB
Commit graph

343 commits

Author SHA1 Message Date
Stuart Buchanan
cb1ce70688 Increase opacity of clouds, discard transparent fragments. 2012-12-05 21:37:16 +00:00
Stuart Buchanan
6d9168150d Fix random buildings after latest procedural texture changes. 2012-12-05 20:31:50 +00:00
Thorsten Renk
ed80612c98 Atmospheric Light Scattering update 2012-12-05 20:31:27 +00:00
Stuart Buchanan
d722d98164 Fix urban shader, broken by 9e8735c64996614174d2d86526f258f44bacd7c4 2012-12-01 20:51:30 +00:00
Thorsten Renk
3c1ee0527b Shader updates 2012-10-06 21:13:50 +01:00
Emilian Huminiuc
6e8f1b7fee Restore the foam to the Rembrandt water shader 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-10-06 14:14:27 +03:00
Stuart Buchanan
65dbc4cc0b Remove hardcoded maximum snow level. Now configured via Environment Settings. 2012-10-05 22:13:24 +01:00
Emilian Huminiuc
d1a44f10b7 Restore random buildings reflection. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-14 00:12:05 +03:00
Stuart Buchanan
2f0a1683b7 Improve memory and instantiation time of random buildings. 2012-09-12 22:46:03 +01:00
Emilian Huminiuc
efe52f4bf9 ubershader: fix reflection under Rembrandt 
model-combined & model-combined-deferred effects: improve Rembrandt behaviour, and provide better effects for transparent
surfaces under Rembrandt.

This change breaks current effects using normalmaps when inheriting from model-combined-deferred under
Rembrandt.
Aircraft developers please change the technique numbers in the "normalmap include" part of your effects file from
<technique n="8"> to <technique n="7"> (again, only if inheriting from model-combined-deferred, and using normalmaps)

Effects inheriting from model-combined do not neeed any adaptation.

Sorry for the nuisance caused by this change.

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-09 13:54:07 +03:00
Emilian Huminiuc
cc770cecb7 restore transition.frag that got broken 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-20 13:42:16 +03:00
Vivian Meazza
b3922c08c1 Merge branch 'master' of D:\Git_New\fgdata 2012-08-19 21:55:51 +01:00
Emilian Huminiuc
7d883b3db1 ubershader: reenable ambient-correction under Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-19 23:40:32 +03:00
Vivian Meazza
d09a45837f Merge branch 'master' of D:\Git_New\fgdata 
Conflicts:
	Shaders/transition.frag

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-08-14 00:06:15 +01:00
Emilian Huminiuc
00c352f235 Hopefuly fix yet another weird behaviour on ATI gpus (take two) 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 23:58:12 +01:00
Emilian Huminiuc
56d84d24da Hopefuly fix yet another weird behaviour on ATI gpus 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 16:50:03 +03:00
Stuart Buchanan
4ec24853a8 Create an Environment Settings dialog for non-weather environment settings 
such as snow level, dust, wetness, and texture set.

Also add a parameter to control whether the snow level moves with METAR,
and retire /environment/mysnow-level-m.
 2012-08-09 22:52:51 +01:00
Frederic Bouvier
c20b4b1fbb No code change - Improve readability by reindenting files 2012-08-08 09:03:00 +02:00
Thorsten Renk
9be134b34d Procedural Texturing 2012-08-07 09:01:14 +02:00
Frederic Bouvier
ddfe61e323 Preserve film grain aspect ratio 2012-08-06 10:27:29 +01:00
Frederic Bouvier
52ae094a94 Add film wear to the cinema postprocessing effects 2012-08-06 10:27:21 +01:00
Frederic Bouvier
4a71f7a16d Get rid of unsigned int and 'invalid operation' at after RenderBin::Draw(..) 2012-08-06 10:27:17 +01:00
Frederic Bouvier
8e6ed31b94 Add lateral chromatic aberration (purple/green fringe) to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:27:03 +01:00
Frederic Bouvier
5ebabff309 Make vignetting and distortion play nice together 2012-08-06 10:26:59 +01:00
Frederic Bouvier
5907f9469d Add radial lens distortion to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:26:55 +01:00
Frederic Bouvier
5627a4e8f8 Cinema effects in the Rembrandt framework 2012-08-05 00:08:27 +01:00
Frederic Bouvier
6013f3360e Night vision post processing effect in Rembrandt 2012-08-05 00:08:23 +01:00
Stuart Buchanan
0e14a09698 Add rotation of trees, and fix issue 825 2012-07-31 21:44:38 +01:00
Emilian Huminiuc
e67d04ead9 Cleanup some implicit casts 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-31 21:40:15 +03:00
Stuart Buchanan
0604e3975b Add an additional random rotation to trees so the quads are not 
all oriented N/S and E/W, helping to disguise the limited set of
textures used.
 2012-07-24 22:12:11 +01:00
Frederic Bouvier
d9d6255107 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt - forgotten shaders 2012-07-22 19:53:27 +02:00
Emilian Huminiuc
05e3eb80f4 Make the other sunlight shaders recognize water matId. 
Remove duplicate fogFunc line in runway.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-19 22:08:35 +03:00
Emilian Huminiuc
e7dcbcf494 Small fixes and tweaks. Fix ugly black faces paralel to view direction on random buildings. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-16 14:17:16 +03:00
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
Flightgear Development
2b972341b3 Terrain Haze v1.3 2012-04-26 17:22:58 +03:00
Frederic Bouvier
d62e7ed6cc Filtering requires GLSL 1.2 2012-04-18 22:34:03 +02:00
Frederic Bouvier
c06889b3c5 Revert "Remove ambient component of additional lights" 
This reverts commit de454d1391ffc1d208dc783715524ef8eef4055f.
 2012-04-18 20:19:47 +02:00
Frederic Bouvier
adf766aeff Add optional shadow filtering 2012-04-18 09:13:38 +02:00
Frederic Bouvier
9807be4f0d Fix a problem with cockpit shadows added in previous commit 2012-04-18 08:37:14 +02:00
Frederic Bouvier
e4b856805e Make the number of shadow cascades and the range of each configurable 2012-04-17 09:12:57 +02:00
Frederic Bouvier
e09670ea33 Fix the Rembrandt version of the urban shader 2012-04-16 23:53:09 +02:00
Frederic Bouvier
a8863ad2b8 Workaround to make the landmass shader work on MacOSX, contributed by Olaf Flebbe 2012-04-16 08:53:18 +02:00
Frederic Bouvier
40f0b5f242 Don't modify depth buffer at grazing angles in the urban shader 2012-04-16 08:30:47 +02:00
Frederic Bouvier
e442e37ec3 Remove ambient component of additional lights 
It creates artifacts at edges of light volumes and should come from the main light source (sun and moon) anyway
 2012-04-16 08:29:33 +02:00
Frederic Bouvier
98208409f4 Urban shader for Rembrandt: comment out snow and night light for the moment 2012-04-14 23:48:05 +02:00
Frederic Bouvier
02bd978ee9 Olaf Flebbe: Typo in shader, really check argument of pow() 2012-04-14 22:15:51 +02:00
Frederic Bouvier
c05b12a6ab Change normal encoding method to get rid of RG16 textures and buffers 2012-04-13 00:01:12 +02:00
Emilian Huminiuc
bb6d8fea73 Fix ubershader emission for Rembrandt. 
IAR80: fix instruments for Rembrandt, and redo the lighting. Replace some Nasal with preoperty-rules

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-04-10 21:37:09 +03:00
Emilian Huminiuc
3737279b71 Fix deferred-tree shader compilation 2012-04-09 19:11:43 +02:00
Frederic Bouvier
b857fb2d7c Rembrandt: convert urban effect 2012-04-09 18:52:24 +02:00
Frederic Bouvier
9697a2656e Rembrandt: several implementations of PCF selectable by editing the code (for now): first #elif 1 wins 2012-04-06 22:15:13 +02:00