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

280 commits

Author SHA1 Message Date
Frederic Bouvier
b1938ce785 Remove duplicated technique 2012-04-27 09:19:16 +02:00
Flightgear Development
2b972341b3 Terrain Haze v1.3 2012-04-26 17:22:58 +03:00
Stuart Buchanan
98e7a194e8 Random buildings - initial commit of data portion. Requires 
simgear change to have any effect.
 2012-04-24 21:55:37 +01:00
Frederic Bouvier
661f9ec383 Restore current syntax 2012-04-18 22:54:15 +02: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
e4b856805e Make the number of shadow cascades and the range of each configurable 2012-04-17 09:12:57 +02:00
Frederic Bouvier
6c407de9cf Remove unneeded requirement. Should help older card with Rembrandt 2012-04-16 22:49:38 +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
1cdaafa20d Change light animation internal parameters layout 2012-04-14 10:05:25 +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
aa644d02f2 Fix linear fetures effect. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-04-11 14:36:24 +03:00
Frederic Bouvier
b857fb2d7c Rembrandt: convert urban effect 2012-04-09 18:52:24 +02:00
Frederic Bouvier
70fa98dc86 Move skydome techine to make room for other techniques 2012-04-09 18:49:23 +02:00
Frederic Bouvier
a8aab2551d Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-04-05 22:51:45 +02:00
Frederic Bouvier
37ce7f2683 Rembrandt trees: Fix technique numbering and restore transparent pass for the classical renderer 2012-04-05 08:22:12 +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
Gijs de Rooy
303f11af1d Remove unused property from skydome effect. 2012-04-04 18:26:05 +02: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
0a662adee1 Fix a copy/paste typo 2012-04-01 14:29:45 +02: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
dc3ee9ad6e Supporting effects and shaders for lights 2012-03-31 20:32:50 +02:00
Emilian Huminiuc
edb789a684 Effects/model-combined fix missing porperty check in Rembrandt case, fix shader order 
IAR80: use the new model-combined-deferred
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-31 17:18:28 +03:00
Emilian Huminiuc
d43770ab58 Effects/model-default.eff move skydome to technique 5 to provide more headroom 
Effects/model-combined.eff fix techniques numbering. Make active under rembrandt too. add model-combined-deferred as a stub for now for specific
Rembrandt use.
Users of model-combined with normalmaps should change the technique number to 9, and duplicate that entry for technique 8.
Fix some longstanding png warnings. Provide null_reflectdir.png for model-combined
This should fix part of bug #726
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-31 15:00:36 +03:00
Frederic Bouvier
178cda57c8 Effect for registering transparent surfaces 2012-03-30 22:12:27 +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
Gijs de Rooy
6c19b0067c Correct lightmap condition property 2012-03-21 23:04:06 +01:00
Frederic Bouvier
ebc1002139 Sunrises 1.2 by Thorsten Renk 2012-03-08 23:22:27 +01:00
Frederic Bouvier
3e241108ad Effects does not need to test if rembrandt is not activated. This would be the default 2012-03-06 23:11:46 +01:00
Frederic Bouvier
68ffab1066 Create the /sim/rendering/rembrandt boolean property (set to false) and test it in default effect 2012-03-04 21:51:32 +01:00
Emilian Huminiuc
35193f0633 Make runway effect use png textures by default. Add runway png normalmap. Provide runway-dds.eff 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-23 23:56:28 +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
Torsten Dreyer
22aeda4a04 cleanup water shader properties, interpolate sea-surface wind 2012-01-20 12:47:11 +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
Gijs de Rooy
4e0cbba20a Add missing fog 2012-01-07 14:59:35 +01: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
Frederic Bouvier
9dc155f832 Merge branch 'master' of gitorious.org:fg/fgdata 2011-12-17 18:23:31 +01:00
Frederic Bouvier
5026322da4 Revert unwanted change 2011-12-17 18:22:51 +01: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
a51cb4a280 Add renderbin to technique 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-16 18:17:59 +00:00
Emilian Huminiuc
56a253a74a remove hardcoded quality 2011-12-15 14:27:35 +01:00
Gijs de Rooy
6c971211b8 Quality slider overwrites custom shader settings. All effects now listen to the new sim/rendering/shaders/<foo> properties. 2011-12-12 17:04:36 +01:00
Frederic Bouvier
6b6b5484c0 Urban shader doesn't need GL_ARB_shader_texture_lod for quality level below 4.0. If needed, the shader should be split to have different requirements between levels. 2011-12-11 12:42:48 +01:00
Vivian Meazza
1b9b1b49b9 Use updated shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:43:29 +00:00
Vivian Meazza
4b3f55a5d5 Exchange - for _. Use updated shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:42:48 +00:00
Mathias Froehlich
8eaedfae57 Correct extension handling in the urban fragment shader. 2011-12-08 08:58:36 +01:00
Gijs de Rooy
2ca355bc82 Fix issue #511: effects use new property for snow-level 2011-12-06 11:33:19 +01:00
Vivian Meazza
3b9bea6609 Make default renderbin 0 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-04 17:42:07 +00:00
Vivian Meazza
58dc77ad22 Bugfix 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-02 14:25:41 +00:00
Vivian Meazza
8a8e229e21 bugfix 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 23:13:39 +00:00
Vivian Meazza
8d36139f22 Migrate to Gijs' new gui 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:47:42 +00:00
Vivian Meazza
746b38ca9c Adapt to new rendering gui 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:44:10 +00:00
Vivian Meazza
17c1f39137 New effects 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 21:40:57 +00:00
Vivian Meazza
cc329668dc Add include fog 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-11-28 20:22:10 +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
f43a9e45e6 Add runway rain effect (experimental) 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-11-27 23:24:12 +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
Stuart Buchanan
d8e7c3a62a Minor clean-up of cloud.eff 2011-11-24 22:43:40 +00:00
Stuart Buchanan
cc58f7e32e Remove reliance of 3d clouds on /sim/rendering/shader-effects 2011-11-24 22:30:36 +00:00
Stuart Buchanan
6fc8b10667 Fixes for random vegetation: 
1) Remove dependency on the /sim/rendering/shader-effects
2) Fix http://code.google.com/p/flightgear-bugs/issues/detail?id=494 where
toggling the random vegetation on, iff initiall set off, did not generate
new random vegetation. Fixed by forcing a tile reload in the same way as
used for random objects.
 2011-11-24 21:41:05 +00:00
