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

264 commits

Author SHA1 Message Date
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
Frederic Bouvier
a8aab2551d Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-04-05 22:51:45 +02:00
Stuart Buchanan
b09e37fefd Update random vegetation for project Rembrandt. Unfortunately due to a possible bug in the techniques code, the previous tree transparency handling has been disabled for the moment. 2012-04-04 22:39:46 +01:00
Frederic Bouvier
3f3a9ece00 Rembrandt: Put the ambient pass effect in fgdata 2012-04-04 22:31:40 +02:00
Frederic Bouvier
5678c1cd76 Add a sunlight technique to disable shadows, and avoid shader syntax problems with old NV cards 2012-04-04 20:42:05 +02:00
Frederic Bouvier
ceb1cb102b Rembrandt: Normalize normals before outputing them to gbuffer 2012-04-04 20:07:49 +02:00
James Turner
6d152cacc9 Fix for Ati(? Mac?) not allowing writes to 'varying' in a fragment shader. 2012-04-04 17:11:58 +01:00
Frederic Bouvier
ddf0c576e9 Hopefully fix the two-sided case for the Rembrandt renderer. Shadows are not fixed yet. 2012-04-03 23:30:35 +02:00
Emilian Huminiuc
feb30c83b5 fix ubershader lighting in Rembrandt 
IAR80: remove range animations for now
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-04-01 20:24:49 +03:00
Frederic Bouvier
bdc642f068 Rembrandt: Create an effect for the fog stage. Duplicates the C++ code for now. 2012-04-01 00:00:43 +02:00
Frederic Bouvier
984bb05046 Rembrandt: Create an effect for the lighting stage. Duplicates the C++ code for now. 2012-03-31 23:15:14 +02:00
Emilian Huminiuc
a3f004f4ec Simple conversion of ubershader for Rembrandt, as ubersahader-gbuffer.frag 
Make model-combined-gbuffer use it
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-31 22:24:00 +03:00
Frederic Bouvier
b2b391b2ef Fix light shaders 2012-03-31 21:13:47 +02:00
Frederic Bouvier
dc3ee9ad6e Supporting effects and shaders for lights 2012-03-31 20:32:50 +02:00
Frederic Bouvier
658ece0152 Fix normal storage into texture data. Input [-1..1] should be output to [0..1] 2012-03-28 22:36:26 +02:00
Frederic Bouvier
c4390ae31a Change default effects attached to terrain and models 
Add a technique that initialize the buffers of the Rembrandt renderer
     (use Multi Render Target)
  Renumber techniques that depends on old technique 10 (now 11) of model-default
 2012-03-25 19:03:52 +02:00
Frederic Bouvier
4334e98e1d Add an effect for the final display stage of the Rembrandt renderer 2012-03-25 18:51:41 +02:00
Emilian Huminiuc
4af61aba47 Shaders/include_fog.frag: better fix for the common fog function 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-15 21:09:27 +02:00
Frederic Bouvier
ebc1002139 Sunrises 1.2 by Thorsten Renk 2012-03-08 23:22:27 +01:00
Torsten Dreyer
874a693e96 Simplify Phytagoras in the wave shader(s) 
pow() is expensive and abs() is redundand.
pow(abs(x),2) equals x*x
 2012-02-23 20:25:28 +01:00
