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
Stuart Buchanan
b2f261ea0a Improved Random building texturesa - Gabo Huerta 
Improved textures, lightmaps from Gabo Huerta.
Improved interaction with the urban shader from Thorsten Renk.
 2013-12-28 20:36:49 +00:00
Thorsten Renk
4a2d427a85 Ocean depth map support for ALS 2013-11-23 12:15:52 +02:00
Thorsten Renk
d13d72b2f7 Bugfix correcting tree fog lighting for cloudy days and low sun 2013-11-22 09:20:38 +02:00
Clément de l'Hamaide
cad2dc9e06 Fix missing elements in texture declaration in effects files. Fixes bug #1267 2013-11-18 03:17:58 +01:00
Vivian Meazza
cad41c4eff Sea collour effect by Emilian Huminiuc 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-11-03 18:41:12 +00:00
Thorsten Renk
c11ac7295c Fogline blur effect for Atmospheric Light Scattering high-detail shader 2013-10-17 11:09:42 +03:00
Vivian Meazza
b34bd7e68a Bugfix for Rembrandt by Emilian Huminiuc 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-10-09 09:12:33 +01:00
Thorsten Renk
bdd9520ca5 Horizon blur and noise modulation model based on aloft visibility and weather variability for Atmospheric Light Scattering 2013-08-29 15:15:51 +03:00
Thorsten Renk
e0679636ee Wake shader effect for Atmospheric Light Scattering framework 2013-08-28 14:58:21 +03:00
Thorsten Renk
c937881caf Shader trick to generate surf at steep coastlines 2013-06-07 14:35:25 +03:00
Thorsten Renk
b3bb82dd88 Wind effects on vegetation for Atmospheric Light Scattering: movement of trees and hires terrain texture noise simulating vegetation and debris movement 2013-06-07 13:31:34 +03:00
Stuart Buchanan
08243eb083 Speculative fix for shader cast issue on Mac. 2013-05-31 19:50:57 +01:00
Stuart Buchanan
1b8c05b162 Fix black border on trees. 
- Add additional property checks for multisampling.
- Add transparent background with appropriate color for each tree
- Add conversion script to generate .dds and low rez trees easily.
 2013-05-16 22:40:36 +01:00
Vivian Meazza
646a74f915 Consolidate Fresnel and Rainbow look-up textures. Re-instate Rainbow effect in ALS shader. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-04-26 20:18:41 +01:00
Thorsten Renk
f62550e115 Optional overlay texture for models 2013-04-22 11:32:28 +03:00
Thorsten Renk
cea50f52ed Proper wetness effect on runway and airfield green dependent on quality level 2013-04-22 10:41:44 +03:00
Thorsten Renk
c877c8b4e5 3d noise based fog and deeper shadows for lower quality terrain, urban and water shaders 2013-04-22 10:02:14 +03:00
Stuart Buchanan
266313486d Add dynamic selection of tree texture based on season and snow level. 
All tree texture sheets now contain 4 different texture sets for
different conditions.  See Docs/README.materials for details.

Also retire the -summer and -winter variants of tree textures, which
are now redundant.
 2013-04-20 21:09:03 +01:00
Thorsten Renk
df35c11af2 Packice overlay and water color variations for high quality water shader in Atmospheric Light Scattering 2013-04-15 14:29:04 +03:00
Thorsten Renk
2c6a962a34 Modified cloud lighting with dependence on air pollution 2013-04-09 09:52:19 +03:00
Thorsten Renk
f2ebbbbc70 Updates to Advanced Weather and cloud shaders - better support for low visibility conditions, improved framerates for Thunderstorm scenario 2013-03-01 09:40:05 +02:00
Thorsten Renk
9ffb8a3d52 'The Flag' for Atmospheric Light Scattering 2013-03-01 09:11:10 +02:00
Thorsten Renk
deba78c4da Autumn colors by pixel postprocessing with color rotation encoded in the terrain texture alpha channel, used for Atmospheric Light Scattering 2013-02-11 14:01:31 +02:00
Thorsten Renk
930b3d4fd5 Configurable parameter support for detailed terrain shader quality level 2013-02-06 15:13:25 +02:00
Thorsten Renk
4426b4a301 Bugfix for lower quality water shader in Atmospheric Light Scattering 2013-02-04 14:52:14 +02:00
Thorsten Renk
9c95d09f60 Model ubershader for Atmospheric Light Scattering 2013-01-31 14:15:18 +02:00
Thorsten Renk
db546a6fd6 Bugfixes for random building in Atmosperhic Light Scattering 2013-01-30 10:04:27 +02:00
Thorsten Renk
c1157b762a The ultra-terrain shader 2013-01-21 13:57:18 +02:00
Emilian Huminiuc
72c876aec6 Ubershader fixes 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2013-01-17 11:32:00 +02:00
Stuart Buchanan
4c4df3401e Do not render cloudlets on the back half of the cloud at ranges 
of > 10km.  50% performance improvements seen under overcast conditions.
 2012-12-16 22:20:23 +00:00