PSadrozinski
7e5b3e2530 Adding lfeat effect to apply polygon-offset to linear features 2011-11-07 15:23:31 +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
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
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
de7e0e5692 change name. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-27 00:07:47 +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
Gijs de Rooy
321f9f6bbd Issue #203: fix white light cones. Still no fix for night-lighting though. 2011-09-22 16:53:47 +02:00
Vivian Meazza
ee01294e6e Update effect to use modified shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-22 15:31:42 +01:00
Vivian Meazza
c06d1a7710 Add new effects in support of .dds textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 16:05:59 +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
c2714d8903 Use single sided mode 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-08-08 17:08:25 +01:00
Gijs de Rooy
bef7c3b04b Add intensity-factor to lightmap shader 2011-06-10 18:51:30 +02:00
Vivian Meazza
9283c48e45 Use generic reflection map. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-05-07 09:59:11 +01:00
Vivian Meazza
c67632905a Add Skydome effect. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-04-15 16:07:53 +01:00
Vivian Meazza
d2793f013e Merge branch 'master' of gitorious.org:fg/fgdata into Work 2011-04-01 20:10:51 +01:00
Vivian Meazza
8de4541994 Use generic reflection map as a place-holder. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-03-31 21:30:50 +01:00
Frederic Bouvier
65c166c12c Local Weather 1.0 by Thorsten Renk 2011-03-19 14:03:28 +01:00
Vivian Meazza
b100c8b4b6 Correct typo. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-02-22 22:29:32 +00:00
Gijs de Rooy
f8fe1df22a Lightmap conditional 2011-02-19 22:03:27 +01:00
Gijs de Rooy
8db0ca44ef An initial lightmap shader 2011-02-11 18:33:53 +01:00
Tim Moore
564c69e10a Issue 209: fix up inheritance of color mode uniform in material animation effect 
The overriding of the color mode uniform in the default model effect
wasn't working. It's difficult to override the individual properties
of techniques, especially if their names aren't unique. So, I changed
the model-default effect to use a parameter for the color-mode
uniform; material-off.eff and material-diffuse.eff override that.
 2010-12-20 09:39:06 +01:00