Emilian Huminiuc
fa0e47f919 SHADERS: fix c/p fail in bumpspec.frag. Thanks Chris Forbes for reporting. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-16 12:37:02 +02:00
Emilian Huminiuc
55c54bb25b SHADERS: fix "unified" fog function. This should fix issue #650 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-14 18:52:38 +02:00
Emilian Huminiuc
4df2af2cef SHADERS:fix "unified" fog function. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-14 18:39:58 +02:00
Emilian Huminiuc
eb6672f313 Add missing include_fog.[vert/frag] to the forest, glacier, and herbtundra effects. 
adapt forest.[vert/frag] shader to the common fog.
Thanks Stuart for reporting it.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-12 17:57:00 +02:00
Frederic Bouvier
6261badedb Finetune #623 2012-02-11 10:47:39 +01:00
Frederic Bouvier
4df297522c #623: don't modify depth buffer at grazing angles in the urban shader 2012-02-06 00:35:52 +01:00
Stuart Buchanan
fa933eda6e Updated shaders and effects for 3D clouds using single Drawable per cloud rather than per sprite. 2012-01-17 22:19:53 +00:00
James Turner
37a964ec92 Re-arrange effects using texture units >= 8 down to unused lower-numbered units. Especially move the noise texture down to the first available slot. 2012-01-11 23:22:44 +00:00
Frederic Bouvier
56afb80358 Local Weather 1.4 by Thorsten Renk : fixes lots of graphical errors and transparency issues and provides a consistent GUI. 2012-01-03 20:21:34 +01:00
Vivian Meazza
609a3a196d Bugfix - prevent emissive dirt 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-24 15:47:09 +00:00
Vivian Meazza
657bd30ae0 Merge branch 'master' of gitorious.org:fg/fgdata into work 2011-12-17 17:14:46 +00:00
Vivian Meazza
cfb86efb84 Add 2 more dirt channels - "green" and "blue" 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-17 17:07:41 +00:00
Frederic Bouvier
0726910feb Urban shader: fix best quality and cleanup quality level 2011-12-17 17:21:35 +01:00
Vivian Meazza
3c9306d36f ATI and other fixes 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-13 11:21:59 +00:00
Vivian Meazza
80562f73d0 Add puddles 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:41:14 +00:00
Vivian Meazza
9ba4c53271 Add tiling factor and dirt overlay 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:40:19 +00:00
Mathias Froehlich
8eaedfae57 Correct extension handling in the urban fragment shader. 2011-12-08 08:58:36 +01:00
Frederic Bouvier
55cbdc2dbf Restore correct attribution 2011-12-03 09:07:57 +01:00
Vivian Meazza
c4c8dd63d2 ATI fix 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-02 15:21:27 +00:00
Vivian Meazza
4eea1f6dfd Tidy up 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-02 14:33:34 +00:00
Vivian Meazza
f2b8bf1df5 bugfix 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 23:19:38 +00:00
Vivian Meazza
1dabc08c95 Add new water effect 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:08:43 +00:00
Vivian Meazza
35b5beb0a3 Amend fog function 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:07:48 +00:00
Vivian Meazza
a37de2ec49 Standardize fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:05:05 +00:00
Vivian Meazza
47ec25ba08 Standardize fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:04:27 +00:00
Vivian Meazza
b1a777b12d Standardize fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:03:40 +00:00
Vivian Meazza
4f4a918064 Standardized fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 20:58:14 +00:00
Vivian Meazza
eec1b7626a standardized fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 20:57:20 +00:00
Vivian Meazza
b0bcb91c24 Enhanced water and standardized fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 20:56:04 +00:00
Vivian Meazza
06e0e5a057 Standardized fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 20:52:59 +00:00
Vivian Meazza
0adb61f2a7 Unified lightmap, bumpmap, and reflect shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 20:52:05 +00:00
Vivian Meazza
b8d57b9474 Add fog include and amend parameters iaw new render/shader dialog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-11-28 15:02:20 +00:00
Vivian Meazza
1abc5624fb New fog shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-11-27 23:59:33 +00:00
Vivian Meazza
e9c37c0b74 Add runway rain effect (experimental) 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-11-27 23:12:59 +00:00
Vivian Meazza
c6c3d5b18d Amend copyright. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-30 09:07:03 +00:00
James Turner
6fb93dbf96 Ati compliance fixes to transition / water shaders, made under the direction of i4dnf on IRC. Makes Ati+mac drivers happy. 2011-10-29 10:57:04 +01:00
James Turner
dc3d2b5b49 Remove an unused sampler from the water shader, which caused OpenGL errors on Mac+Ati. 2011-10-28 16:09:09 +01:00
Stuart Buchanan
0cbdcd6aa0 Fix bottom/middle/top shading, and update global clouds. 2011-10-13 22:39:27 +01:00
Stuart Buchanan
23e27e21ac Merge branch 'master' of gitorious.org:fg/fgdata 2011-10-13 20:53:10 +01:00
Vivian Meazza
b7960ee919 Add flutter effect for flags etc. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-12 09:43:41 +01:00
Stuart Buchanan
f695fd4679 Merge branch 'master' of gitorious.org:fg/fgdata 2011-10-08 19:40:15 +01:00
Stuart Buchanan
c58d504dbf Temporary fix to the 3D cloud shader while we sort 
out the co-requisite simgear changes.
 2011-10-08 19:38:58 +01:00
Vivian Meazza
bee778ac2b Merge branch 'master' of gitorious.org:fg/fgdata into work 2011-10-07 13:01:17 +01:00
Vivian Meazza
d45670baa8 Water shader PhaseII improvements. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-07 12:46:01 +01:00
Stuart Buchanan
c0bebf5404 Updates to 3D clouds to use the new shading parameters. 2011-10-06 21:21:13 +01:00
Vivian Meazza
e758deced1 Add foam to water effect. Based on work by Emilian Huminuc. 2011-09-26 23:35:20 +01:00
Vivian Meazza
b150771296 Add light map to reflect effect. Based on work by Emilian Huminuc. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-26 09:42:44 +01:00
Vivian Meazza
e6fb203302 Add light map to reflect shader. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-26 09:35:33 +01:00
Frederic Bouvier
a2b26f8d59 Local Weather 1.36 by Thorsten Renk 2011-09-23 23:25:15 +02:00
Vivian Meazza
fbf219a56f Update colours to reflect Global Weather 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-22 15:33:16 +01:00
Vivian Meazza
980c1d7926 Update shader to react to global weather conditions 2011-09-22 14:37:32 +01:00
Vivian Meazza
062594ff05 Add new shaders in support of .dds textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 16:02:06 +01:00
Vivian Meazza
3ca2539064 Merge branch 'work' of D:\Git_New\fgdata 2011-08-23 22:52:24 +01:00
Vivian Meazza
c383cda2c6 Add support for transparent materials and .dds normal maps. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-08-23 22:51:14 +01:00
Stuart Buchanan
74a9f8e1a6 Extend visibility range of 3d clouds to /sim/rendering/clouds3d-vis-range 2011-08-21 22:09:04 +01:00
Vivian Meazza
8caf2ef24d Bugfix: correct transpareny issue. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-08-18 22:05:42 +01:00
Vivian Meazza
5d06c1800b Try fix for transparency issue. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-08-18 20:11:53 +01:00
Stuart Buchanan
191a51d921 Support z-scaling in the 3d clouds- shader parts. 2011-08-07 13:47:17 +01:00
Erik Hofman
aff94b66ed fix another typo 2011-07-16 15:53:25 +02:00
Erik Hofman
2e441b27b5 fix a typo 2011-07-16 15:52:03 +02:00