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

707 commits

Author SHA1 Message Date
Thorsten Renk
c548463f5d Grain overlay support for ALS model interior effect 2015-08-07 10:23:39 +03:00
Thorsten Renk
003eb87022 Lightmap support for ALS model interior effect 2015-08-07 09:46:45 +03:00
Thorsten Renk
834350b4cc Lightmap for reflections in ALS glass effect 2015-08-06 12:26:47 +03:00
Thorsten Renk
80b0d64b4d ALS in-cockpit flashlight effect by Wayne Bragg 2015-06-07 08:57:23 +03:00
Emilian Huminiuc
52887ad7c3 Environment/interpolator.xml: create copies of tied properties used by the ubershader reflection rotation. 
Effects/model-combined.eff: use copies instead of tied properties Shaders/ubershader: fix reflection rotation for dynamic reflections.
 2015-05-25 16:29:56 +02:00
Thorsten Renk
aec9efe2e4 User-controlled bounding box utilization for thruster flame 2015-05-23 11:48:14 +03:00
Thorsten Renk
b17cd267ef Improvements to flame effect 2015-05-22 10:51:54 +03:00
Thorsten Renk
44f8e5f672 Procedural thruster flames, work in progress 2015-05-21 11:28:21 +03:00
Emilian Huminiuc
9d7b575a45 Revert Shaders/model-ALS-ultra.frag (ALS ubershader) changes made necessary by the last commit. 
Add ALS specific vertex shader for ubershader.vert and buildings-ubershader.vert named model-ALS-ultra.vert and buildings-model-ALS-ultra.vert respectively. This partly reverts 3dc0e641c1 . Aircraft modelers and other consumers need not take any action.
 2015-05-14 14:56:04 +02:00
Thorsten Renk
5fba8d301f Spaceflight shader effect with altitude dependent mixture of ambient and diffuse light 2015-05-06 13:59:28 +03:00
Edward d'Auvergne
278b311511 Removal of the unused executable bit from the affected Shaders files. 2015-04-29 17:45:52 +02:00
Thorsten Renk
e4be2917be Implicit lightmap support for ALS model interior effect 2015-04-21 09:01:31 +03:00
Thorsten Renk
fa7085b965 Tentative fix for ATI water reflection issue 2015-04-18 11:08:33 +03:00
Thorsten Renk
bc184f21de Fix low angle odd colors for Earthview 2015-04-18 09:29:04 +03:00
Emilian Huminiuc
3dc0e641c1 Rewrite ubershader reflection. Objects using the dynamic option will now display the reflection properly when affected by a spin/rotate animation. Improved appearance of reflection + normalmap. Normalmap support added to random-buildings when ubershader active. 
Also fixes some bugs exposed on AMD GPUs
 2015-03-29 13:49:36 +02:00