Gijs de Rooy
cad9ef6967 Add random-vegetation back in 2010-12-14 21:26:46 +01:00
Frederic Bouvier
52205b6ee4 Increase quality threshold of geometry landmass 2010-11-20 21:39:05 +01:00
Frederic Bouvier
7c608c2003 Restore QDM urban shader technique for quality level >= 4 2010-11-02 22:31:39 +01:00
Frederic Bouvier
7d82264b79 Revert "Urban shader using Quadtree Displacement Mapping" 
This reverts commit 3cd68ac922d5768e5403065e1654478c1fbe0c7f.
 2010-11-02 21:31:31 +01:00
Frederic Bouvier
a3813bda8d Urban shader using Quadtree Displacement Mapping 2010-10-25 22:37:05 +02:00
Frederic Bouvier
755a6a4d1a Remove reference to inexistant texture 2010-10-13 08:14:20 +02:00
Frederic Bouvier
6e559ab4eb Restore old shader for quality level below 2 2010-10-03 08:57:33 +02:00
gral@who.net
3cdf9da27a Next version of water shader, some clean up 2010-09-30 01:29:16 +02:00
Frederic Bouvier
0b0012d158 Change effect name inside the file 2010-09-23 08:20:05 +02:00
Frederic Bouvier
d734e32bd5 Modified reflect effect to include bumpspec. Original effect untouched 2010-09-21 08:23:13 +02:00
Vivian Meazza
f2ca47bffb Merge branch 'master' of \New Git\fgdata 2010-09-01 20:55:12 +01:00
Vivian Meazza
c64d101139 Change render bin to 10 (default transparent bin) 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2010-09-01 20:26:01 +01:00
Vivian Meazza
ec1a3bba1e Merge commit 'refs/merge-requests/40' of git://gitorious.org/fg/fgdata into integration 2010-09-01 18:32:58 +01:00
gral@who.net
24ea4dcd0a Change in effect cropgrass, it inherits from crop now 2010-08-31 14:30:18 +02:00
gral@who.net
b92252c0a3 New checkbox transition shaders to separate rock/transition shader work from crop shaders 2010-08-31 10:29:51 +02:00
gral@who.net
7bf4dc5795 Reactivate blue for forest.frag 2010-08-28 00:54:06 +02:00
gral@who.net
71a7c8cf72 Removed different colorstrips, flickering between forest/herbtundra 2010-08-28 00:38:20 +02:00
gral@who.net
269a999c4d Adding season colour in forest/herbtundra/glacier effects 2010-08-28 00:13:52 +02:00
gral@who.net
197200149c Better herbtundra colour and transition 2010-08-25 22:50:57 +02:00
gral@who.net
5fb6550b8e Changes for better terrain, but not so good forest 2010-08-25 20:08:23 +02:00
gral@who.net
8e645e61f5 Added relief code to new effects and shaders 2010-08-24 14:53:42 +02:00
gral@who.net
0ff2d597f5 Adding the files ... 2010-08-23 12:16:07 +02:00
gral@who.net
0549474369 Adding glacier.eff 2010-08-22 23:09:49 +02:00
gral@who.net
187517fdb0 Added snow and snow-level also to cropgrass.eff 2010-08-21 16:59:07 +02:00
gral@who.net
1ee6d35136 Shader Crop: Adding snow and snowlevel adjustement, clean up 2010-08-21 16:51:13 +02:00
gral@who.net
07c6ffedc0 Adding snow and snowlevel adjustement 2010-08-21 14:27:25 +02:00
gral@who.net
5a39f0738c As always, I forgot to add the files 2010-08-21 13:10:19 +02:00
gral@who.net
50b2a58f89 File name change in crop.eff 2010-08-15 16:32:48 +02:00
gral@who.net
1a9bf761fe Added cropgrass effect and associated textures 2010-08-15 16:30:11 +02:00
Tim Moore
cc5502c509 Merge branch 'topic/shaderopt' 2010-08-14 00:13:53 +02:00
Tim Moore
d27174028e shader optimizations 
Use two-pass rendering for some shaders to reduce the cost of expensive shaders.

