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

535 commits

Author SHA1 Message Date
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
fredb
7ebe34e95c Put the color of night lighting in a uniform 2010-03-28 17:20:04 +00:00
fredb
24d8e9293c Add relief mapping to landmass effect 2010-03-28 17:00:19 +00:00
vmmeazza
2c825cbef2 A simple reflection effect - needs this patch ftp://ftp.abbeytheatre2.org.uk/fgfs/Shader/Reflect/cube-map.patch which will be included in Simgear soon (hopefully). 2010-03-28 11:17:51 +00:00
stuart
6b4857ce8c Allow the snow level of the landmass shader to be set from the property system, and expose it in the rendering dialog. Could be used in future to set the snow level based on the current weather. 2010-03-27 14:02:56 +00:00
fredb
0d930f3b68 Urban texture coverage was changed lately 2010-03-22 22:30:57 +00:00
fredb
f8e595361a Update to the urban shader. Support shadows, intersection with 3d objects and night lighting. 2010-03-22 22:00:44 +00:00
fredb
8e95df54e2 Fix bumpspec effect 2010-03-17 17:56:13 +00:00
fredb
27968d4da9 Bump map shader contributed by Emilian Huminiuc. Should be inherited from to be used in models. 2010-03-16 07:21:47 +00:00
fredb
c9236ad565 First iteration of the urban effect with relief mapping. Relief map by HB-Gral. 2010-03-12 22:25:19 +00:00
vmmeazza
049a339a52 Add stencil light shaders by Lauri Peltonen (Zan). 
Please Note:

There is a problem with this implementation when the light cone crosses
the near/far camera boundary.
 2010-01-31 10:49:44 +00:00
timoore
bfaaef8aef Effects and shaders for material animations 
Author: Tim Moore <timoore@redhat.com>
 2010-01-27 17:52:18 +00:00
stuart
d5b4f52040 Short-term fix to fix alpha-blending problems with clouds. 2009-11-26 21:07:50 +00:00
stuart
ce88154c77 Correct effect name. 2009-11-26 19:32:33 +00:00
timoore
8c55e1b2bc update to a more recent version of the cloud shader 
Author: Tim Moore <timoore@redhat.com>
 2009-11-26 16:15:45 +00:00
timoore
ab97ee326a effect for clouds 
Author: Tim Moore <timoore@redhat.com>
 2009-11-26 10:44:44 +00:00
timoore
ffa9cae11c New tree rendering algorithm 
Draw trees in two passes, opaque and transparent. This allows us to
have some transparency, which is better looking, and dispense with
sorting.


Author: Tim Moore <timoore@redhat.com>
 2009-11-23 21:53:56 +00:00
timoore
00e7027dce Move hard wired tree shader to an effect 
Author: Tim Moore <timoore@redhat.com>
 2009-11-21 23:35:47 +00:00
timoore
971b6c3ef2 light two-sided polygons 
Also, remove model-default.frag; for the moment one fragment shader works for
both terrain and models.


Author: Tim Moore <timoore@redhat.com>
 2009-11-19 16:20:51 +00:00
timoore
1e5f8c2aee Provide some reasonable default textures 
Author: Tim Moore <timoore@redhat.com>
 2009-11-17 06:23:12 +00:00
timoore
fea02f249c Add emissive and shininess parameters to default terrain and model effects 
Whoops, forgot those.


Author: Tim Moore <timoore@redhat.com>
 2009-11-16 07:24:32 +00:00
timoore
8e2077e330 Created different default shaders for models. 
These use the vertex color as the diffuse part of the lighting equation,
instead of both ambient and diffuse.


Author: Tim Moore <timoore@redhat.com>
 2009-11-14 06:19:09 +00:00
timoore
a2481d8e60 Chrome effects file 
Author: Tim Moore <timoore@redhat.com>
 2009-11-14 06:18:57 +00:00
timoore
0ade02d9be default effects file for models 
Author: Tim Moore <timoore@redhat.com>
 2009-11-14 06:18:44 +00:00
sydadams
6e4fce2e8d changed condition properties so each coud be enabled from the dialog 2009-10-08 02:53:37 +00:00
timoore
44ec84e6f6 Remove empty parameters sections from effects 
They break inheritance of parameters from a parent
 2009-08-09 21:52:06 +00:00
timoore
943ba2a4fe Till Busch - effects, shaders and textures for crop and water effects 
Incorporated changes to effects file syntax. Changed Till's landmass
to mix in the base terrain texture. Some shader cleanup.

Also, add a GUI control for enabling shaders.
 2009-08-08 10:17:58 +00:00
timoore
6a5ad11aa7 Toggle effects use with property 2009-07-15 22:49:53 +00:00
timoore
7a202515e8 Use texture instead of texture0 in terrain shader 
This is better property list style.
 2009-07-15 22:49:44 +00:00
timoore
d4d89d2793 Terrain effect has a shader 2009-07-15 22:49:36 +00:00
timoore
e32c47d795 First version of default terrain effects file 2009-07-15 22:49:16 +00:00