Thorsten Renk
8bcc21263f Runway effect with bumpmap and snow for Atmospheric Light Scattering 2012-12-13 12:17:51 +02:00
Thorsten Renk
35f63578ac Improvements for the hires grass texture effect 2012-12-12 15:03:55 +02: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
Emilian Huminiuc
67a78d6cb5 Missed a couple of effects 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-11-18 00:39:17 +02:00
Emilian Huminiuc
b650a0eb51 Make sure shaders are disabled as long as /sim/rendering/shaders/quality-level is 0 or non existing. 
This should help those checking out models in fgviewer
To enable effects in fgviewer run it with:
fgviewer --prop /sim/rendering/shaders/quality-level -1
Also fix random buildings not showing up when model shader was set to 0 and generic was enabled.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-11-18 00:39:02 +02:00
Emilian Huminiuc
9d6a735cf1 Fix linear features transparency 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-11-01 21:43:25 +02:00
Thorsten Renk
3c1ee0527b Shader updates 2012-10-06 21:13:50 +01:00
Stuart Buchanan
5fbf85f881 Use multi-sampling where available to improve tree rendering. 2012-09-25 22:52:28 +01:00
Emilian Huminiuc
e184642e87 Adjust reflection strength on random buildings; add and use a new cubemap for the random buildings. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-14 00:12:49 +03: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
2c058f9c1f New effect: Effects/model-combined-transparent 
Switch c172p and concorde glass effects to the new effect.
Docs/model-combined.eff/: Updated transparent effect template.

From now on Effects/model-combined should not be inherited from directly.
Use either Effects/model-combined-deferred
or Effects/model-combined-transparent

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-09 22:28:45 +03:00
Emilian Huminiuc
cebf6f4d9c buildings.eff: adapt technique numbering to previous effect changes 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-09 15:01:26 +03: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
Frederic Bouvier
54c043bdc3 Fix urban shader and issue #836 2012-09-03 11:19:22 +02: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
c3bcb8a6de Add film wear to the cinema postprocessing effects 2012-08-05 18:51:02 +02:00
Frederic Bouvier
fb0fa00877 Get rid of unsigned int and 'invalid operation' at after RenderBin::Draw(..) 2012-08-05 18:28:47 +02:00
Frederic Bouvier
fab3d677b0 Night vision has precedence over cinema effects 2012-08-05 11:57:48 +02:00
Frederic Bouvier
714555e74b Add lateral chromatic aberration (purple/green fringe) to the cinema postprocessing effects (Rembrandt) 2012-08-05 11:43:56 +02:00
Frederic Bouvier
9010535292 Add radial lens distortion to the cinema postprocessing effects (Rembrandt) 2012-08-05 10:43:53 +02: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
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
Emilian Huminiuc
4f991859ca tweak random building reflections 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-15 00:37:32 +03:00
Frederic Bouvier
313f4796fb Rembrandt: Add debugging properties and fix transparency issues. Side effect: light are not fogged (may be added in the light shader later) and depth buffer precision issues on light are more visible due to near plane really near (0.1m) 2012-07-14 13:09:42 +02:00
Frederic Bouvier
3ac767a974 SSAO: Special case for ATI owners 2012-07-14 11:48:08 +02:00
Emilian Huminiuc
bd32fb99cf remove GL_EXT_gpu_shader4 dependency 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 20:58:02 +03:00
Emilian Huminiuc
faf9b41d8f remove unnecessary dependency on GL_EXT_gpu_shader4 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 20:40:41 +03:00
Frederic Bouvier
4b6f2f6017 Remove unneeded dependancy 2012-07-13 19:28:55 +02:00
Emilian Huminiuc
b1b263b483 Rmove stray .dds references in terrain-default.eff and non-dds materials file 
This should hopefuly prevent any dds files from being loaded when using the default/regional materials file
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 13:35:19 +03: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
Emilian Huminiuc
786ab23d7c cleanup and optimization of dds terrain textures 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-07 23:43:53 +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
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
2f123b7100 Make random buildings compatible with the atmospheric scattering shader. 
Also remove redundant test parameters from the tree effect.
 2012-06-30 20:37:08 +01:00
Emilian Huminiuc
876e3e11db fix transition.eff copy paste failure, and enable the slider selectively under Rembrandt. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-30 14:55:52 +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
b466346a53 make sure crop and landmass based effects turn off under Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-29 18:57:03 +03: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
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
ce18b24ba9 fix water specular with Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-25 21:15:32 +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
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
Frederic Bouvier
d98dc36c93 Use the new configuration options to describe the lighting stage of the default rendering pipeline of the Rembrandt renderer 2012-05-13 19:02:23 +02:00
Emilian Huminiuc
0ac64c8506 Effects/building.eff: Fix for random buldings appearing untextured when skydome was enabled. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-13 03:09:27 +03:00
Frederic Bouvier
41ff7da797 Show bloom buffer 2012-05-12 23:38:40 +02:00
Frederic Bouvier
a00ac78d6e Implement /sim/rendering/rembrandt/use-color-for-depth in default pipeline 2012-05-12 13:31:32 +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
Frederic Bouvier
5cfca250b1 rename /sim/rendering/rembrandt -> /sim/rendering/rembrandt/enabled 
and put rembrandt-related properties in /sim/rendering/rembrandt/
 2012-05-12 09:20:04 +02:00
Frederic Bouvier
17740f9cf7 First round of changes toward a programmable rendering pipeline. 
Stages are predefined for now.
 2012-05-12 09:20:01 +02:00
Frederic Bouvier
37df6a3ec1 Syntax change for deferred buffers 2012-05-12 09:19:59 +02:00
Frederic Bouvier
754339b264 Syntax change for deferred buffers 2012-05-12 09:19:58 +02:00
Emilian Huminiuc
22352ec485 Switch building.eff to the ubershader. 
Tweak building lightmap to work with ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-07 02:05:02 +03: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
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
Emilian Huminiuc
ce08a30a58 Add missing uniform to model-combined technique 5. This should fix the lighting issues with the sky-dome shaders active and landmass 
slider at 4.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-02 13:22:43 +03:00
Stuart Buchanan
9dbebd3c2d Emissive lighting on random buildings. 2012-05-01 22:36:24 +01: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
Stuart Buchanan
5909285100 Building effect for random buildings. 2012-04-28 23:03:11 +01:00
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
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