1
0
Fork 0
Commit graph

488 commits

Author SHA1 Message Date
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
39d86a06ea Removal of the unused executable bit from the affected Effects files. 2015-04-29 17:40:43 +02:00
Thorsten Renk
e4be2917be Implicit lightmap support for ALS model interior effect 2015-04-21 09:01:31 +03:00
Thorsten Renk
7b595eca19 Tentative changes to volume shadow passes 2015-04-18 10:35:18 +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
62b7946a0a Glare parameter and side window support for glass effect 2015-03-21 08:39:56 +02:00
Thorsten Renk
f10bdf05cd ALS glass effect uses depth-sorted bin and automatically falls back to correct transparent rendering for Rembrandt and default 2015-03-19 10:30:58 +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
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