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

574 commits

Author SHA1 Message Date
Thorsten Renk
19c57ca01d Bugfix for incorrect lighting in overcast weather 2015-03-16 11:00:15 +02:00
Thorsten Renk
1a169d6de3 More work on ALS glass and cockpit interior 2015-03-16 10:47:10 +02:00
Thorsten Renk
419ae89ae2 Glass effect maintenance - lightcurve adjustment and damage support 2015-03-12 09:21:02 +02:00
Thorsten Renk
8beeb39932 Wiper and fog map for ALS glass effect 2015-03-11 11:04:48 +02:00
Thorsten Renk
2f0dc41bc9 Use neutral defaults 2015-03-10 14:07:09 +02:00
Thorsten Renk
92a38e95da Cockpit interior shadow and caustic effect for ALS 2015-03-10 13:53:11 +02:00
Thorsten Renk
87c3bf5772 Interior glass effect with dynamic environment response for ALS 2015-03-10 13:43:08 +02:00
Thorsten Renk
76206b88a0 ALS fake aircraft shadow technique based on projecting a duplicate model 2015-03-05 10:01:28 +02:00
Thorsten Renk
3b44cbd6bd Random vegetation shadows for ALS 2015-02-20 09:55:13 +02:00
Thorsten Renk
ce77fcfac9 European deciduous trees change autumn color in ALS 2015-02-18 10:35:00 +02:00
Stuart Buchanan
28091e91a5 Disable directional lighting as workaround. 
Apparent unstable normals in taxiway lights cause
lighting to vary by view direction.  Temporary
fix for V3.4 release.
 2015-02-10 21:18:17 +00:00
Stuart Buchanan
281469611b Fixed directional lighting. 2015-01-05 20:49:40 +00:00
Thorsten Renk
c1e7703d78 Shader support for aircraft shadows 2014-12-16 13:40:30 +02:00
Thorsten Renk
b40ffa8fed Fix impostor effect 2014-12-16 11:10:21 +02:00
Thorsten Renk
2c0513816c ALS maintenance - reworked light curves, streamlining, minor bugfixes,... 2014-12-15 15:50:47 +02:00
Thorsten Renk
f2c81c9dcb ALS maintenance, haze color balance at low light improved and dependent on air pollution 2014-12-11 13:02:40 +02:00
Thorsten Renk
4faeb25c85 Bugfix for ALS inland water 2014-12-04 10:22:06 +02:00
Thorsten Renk
fddf1edc54 Rayleigh effect reworked with fog illumination as proxy for scene light, small bugfixes 2014-12-03 13:50:05 +02:00
Thorsten Renk
dc791861d2 ALS maintenance: proper order of argument in smoothstep, night behaviour of wake, streamlining of if() statements,... 2014-12-02 11:18:02 +02:00
Thorsten Renk
85486a0f51 Airport keep follows autumn coloring 2014-11-30 13:30:56 +02:00
Clément de l'Hamaide
f6f433529f Revert "UniformFactory: merge current uniform per <name> of effect" 
Talking with Emilian about this commit, we came to the conclusion we don't want share uniform between .eff file
This reverts commit 91a6a27f32ee5f79e1d7e0d4570e879a902de58f.
 2014-11-16 22:09:41 +01:00