Thorsten Renk
59e01f4edc Improvements and bugfixes for orbital rendering 2015-03-29 13:16:19 +03:00
Thorsten Renk
1a327a9549 Bugfix for low transparency handling 2015-03-24 09:04:06 +02:00
Thorsten Renk
62b7946a0a Glare parameter and side window support for glass effect 2015-03-21 08:39:56 +02:00
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
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
a8ee47ddc5 Consistent shadow tree fog color for ALS 2015-02-25 15:36:31 +02:00
Thorsten Renk
3b44cbd6bd Random vegetation shadows for ALS 2015-02-20 09:55:13 +02:00
Thorsten Renk
27740a17f7 Intel GPUs seem to be more picky... 2015-02-18 17:27:37 +02:00
Thorsten Renk
ce77fcfac9 European deciduous trees change autumn color in ALS 2015-02-18 10:35:00 +02: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
1ad83ec6e5 Bugfix - restore deep shade model for ALS terrain 2014-12-16 13:39:49 +02:00
Thorsten Renk
2c0513816c ALS maintenance - reworked light curves, streamlining, minor bugfixes,... 2014-12-15 15:50:47 +02:00
Thorsten Renk
576f72ba53 No Mie scattering effect when sun is down for ALS clouds 2014-12-12 10:31:12 +02:00
Thorsten Renk
dacf52ef56 More ALS maintenance 2014-12-12 10:04:56 +02:00
Thorsten Renk
ccfcfad7db Fix small color mismatch in skydome code 2014-12-11 13:07:09 +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
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
47aca39183 Kill specular channel after sundown in ALS model shader 2014-11-30 14:08:40 +02:00
Thorsten Renk
85486a0f51 Airport keep follows autumn coloring 2014-11-30 13:30:56 +02:00
Thorsten Renk
9855d16735 Tentative hack to avoid black triangles in urban terrain problem when urban effect is used 2014-11-17 10:23:14 +02: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
9d2a0c9456 vec3 is not the same as float 2014-11-05 08:47:02 +02:00
Thorsten Renk
b35f326634 Consistent Rayleigh haze for trees is hard... 2014-11-04 12:33:29 +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
37faf4a9d0 Bugfix for ALS model shader not displaying lightmap at full darkness beyond some distance 2014-10-22 09:22:06 +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
ac92428ff3 Correct FOV scaling of lightspots 2014-10-05 17:28:04 +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
Thorsten Renk
9c5c34e82d Directional dependence of intensity for lights, work in progress 2014-08-13 10:52:59 +03: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
27438ea54c Fresnel reflection for ALS runway shader 2014-05-14 12:45:54 +03:00
Thorsten Renk
bba99d5313 Texture reading offsets for agriculture effect 2014-05-09 09:41:41 +03:00
Thorsten Renk
dd72bbb5fa Sky irradiance reflection for ALS water shader 2014-05-09 09:06:34 +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
c3a92a4799 Slope line noise pattern for ALS terrain rendering 2014-04-28 09:24:19 +03:00
Thorsten Renk
5a2ada9619 Updates to Earthview 2014-04-25 09:40:32 +03:00
Thorsten Renk
4e13342019 Slope line pattern for the noise library 2014-04-25 09:20:02 +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
426a4a0a6c GUI option and some internal tweaks for cloud shadow functionality 2014-04-17 12:39:53 +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
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
26836af986 Model ubershader retains some glossiness due to sky irradiance even in indirect light 2014-03-14 11:02:18 +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
James Turner
cbe18617fd My GLSL compiler is stricter than yours. 
- Apple GLSL strongly objects to mismatched function declaration /
return value type, and similarly to mismatched function declaration /
lvalue type.
 2014-03-10 17:57:04 +00:00