Implement some material animations using a shader uniform.

Eliminate use of gl_FrontFacing. It's too buggy on ATI/ Macintosh.
 2010-08-14 00:13:16 +02:00
Vivian Meazza
dc9860b534 Change render-bin name 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2010-08-01 20:01:28 +01:00
Vivian Meazza
0e2aeaf421 Add persistent contrails 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2010-07-31 21:34:35 +01:00
Tim Moore
c964caa845 workaround for gl_FrontFacing bug 
gl_FrontFacing isn't well supported on some Macintosh / ATI combinations.
 2010-06-15 19:29:24 +02:00
Frederic Bouvier
eb47297d94 Thorsten Renk: local weather 0.61 2010-06-04 23:05:32 +02:00
timoore
6e58bce8e5 Rewrote landmass geometry shader 
I did several optimizations, including reducing to a bare minimum
shader computations and producing the geometry as one tristrip with
degenerate triangles. The result was an increase from 14 fps to 51 fps
(NVidia 8600M, ufo, ksfo).


Author: Tim Moore <timoore@redhat.com>
 2010-04-22 14:56:34 +00:00
vmmeazza
1afa90694c Add layered clouds 2010-04-12 19:23:27 +00:00
fredb
52c46e87c9 Create effects for shrub type landmass with no or little height. Add a new shrub texture contributed by Yves 2010-04-11 08:36:36 +00:00
fredb
fe297a342e Restore basic functionality of the original shader 2010-04-11 06:09:07 +00:00
fredb
64f351935b Add snow to urban shader 2010-04-10 17:32:07 +00:00
fredb
1a986d8747 Use quality level inside landmass fragment shader 2010-04-10 15:08:29 +00:00
fredb
714c500fa9 Use quality level inside urban fragment shader 2010-04-10 14:35:02 +00:00
fredb
9638e607cf Use new "/sim/rendering/quality-level" property 2010-04-10 13:59:24 +00:00
fredb
2ed5074122 Use actual texture coverage 2010-04-10 10:08:27 +00:00
fredb
71ff1ae846 Use new materials.xml format to declare a second city texture with its own relief map provided by Yves/hb-gral 2010-04-10 09:40:41 +00:00
vmmeazza
7b73c9732a Remove redundant text 2010-04-08 21:32:47 +00:00
fredb
bbdf4694ad Fix line endings 2010-04-07 21:09:48 +00:00
vmmeazza
1b49358d0d Add mapping and noise 2010-04-02 14:02:48 +00:00
fredb
5d76d5f3f5 Landmass update: add a triangle for the ground and don't apply relief on it 2010-04-02 07:06:39 +00:00
vmmeazza
f71d794866 Tie reflectivity to material shininess, and provide more user control via parameters. 
Perpare for cube cross textures.
 2010-03-31 09:11:44 +00:00
fredb
e0056383f3 Use geometry shader to give more relief to landmass 2010-03-29 06:13:43 +00:00