Clément de l'Hamaide
95640a1b6f UniformFactory: merge current uniform per <name> of effect 2014-11-16 20:21:20 +01:00
Thorsten Renk
4e9ba3e560 Basic ALS + AW infrastructure to use new cloud transparency parameter 2014-11-16 12:28:09 +02:00
Thorsten Renk
77e382be75 Continuous water coloring between ocean and inland 2014-11-12 09:16:32 +02:00
Thorsten Renk
fc85e049c9 Real geometry mapped grain overlay and wetness/rain simulation for ALS model shader, Vinson flightdeck as example 2014-11-08 10:42:42 +02:00
Thorsten Renk
997854abab Raindrop effect for wet runway 2014-11-01 20:10:55 +02:00
Thorsten Renk
8cf4460729 Cleanup and skylight reflection improved ALS wet runway effect 2014-11-01 15:42:54 +02:00
Thorsten Renk
1417650438 Trees are affected by ALS Rayleigh haze 2014-10-31 13:51:11 +02:00
Thorsten Renk
6376ba1964 Improvements to sky reflection in ALS water shaders 2014-10-31 12:25:59 +02:00
Thorsten Renk
bd6d46a63c Towards consistent surface light rendering for ALS, some changes suggested by Emilian Huminiuc 2014-10-24 09:36:03 +03:00
Thorsten Renk
01afaab2e1 ALS procedural rock work 2014-10-19 13:22:20 +03:00
Thorsten Renk
7192bd1feb ALS rock effect development 2014-10-17 15:05:26 +03:00
Thorsten Renk
0570d5699d Fully procedural (textureless) xml-configurable rock texture effect for ALS (work in progress) 2014-10-16 12:11:21 +03:00
Thorsten Renk
5c0a0d2305 mod() for argument of sine function in surface light shader to make sure it falls between 0 and 2 pi 2014-10-16 10:24:27 +03:00
Thorsten Renk
67867d8a32 ALS secondary lights, Rayleigh haze and cloud shadows for dirt runway effect 2014-10-13 09:24:14 +03:00
Thorsten Renk
afaac563db ALS secondary lights and Rayleigh haze for agriculture effect 2014-10-13 08:57:39 +03:00
Thorsten Renk
52dc0e9e69 No changing gl_Vertex, ATI/AMD may not tolerate it 2014-10-13 08:32:23 +03:00
Thorsten Renk
f8f8e9b709 ALS secondary lights and Rayleigh haze for models, cleanup of naming conventions 2014-10-12 11:13:58 +03:00
Thorsten Renk
17b03d0b99 Bugfixes for ALS water shader lower terrain quality inconsistencies 2014-10-11 16:46:12 +03:00
Thorsten Renk
20dda77d6f ALS secondary lights and Rayleigh haze for model ubershader and random buildings 2014-10-11 16:12:19 +03:00
Thorsten Renk
77e5cc4c9f Tentative fix for taxiway line z-fighting within ALS 2014-10-10 11:20:19 +03:00
Thorsten Renk
dfb8073607 ALS secondary lights and Rayleigh haze for urban effect 2014-10-10 10:16:12 +03:00
Thorsten Renk
b2fd34b3f4 ALS secondary lights work on water 2014-10-09 10:52:44 +03:00
Thorsten Renk
63bfbcbb4a ALS secondary lights illuminate fog, work in progress 2014-10-08 13:26:30 +03:00
Thorsten Renk
f3cc0ac539 Optional second landing light and light offset control for ALS 2014-10-06 09:43:51 +03:00
Thorsten Renk
33d1d8c70d Generic secondary lights (landing light and searchlight) for ALS 2014-10-05 14:08:29 +03:00
Thorsten Renk
379d3c1437 Cleanup and Rayleigh haze for runway and airport keep effects 2014-10-04 11:32:45 +03:00
Thorsten Renk
4ac3620f5b Rayleigh scattering for light reflected from the terrain, leading to blue hazy distance effects and redshift of reflected sunlight, work in progress, only terrain and water done 2014-10-03 13:49:38 +03:00
Clément de l'Hamaide
1fa06dc92f Merge Textures.high into Textures 2014-08-27 19:40:36 +02:00
Thorsten Renk
6b67f6938b Improved runway shoulder to greenspace transitions 2014-08-04 11:05:19 +03:00
Thorsten Renk
17d792d9c3 Overlay texturing for airport keep with definitions for US Southwest 2014-08-04 10:52:41 +03:00
Thorsten Renk
46e2402f2f Improved fading for runway lights at night for ALS (work in progress) 2014-07-30 12:21:09 +03:00
Thorsten Renk
eeef7633fb Hires noise strength parameter for ALS airport keep shader 2014-06-17 09:37:23 +03:00
Thorsten Renk
17799e8450 Vertically stratified noise function for ALS 2014-05-14 13:01:14 +03:00
Thorsten Renk
bba99d5313 Texture reading offsets for agriculture effect 2014-05-09 09:41:41 +03:00
Thorsten Renk
3970bad285 Updates to Earthview, based on work by Anton Gomez Alvedro 2014-05-05 15:27:32 +03:00
Thorsten Renk
021133e657 Agriculture de-tiling effect for ALS terrain rendering 2014-05-05 14:27:33 +03:00
Thorsten Renk
5a2ada9619 Updates to Earthview 2014-04-25 09:40:32 +03:00
Thorsten Renk
23d7f41481 Earthview orbital rendering based on the NASA Visible Earth image collection 2014-04-24 10:37:41 +03:00
Thorsten Renk
6fa9d8ac88 Randomness for ALS surface lights lense flare 2014-04-24 09:43:28 +03:00
Thorsten Renk
364cc9b087 Cleanup in shader code 2014-04-24 09:33:06 +03:00
Thorsten Renk
4ea8047b69 ALS terrain shader uses noise library 2014-04-17 12:23:45 +03:00
Thorsten Renk
b1d909b22e Domain tiling effect for ALS tree shader 2014-04-17 12:18:11 +03:00
Emilian Huminiuc
03e5112c94 Move linear features to bin7 to be drawn beneath runway lights 2014-03-24 22:28:31 +01:00
Thorsten Renk
6cce2e64d4 Moved cloud shadows for vegetation into vertex shader, has much better performance 2014-03-17 09:01:20 +02:00
Thorsten Renk
553fd2c171 Cloud shadows for runway shader effect 2014-03-17 08:49:49 +02:00
Thorsten Renk
35d841adf5 Cloud shadows for airfield green 2014-03-14 09:39:24 +02:00
Thorsten Renk
80819daa68 Cloud shadows for random vegetation 2014-03-14 09:30:45 +02:00
Thorsten Renk
572a720388 Cloud shadows for water shader effect 2014-03-11 12:25:47 +02:00
Thorsten Renk
a05863e541 Cloud shadows for urban effect/random buildings 2014-03-11 11:53:57 +02:00
Thorsten Renk
3a87e5a514 Experimental support for cloud shadows on the terrain 2014-03-10 10:29:14 +02:00
Thorsten Renk
4286141f2a Improvements and environment dependence to rendering of runway lighting for ALS 2014-02-28 09:15:41 +02:00
Stuart Buchanan
7cba9da8a1 Fix black halo around lights by removing depth write 2014-02-27 22:49:25 +00:00
Thorsten Renk
1d25257604 Surface light effect and shaders for ALS 2014-02-25 10:49:37 +02:00
Emilian Huminiuc
745874315b Tentative fix for random buildings red flickering in some cases 2014-02-23 13:12:35 +01:00
Stuart Buchanan
f99745acd7 Effects file for surface lights 2014-02-18 21:27:51 +00:00
Thorsten Renk
22e3852cad Impostors simulating distant clouds for Advanced Weather / ALS 2014-02-17 10:21:26 +02:00
James Turner
39cc76d1d6 Workaround for Effects crash. 
Certain systems experience memory corruption related to this
effect. There is certainly an underlying bug in effects code
(or SGExpression code), but in the short-term this avoids the
issue by fixing some bad syntax in the .eff file.