Thorsten Renk
7cebb2963e Better lighting balance for ALS water shader in very low light /night 2014-03-10 10:43:55 +02:00
Thorsten Renk
3a87e5a514 Experimental support for cloud shadows on the terrain 2014-03-10 10:29:14 +02:00
Thorsten Renk
87a960a048 Tentative fix for high altitude/low sun rendering artefacts in ALS skydome 2014-02-28 10:40:05 +02:00
Thorsten Renk
4286141f2a Improvements and environment dependence to rendering of runway lighting for ALS 2014-02-28 09:15:41 +02:00
Thorsten Renk
1d25257604 Surface light effect and shaders for ALS 2014-02-25 10:49:37 +02:00
Thorsten Renk
22e3852cad Impostors simulating distant clouds for Advanced Weather / ALS 2014-02-17 10:21:26 +02:00
Thorsten Renk
1c1bcda8d6 Support for creating high altitude noctilucent clouds in Advanced Weather/ALS 2014-01-30 11:08:35 +02:00
Clément de l'Hamaide
3132b761d0 Improve runway reflection shader by Emilian H. 2014-01-23 17:23:03 +01:00
Thorsten Renk
aae72d7266 High quality dirt runway effect for ALS 2014-01-23 13:16:20 +02:00
Emilian Huminiuc
7f183e0117 Remove intermediate quality settings from the ubershader. Fix a texture. 2014-01-15 23:30:03 +01:00
James Turner
8862167700 Fix ubershader for Mac, in more places. 2014-01-12 17:06:23 +00:00
James Turner
bb640294d8 Fix Uberhader-Rembrandt bug on Mac. 
My parser is stricter than your parser. (Unless you're on Ati-non-Mac)
 2014-01-11 22:32:22 +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
Stuart Buchanan
825abab643 Fix for black clouds on ATI (bug 1160) 
http://code.google.com/p/flightgear-bugs/issues/detail?id=1160

Fix by Emilian Huminiuc.
 2013-12-25 23:14:04 +00:00
Tomash Brechko
e5d8163d64 Ubershader: account for specular light component only once. 
Both files have "fragColor += Specular * nmap.a;" later in the source.

The patch is suggested by Emilian Huminiuc.
 2013-11-27 16:30:32 +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
Vivian Meazza
af22245993 Sea colour effect by Emilian Huminiuc 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-11-03 18:41:16 +00:00
Clément de l'Hamaide
40013ba1c7 ubershader: restore lightmap feature 2013-10-21 13:27:35 +02:00
Thorsten Renk
c11ac7295c Fogline blur effect for Atmospheric Light Scattering high-detail shader 2013-10-17 11:09:42 +03: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
James Turner
105983702f Fix a GLSL compile error on Mac 
(doesn't like #elif it seems). Since neither of these values
are ever defined, kill off the conditionals entirely.
 2013-06-25 22:50:39 +01:00
Thorsten Renk
b9c573ea11 Tweak to prevent the cloud LOD system from dropping sprites in very faint clouds which have just few sprites to begin with and appear unrealistic when these are dropped 2013-06-13 13:26:37 +03:00
Gijs de Rooy
c53d5c12ba Fix urban shader compile error. #elseif is an incorrect directive, #elif is the correct one. Thanks to colintoal for reporting. 2013-06-08 13:05:37 +02: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
3929e8d091 Use square tree textures with reduce UV coordinates. 2013-05-19 21:30:20 +01:00
Stuart Buchanan
1e09cf85ef Use step function rather than cast of boolean expression. 2013-05-13 22:59:25 +01:00
Stuart Buchanan
613db9668f Fix warning on some GPUs. 2013-05-10 20:20:08 +01:00
Stuart Buchanan
5689d76dca Change tree texture format from a 8x4 block to 32x1 to avoid UV bleeding problems. 2013-05-10 20:04:18 +01:00
Vivian Meazza
f025dd3e32 Tidy up formatting after reinstating Rainbow effect 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-04-28 09:27:38 +01:00
Vivian Meazza
8509e4acba Consolidate Fresnel and rainbow look-up textures. Reinstate Rainbow effect in ALS shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-04-26 20:18:46 +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
4817183507 Isotropic lighting for trees in Atmospheric Light Scattering 2013-04-16 12:48:54 +03: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
402d75a602 Deeper shadows and fog/snow continuity across terrain tiles for highest quality level terrain shader of Atmospheric Light Scattering 2013-04-15 14:00:22 +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
2d2a5eb3be Replaced hard fogging near field cutoff by a sliding cutoff 2013-02-25 14:11:40 +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
97349a17ef Bugfix for water flickering problem in Atmospheric Light Scattering 2013-02-06 13:48:45 +02:00
Thorsten Renk
0ee1a1053e Bugfix for airport grass shader 2013-02-04 15:19:58 +02:00
Thorsten Renk
4426b4a301 Bugfix for lower quality water shader in Atmospheric Light Scattering 2013-02-04 14:52:14 +02:00
Emilian Huminiuc
65e2b97c26 Sync with the other versions of the ubershader. 
Remove useless forward declaration of fog_Func.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2013-02-01 13:22: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
15f85a6a89 Reduced flickering for airport grass shader 2013-01-25 14:50:04 +02:00
Thorsten Renk
c948d93444 Indonesia regional texturing definitions 2013-01-21 14:05:05 +02:00
Thorsten Renk
c1157b762a The ultra-terrain shader 2013-01-21 13:57:18 +02:00
Emilian Huminiuc
d098796d46 use world coordinates for noise texture lookup 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2013-01-17 11:51:23 +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
Stuart Buchanan
024f7494e4 Discard cloud fragments with a transparency >98% 2012-12-16 22:16:16 +00:00
Thorsten Renk
f4c828c4de Yet more bugfixes 2012-12-14 15:27:26 +02:00
Thorsten Renk
4d10e77226 Atmospheric Light Scattering shader bugfixes 2012-12-14 14:31:08 +02: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
cb1ce70688 Increase opacity of clouds, discard transparent fragments. 2012-12-05 21:37:16 +00: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
Stuart Buchanan
d722d98164 Fix urban shader, broken by 9e8735c64996614174d2d86526f258f44bacd7c4 2012-12-01 20:51:30 +00:00
Thorsten Renk
3c1ee0527b Shader updates 2012-10-06 21:13:50 +01:00
Emilian Huminiuc
6e8f1b7fee Restore the foam to the Rembrandt water shader 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-10-06 14:14:27 +03:00
Stuart Buchanan
65dbc4cc0b Remove hardcoded maximum snow level. Now configured via Environment Settings. 2012-10-05 22:13:24 +01: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
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
Emilian Huminiuc
cc770cecb7 restore transition.frag that got broken 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-20 13:42:16 +03:00
Vivian Meazza
b3922c08c1 Merge branch 'master' of D:\Git_New\fgdata 2012-08-19 21:55:51 +01:00
Emilian Huminiuc
7d883b3db1 ubershader: reenable ambient-correction under Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-19 23:40:32 +03:00
Vivian Meazza
d09a45837f Merge branch 'master' of D:\Git_New\fgdata 
Conflicts:
	Shaders/transition.frag

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-08-14 00:06:15 +01:00
Emilian Huminiuc
00c352f235 Hopefuly fix yet another weird behaviour on ATI gpus (take two) 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 23:58:12 +01:00
Emilian Huminiuc
56d84d24da Hopefuly fix yet another weird behaviour on ATI gpus 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 16:50:03 +03: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
ddfe61e323 Preserve film grain aspect ratio 2012-08-06 10:27:29 +01:00
Frederic Bouvier
52ae094a94 Add film wear to the cinema postprocessing effects 2012-08-06 10:27:21 +01:00
Frederic Bouvier
4a71f7a16d Get rid of unsigned int and 'invalid operation' at after RenderBin::Draw(..) 2012-08-06 10:27:17 +01:00
Frederic Bouvier
8e6ed31b94 Add lateral chromatic aberration (purple/green fringe) to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:27:03 +01:00
Frederic Bouvier
5ebabff309 Make vignetting and distortion play nice together 2012-08-06 10:26:59 +01:00
Frederic Bouvier
5907f9469d Add radial lens distortion to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:26:55 +01: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
Stuart Buchanan
0e14a09698 Add rotation of trees, and fix issue 825 2012-07-31 21:44:38 +01:00
Emilian Huminiuc
e67d04ead9 Cleanup some implicit casts 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-31 21:40:15 +03:00
Stuart Buchanan
0604e3975b Add an additional random rotation to trees so the quads are not 
all oriented N/S and E/W, helping to disguise the limited set of
textures used.
 2012-07-24 22:12:11 +01:00
Frederic Bouvier
d9d6255107 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt - forgotten shaders 2012-07-22 19:53:27 +02:00
Emilian Huminiuc
05e3eb80f4 Make the other sunlight shaders recognize water matId. 
Remove duplicate fogFunc line in runway.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-19 22:08:35 +03: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
Frederic Bouvier
3ac767a974 SSAO: Special case for ATI owners 2012-07-14 11:48:08 +02:00
Frederic Bouvier
48c9664e83 Remove unnecessary unsigned keyword and dependancy on GL_EXT_gpu_shader4 extension 2012-07-13 19:32:31 +02:00
Emilian Huminiuc
6a992c65d6 Fix overdark runway in rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 18:47:19 +03:00
Emilian Huminiuc
fb58a3211f some tweaks to runway shader 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 17:53:00 +03:00
Frederic Bouvier
129eefcc3e Improve light reflections on water 2012-07-13 14:46:31 +02:00
Frederic Bouvier
fd4f42da0f Fix 'Phong distortion' artifact on specular lighting and shininess factor on additional lights in Rembrandt 2012-07-12 00:31:22 +02:00
Frederic Bouvier
d06e249f16 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt 2012-07-11 23:59:10 +02: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
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
8174ea8593 More transition.frag cleanups 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-02 23:34:00 +03:00
Emilian Huminiuc
a31dfa779e Cleanup a bit the transition shaders 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-02 23:17:17 +03: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
145a759fb8 Add support for atmospheric scattering to the random vegetation shader. 2012-06-30 00:38:14 +01: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
Emilian Huminiuc
c001b6d679 transition.frag: fix shading 
ubershader.frag: fix ambient
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-28 14:37:45 +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
f6b74fc128 Add material ID to provide increased specular effect in Rembrandt for water and ubershader. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-26 02:18:00 +03: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
eeefbc596b Fix wrong water-gbuffer.frag from previous commit 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-24 20:37:34 +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
42e4428f8d adapt water_lightfield shader to the previous changes 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-16 21:27:59 +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
Emilian Huminiuc
e21807bb33 formatting cleanup 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-17 20:16:29 +03:00
Frederic Bouvier
41ff7da797 Show bloom buffer 2012-05-12 23:38:40 +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
Vivian Meazza
f0d21c1f60 Optimisation and tidying 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-05-07 19:11:34 +01:00
Vivian Meazza
0a8f9d71c3 Tidy up 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-05-07 17:22:15 +01:00
Vivian Meazza
b6fd097920 Opotimize in line with water shaders 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-05-07 12:46:25 +01:00
Vivian Meazza
0235f95ed5 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-05-05 20:07:43 +01: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
3fc1a36201 Fix a shader problem. It seems a bad idea to set gl_FragData in a conditional block. It seems better to assign a value unconditionally even if there is no buffer attached. 2012-05-05 00:10:56 +02: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
Stuart Buchanan
de70c6404e Emissive lighting for random buildings. Part 1. 2012-05-01 22:35:10 +01:00
Emilian Huminiuc
5fbc5bddf6 Ubershader: some spring cleaning, readability 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-01 15:03:18 +03:00
Frederic Bouvier
6775ecdfd2 Display the depth buffer when stored in a color texture 2012-05-01 09:34:14 +02: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
Frederic Bouvier
72be8cdcf7 Merge commit 'refs/merge-requests/99' of git://gitorious.org/fg/fgdata into thorsten/haze_1.3 2012-04-27 08:29:03 +02:00
Frederic Bouvier
ef9f0d222d Remove incomplete and unused shaders 2012-04-26 20:49:01 +02:00
Flightgear Development
2b972341b3 Terrain Haze v1.3 2012-04-26 17:22:58 +03:00
Frederic Bouvier
d62e7ed6cc Filtering requires GLSL 1.2 2012-04-18 22:34:03 +02:00
Frederic Bouvier
c06889b3c5 Revert "Remove ambient component of additional lights" 
This reverts commit de454d1391ffc1d208dc783715524ef8eef4055f.
 2012-04-18 20:19:47 +02:00
Frederic Bouvier
adf766aeff Add optional shadow filtering 2012-04-18 09:13:38 +02:00
Frederic Bouvier
9807be4f0d Fix a problem with cockpit shadows added in previous commit 2012-04-18 08:37:14 +02:00
Frederic Bouvier
e4b856805e Make the number of shadow cascades and the range of each configurable 2012-04-17 09:12:57 +02:00
Frederic Bouvier
e09670ea33 Fix the Rembrandt version of the urban shader 2012-04-16 23:53:09 +02:00
Frederic Bouvier
a8863ad2b8 Workaround to make the landmass shader work on MacOSX, contributed by Olaf Flebbe 2012-04-16 08:53:18 +02:00
Frederic Bouvier
40f0b5f242 Don't modify depth buffer at grazing angles in the urban shader 2012-04-16 08:30:47 +02:00
Frederic Bouvier
e442e37ec3 Remove ambient component of additional lights 
It creates artifacts at edges of light volumes and should come from the main light source (sun and moon) anyway
 2012-04-16 08:29:33 +02:00
Frederic Bouvier
98208409f4 Urban shader for Rembrandt: comment out snow and night light for the moment 2012-04-14 23:48:05 +02:00
Frederic Bouvier
02bd978ee9 Olaf Flebbe: Typo in shader, really check argument of pow() 2012-04-14 22:15:51 +02:00
Frederic Bouvier
c05b12a6ab Change normal encoding method to get rid of RG16 textures and buffers 2012-04-13 00:01:12 +02:00
Emilian Huminiuc
bb6d8fea73 Fix ubershader emission for Rembrandt. 
IAR80: fix instruments for Rembrandt, and redo the lighting. Replace some Nasal with preoperty-rules

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-04-10 21:37:09 +03:00
Emilian Huminiuc
3737279b71 Fix deferred-tree shader compilation 2012-04-09 19:11:43 +02:00
Frederic Bouvier
b857fb2d7c Rembrandt: convert urban effect 2012-04-09 18:52:24 +02:00
Frederic Bouvier
9697a2656e Rembrandt: several implementations of PCF selectable by editing the code (for now): first #elif 1 wins 2012-04-06 22:15:13 +02:00
Frederic Bouvier
a8aab2551d Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-04-05 22:51:45 +02:00
Stuart Buchanan
b09e37fefd Update random vegetation for project Rembrandt. Unfortunately due to a possible bug in the techniques code, the previous tree transparency handling has been disabled for the moment. 2012-04-04 22:39:46 +01:00
Frederic Bouvier
3f3a9ece00 Rembrandt: Put the ambient pass effect in fgdata 2012-04-04 22:31:40 +02:00
Frederic Bouvier
5678c1cd76 Add a sunlight technique to disable shadows, and avoid shader syntax problems with old NV cards 2012-04-04 20:42:05 +02:00
Frederic Bouvier
ceb1cb102b Rembrandt: Normalize normals before outputing them to gbuffer 2012-04-04 20:07:49 +02:00
James Turner
6d152cacc9 Fix for Ati(? Mac?) not allowing writes to 'varying' in a fragment shader. 2012-04-04 17:11:58 +01:00
Frederic Bouvier
ddf0c576e9 Hopefully fix the two-sided case for the Rembrandt renderer. Shadows are not fixed yet. 2012-04-03 23:30:35 +02:00
Emilian Huminiuc
feb30c83b5 fix ubershader lighting in Rembrandt 
IAR80: remove range animations for now
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-04-01 20:24:49 +03:00
Frederic Bouvier
bdc642f068 Rembrandt: Create an effect for the fog stage. Duplicates the C++ code for now. 2012-04-01 00:00:43 +02:00
Frederic Bouvier
984bb05046 Rembrandt: Create an effect for the lighting stage. Duplicates the C++ code for now. 2012-03-31 23:15:14 +02:00
Emilian Huminiuc
a3f004f4ec Simple conversion of ubershader for Rembrandt, as ubersahader-gbuffer.frag 
Make model-combined-gbuffer use it
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-31 22:24:00 +03:00
Frederic Bouvier
b2b391b2ef Fix light shaders 2012-03-31 21:13:47 +02:00
Frederic Bouvier
dc3ee9ad6e Supporting effects and shaders for lights 2012-03-31 20:32:50 +02:00
Frederic Bouvier
658ece0152 Fix normal storage into texture data. Input [-1..1] should be output to [0..1] 2012-03-28 22:36:26 +02:00
Frederic Bouvier
c4390ae31a Change default effects attached to terrain and models 
Add a technique that initialize the buffers of the Rembrandt renderer
     (use Multi Render Target)
  Renumber techniques that depends on old technique 10 (now 11) of model-default
 2012-03-25 19:03:52 +02:00
Frederic Bouvier
4334e98e1d Add an effect for the final display stage of the Rembrandt renderer 2012-03-25 18:51:41 +02:00
Emilian Huminiuc
4af61aba47 Shaders/include_fog.frag: better fix for the common fog function 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-03-15 21:09:27 +02:00
Frederic Bouvier
ebc1002139 Sunrises 1.2 by Thorsten Renk 2012-03-08 23:22:27 +01:00
Torsten Dreyer
874a693e96 Simplify Phytagoras in the wave shader(s) 
pow() is expensive and abs() is redundand.
pow(abs(x),2) equals x*x
 2012-02-23 20:25:28 +01:00
Emilian Huminiuc
fa0e47f919 SHADERS: fix c/p fail in bumpspec.frag. Thanks Chris Forbes for reporting. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-16 12:37:02 +02:00
Emilian Huminiuc
55c54bb25b SHADERS: fix "unified" fog function. This should fix issue #650 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-14 18:52:38 +02:00
Emilian Huminiuc
4df2af2cef SHADERS:fix "unified" fog function. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-14 18:39:58 +02:00
Emilian Huminiuc
eb6672f313 Add missing include_fog.[vert/frag] to the forest, glacier, and herbtundra effects. 
adapt forest.[vert/frag] shader to the common fog.
Thanks Stuart for reporting it.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-02-12 17:57:00 +02:00
Frederic Bouvier
6261badedb Finetune #623 2012-02-11 10:47:39 +01:00
Frederic Bouvier
4df297522c #623: don't modify depth buffer at grazing angles in the urban shader 2012-02-06 00:35:52 +01:00
Stuart Buchanan
fa933eda6e Updated shaders and effects for 3D clouds using single Drawable per cloud rather than per sprite. 2012-01-17 22:19:53 +00:00
James Turner
37a964ec92 Re-arrange effects using texture units >= 8 down to unused lower-numbered units. Especially move the noise texture down to the first available slot. 2012-01-11 23:22:44 +00:00
Frederic Bouvier
56afb80358 Local Weather 1.4 by Thorsten Renk : fixes lots of graphical errors and transparency issues and provides a consistent GUI. 2012-01-03 20:21:34 +01:00
Vivian Meazza
609a3a196d Bugfix - prevent emissive dirt 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-24 15:47:09 +00:00
Vivian Meazza
657bd30ae0 Merge branch 'master' of gitorious.org:fg/fgdata into work 2011-12-17 17:14:46 +00:00
Vivian Meazza
cfb86efb84 Add 2 more dirt channels - "green" and "blue" 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-17 17:07:41 +00:00
Frederic Bouvier
0726910feb Urban shader: fix best quality and cleanup quality level 2011-12-17 17:21:35 +01:00
Vivian Meazza
3c9306d36f ATI and other fixes 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-13 11:21:59 +00:00
Vivian Meazza
80562f73d0 Add puddles 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:41:14 +00:00
Vivian Meazza
9ba4c53271 Add tiling factor and dirt overlay 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-10 09:40:19 +00:00
Mathias Froehlich
8eaedfae57 Correct extension handling in the urban fragment shader. 2011-12-08 08:58:36 +01:00