(<property> is only for boolean properties, not to read a value)
 2014-02-15 18:09:44 +00:00
Emilian Huminiuc
d334484f20 Improve framerate for default rendering when 3D clouds enabled 2014-02-11 00:44:18 +01:00
Stuart Buchanan
0522a6504a Generate required binormal for Rembrandt 2014-02-09 22:07:43 +00:00
Emilian Huminiuc
1ec07461a5 Fix issue for objects using transparency with model-shader disabled 2014-02-02 15:11:05 +01:00
Thorsten Renk
1c1bcda8d6 Support for creating high altitude noctilucent clouds in Advanced Weather/ALS 2014-01-30 11:08:35 +02:00
Thorsten Renk
aae72d7266 High quality dirt runway effect for ALS 2014-01-23 13:16:20 +02:00
Emilian Huminiuc
ea7b6667f7 Fix airport linear features z-fighting 2014-01-15 23:34:55 +01:00
Emilian Huminiuc
7f183e0117 Remove intermediate quality settings from the ubershader. Fix a texture. 2014-01-15 23:30:03 +01:00
James Turner
830f8dacee Fix depth-writes after early-Z kill. 2014-01-15 09:42:54 +00:00
James Turner
2c3da82ccd Remove fill-rate burning early-Z passes. 
Remove heavy early-Z passes from various default rendering effects.
Equates to a 25% FPS gain on Mac (no difference on my Linux box).

(Early-Z is fine in principle, but should use trivial shaders and no
lighting, texturing or fog. In local testing no measurable benefit
was found in even a true early-Z pass)
 2014-01-13 20:22:39 +00:00
Stuart Buchanan
21ff9d9680 Follow-on fix for issue 212 - cities disappear with certain quality levels. 
Fix for Rembrandt.
 2013-12-30 22:15:39 +00:00
Stuart Buchanan
31dc0d7c60 Fix for issue 212 - cities disappear with certain quality levels. 
Underlying cause was caching of textures in effects.  Resolved by using consistent texture indexes across quality levels.
 2013-12-30 22:08:27 +00:00
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