1
0
Fork 0
Commit graph

597 commits

Author SHA1 Message Date
Fernando García Liñán
d35c160a50 Add a dummy technique with index 7 to model-combined
This keeps backwards compatibility with aircraft that implement technique 7 from Rembrandt.
2020-11-17 00:15:09 +01:00
Fernando García Liñán
a3a8f9123e Make Compositor default
- Remove all Compositor Effects and Shaders.
- Unify the low-spec and ALS pipelines in a single pipeline called 'Classic'.
- Readd shadow mapping.
- Move the WS30 Effect and fragment shader out of the Compositor-specific directories.
2020-11-16 13:46:30 +01:00
James.Hester
8de70d32d2 Remove requests to generate normals as these are no-ops, because
the Shaders do not access the generated attributes.
2020-05-03 07:29:34 +01:00
Stuart Buchanan
fc27175690 Reduce shader attribute usage by packing floats
Previously we required 6 shader attributes to pass
in all the required information for the building shader.
By using packing techniques this has been reduced to 4.

This should improve support for integrated graphics cards.
2020-03-26 22:06:21 +00:00
Delta Echo
e727d6d4e3 Implement rotation into wingflex shader 2020-02-23 17:49:02 +00:00
Delta Echo
3bf12ce8e7 Minor changes, use int for type instead of organic bool 2020-02-01 11:38:39 +01:00
Delta Echo
be7e278f1c Improve wingflex shader+effect 2020-01-31 16:52:20 +01:00
Stuart Buchanan
5a0fc45853 Fix Building share when model shader off. 2020-01-27 13:38:22 +00:00
Stuart Buchanan
119fb5efe2 Random Buildings - improved texture mapping
Previously the front and side faces of random/OSM buildings
had identical texture coordinates.  This resulted in the sides
of buildings texture mapping being squeezed or stretched.

This change generates a separate texture mapping for the sides
of the buildings.
2019-11-23 17:08:04 +00:00
Fernando García Liñán
fb7f1545a0 Compositor: Ported most Effects to the compositor 2019-10-26 01:42:48 +02:00
Stuart Buchanan
564e7b31fd Shader buildings multiple roof types
Shader buildings now support different roof types
- flat
- gabled
- hipped
- pyramidal

Primarily for osm2city use.
2019-10-08 21:39:40 +01:00
Stuart Buchanan
87e9118965 Shader buildings - split wall and roof tex index
Previously there was very limited texture variations
as a given texture index was used for both the wall
and ceiling.  Now these can be specified separately,
allowing for more variation in both STG defined and
random buildings.

Requires simgear commit 053bda26a43314a91b01b08cd4617da82f7ab807
2019-09-25 21:56:22 +01:00
Stuart Buchanan
4784a929d7 Instance based random buildings
Replace random buildings with one using proper instancing.
Also implement more control over rendering of random buildings.
see README.scenery for details.
2019-08-20 17:02:27 +01:00
Scott Giese
f43ea66022 Cliffs effect and fragment shader by James Hester.
Based on rock-ALS.frag and rock.eff.
2019-03-31 15:28:34 -05:00
Thorsten Renk
3e4234717b ALS: Traffic shader uses car images on texture - artwork by Gilberto Agostinho 2019-01-14 13:57:02 +02:00
Thorsten Renk
7552c2921e ALS: Add display effect - dust overlay texture provided under GPL 2+ by Martin Litzenberger 2018-09-01 09:54:42 +03:00
Thorsten Renk
a4960e14fa ALS: Detailed scattering model for light on Cirrus clouds 2018-09-01 09:42:34 +03:00
Thorsten Renk
3ebc1af5ac Add building flag to cityLM (OSM structure effect) to get fallback up direction 2018-09-01 09:25:59 +03:00
Thorsten Renk
cce0fac2f8 ALS: New cloud rendering detail level with more dramatic Mie scattering at cloud fringes done inside fragment shader 2018-08-30 09:17:36 +03:00
Thorsten Renk
69e8d90247 ALS: Tentative fix for random building fog issue II - fall back to old up-vector computations when building flag is set 2018-02-11 09:46:21 +02:00
Thorsten Renk
6575f2f71e Traffic shader: disable normal map request in effect as we don't seem to supply one and the fallback produces odd results 2018-01-30 10:06:04 +02:00
Thorsten Renk
d5a8eb4713 ALS: Tentative fix for cloud shadows on overlay layer 2018-01-29 09:38:28 +02:00
Thorsten Renk
d9e55dc2e5 Improvements to Earthview: enable changing cloud density, fix aurora z-ordering issue, let moonlight give a relief effect to clouds 2018-01-29 09:25:38 +02:00
Thorsten Renk
e5f4b0a511 More infrastructure for perception filtering of moonlight 2017-11-13 10:27:25 +02:00
Thorsten Renk
405e754583 Tentatively fix z-ordering issues with geometry shader grass 2017-11-13 09:49:35 +02:00
Thorsten Renk
a913d3be38 Fix missing display size uniforms for ALS glass shader with filter option 2017-09-19 11:46:30 +03:00
Thorsten Renk
a3b8131a97 Change overlay render bin (seems to be better-behaved) 2017-09-18 13:16:29 +03:00
Thorsten Renk
a7e2ffc869 Some fixes for the ALS overlay shader 2017-09-18 12:47:21 +03:00
Thorsten Renk
7df5690f08 ALS terrain overlay shaders, not yet used, terrain definitions will follow post-release 2017-09-16 09:44:18 +03:00
Thorsten Renk
7c72687ed7 ALS: rotor wash effect for volumetric grass and water shaders 2017-06-27 11:01:23 +03:00
Thorsten Renk
746e80547e ALS - begin infrastructure for moonlight perception filtering 2017-06-18 10:08:39 +03:00
Thorsten Renk
79244fd5e4 ALS model shader: allow dirt overlay to change surface reflectivity, add grain merge reflection type to space shader 2017-06-18 09:35:32 +03:00
Thorsten Renk
0ce15870f3 ALS road shader: show car tail lights dependent on view direction, change road lighting model such that high traffic density causes additional illumination 2017-06-11 09:42:47 +03:00
Thorsten Renk
32ff0056ef Daily variation of road traffic with commuter rush hours based on actual traffic studies for ALS road shader 2017-06-09 12:07:51 +03:00
Thorsten Renk
290f22d5ef ALS volumetric grass responds to wind 2017-06-08 13:19:59 +03:00
Thorsten Renk
a7b916a244 ALS model effect accepts a snow flag to let OSM building roofs be snow-covered in winter 2017-06-03 18:01:02 +03:00
Thorsten Renk
0b6ef218b1 Glow effect for ALS space shader, converting a temperature into surface blackbody radiation color 2017-05-26 12:19:06 +03:00
Thorsten Renk
8f7ab7e725 Volumetric grass effect for ALS utilizing a geomerty shader, based on work by Fernando Garcia Linan 2017-05-24 15:16:30 +03:00
Thorsten Renk
4300eae9bd Set default streetlight color to orange 2017-05-13 13:00:37 +03:00
Thorsten Renk
1cf4b9d6a5 Fix ice overlay on ALS inland water effect 2017-05-11 13:58:43 +03:00
Thorsten Renk
400e628417 Tentative fixes for OSM structure lightmaps 2017-05-11 13:52:27 +03:00
Stuart Buchanan
d5b8ae9ccf osm2city building, road, railway materials. 2017-05-09 14:16:44 +01:00
Thorsten Renk
2f99804dba More variation for the ALS aurora simulation, WIP 2017-04-27 14:18:55 +03:00
Thorsten Renk
60f63cb2af Earthview: support for heightmapping and moonlight illumination 2017-04-20 11:27:47 +03:00
Thorsten Renk
f5be115145 Another ALS HUD bugfix, cannot have two uniforms named the same 2017-04-19 09:52:53 +03:00
Thorsten Renk
f24ff3ef32 Bugfix for ALS HUD effect/filtering interaction 2017-04-18 16:41:55 +03:00
Thorsten Renk
b50af8ff47 Bugfix and noise seed option for ALS thrust flame shader 2017-04-17 10:30:49 +03:00
Thorsten Renk
48768ee9d2 Earthview 2.1 - parallax mapping for cloud layer, lightning at night, Rayleigh scattering in atmosphere and minor bugfixes 2017-04-05 16:50:31 +03:00
Thorsten Renk
bdab63dc97 ALS: Fade rendering of impostor clouds out explicitly in poor visibility 2017-03-15 17:34:13 +02:00
Thorsten Renk
5181edd8cf ALS road shader: Allow to reverse traffic direction 2017-03-09 14:07:20 +02:00
Thorsten Renk
bfc6a014bb ALS road shader: add procedural snow, make lighting switchable 2017-03-09 14:00:09 +02:00
Thorsten Renk
7cbdc2cbfe ALS road effect: Configure streetlight color, simulate traffic jams 2017-03-07 12:10:34 +02:00
Thorsten Renk
58ef0ce998 ALS road shader development 2017-03-06 12:21:54 +02:00
Thorsten Renk
e503971ab1 Groundwork for OSM-specific shaders - stub for road shader (at the moment trivial), property rules to generate lightmap factor 2017-03-05 13:01:11 +02:00
Thorsten Renk
d3c93a2c64 More ALS filter work 2017-03-05 12:36:51 +02:00
Thorsten Renk
47a8ac62e1 More ALS g-force effect work 2017-03-04 10:31:27 +02:00
Thorsten Renk
d683845745 Integrate cloud impostors properly into ALS filtering framework 2017-03-04 09:37:42 +02:00
Thorsten Renk
662d782f98 Groundwork for ALS g-force blackout filter, WIP 2017-03-03 19:50:13 +02:00
Thorsten Renk
498439379a ALS HUD effect approximating the appearance of light projected on the combiner 2017-02-24 09:28:54 +02:00
Thorsten Renk
e1dcd3f38c Run urban shader in lightmap-only mode when either random or OMS buildings are enabled 2017-02-23 10:13:22 +02:00
Thorsten Renk
f852460713 ALS drag/parachute animation shader 2016-12-10 10:40:25 +02:00
Thorsten Renk
5c437d74cb Earthview 2.0 - support for normal maps, better upper atmosphere edge, cloud relief shader, improved dawn zone, horizon estimation, improved resource management,... 2016-11-17 20:54:32 +02:00
Thorsten Renk
950fc0ab22 Additions to ALS model shader suggested and partially implemented by Heiko Schulz: alternative reflection coloring model, Fresnel effect and normal map distortion of environment reflections in an efficient approximation 2016-11-17 19:01:46 +02:00
Thorsten Renk
f881091bbb Fix lowest quality building shader bug 2016-11-17 18:58:45 +02:00
Thorsten Renk
400409f10b Bugfixes for ALS light addition 2016-08-18 09:25:03 +03:00
Thorsten Renk
0a853f5a4d Domain-based de-tiling for Southern Europe city definitions 2016-08-08 10:05:43 +03:00
Thorsten Renk
e9bafac525 ALS urban shader development, minor fixes 2016-08-08 09:19:22 +03:00
Thorsten Renk
6cdc86c9d7 Blend option for ALS urban shader effect 2016-08-05 12:57:21 +03:00
Thorsten Renk
12f4129a0d Lightspot effect for ALS runway shader 2016-08-01 12:32:57 +03:00
Thorsten Renk
1e51bf00c0 Experimental additional lighting options for ALS model shaders 2016-07-31 10:29:02 +03:00
Thorsten Renk
8283c215c8 Sort Earthview cloudlayer into depth-ordered render bin to avoid z-ordering issues 2016-06-21 12:44:44 +03:00
Thorsten Renk
f6a44ca869 Support for city night lights in Earthview 2016-06-13 13:00:27 +03:00
Thorsten Renk
379dd17b3d ALS maintenance: bugfix for cloud impostors, 'inverse' Mie for cloud shader, glare for translucent objects proportional to 1-alpha rather than on-off 2016-06-12 15:22:11 +03:00
Thorsten Renk
ebd87c1427 Fix trees for non-antialiasing technique 2016-05-15 10:23:51 +03:00
Thorsten Renk
94c96a29c7 ALS bird shader 2016-04-30 21:27:28 +03:00
Thorsten Renk
fc868d5d0b Fix wingflex shader for dragon 2016-04-29 17:28:28 +03:00
Thorsten Renk
f3d79f18e3 Rain layer effect to ALS filtering 2016-04-08 15:57:59 +03:00
Thorsten Renk
5134fa2a61 AW drives diurnal terrain temperature differences 2016-04-08 10:49:55 +03:00
Thorsten Renk
3146d6e4fe Filtering for most remaining ALS shaders 2016-04-06 09:26:49 +03:00
Thorsten Renk
e9bac7dac4 Fix tiling issues in Tropical South America airport keep definitions 2016-03-28 18:19:05 +03:00
Thorsten Renk
31c2312732 Prepare rock and base terrain effect for ALS filtering 2016-03-28 13:25:47 +03:00
Thorsten Renk
bb8e93da97 Enable filtering for ALS lower quality terrain, water and model shaders 2016-03-27 20:27:32 +03:00
Thorsten Renk
9afc904482 Prepare ALS tree shader for filtering, add functionality for (optional) agressive optimization 2016-03-26 09:02:51 +02:00
Thorsten Renk
fbc81836c0 Add urban and agriculture effects to ALS filtering scheme 2016-03-25 10:49:07 +02:00
Thorsten Renk
cbc851d415 Extend ALS flitering to more effects 2016-03-18 09:32:34 +02:00
Thorsten Renk
8bf55eec3c More work on ALS filter code - noise and vignette for night vision, IR vision work 2016-03-17 14:40:37 +02:00
Thorsten Renk
5bd2faab04 Preparation for filtering (gamma, brightness, night vision) for ALS 2016-03-14 11:43:55 +02:00
Thorsten Renk
2366eaec94 More customizable ALS airport keep effect 2016-02-03 10:01:59 +02:00
Thorsten Renk
f08f21902c More structure for Aurora Borealis rendering in ALS 2016-02-03 09:14:42 +02:00
Thorsten Renk
97cc53d7b3 Procedural aircraft lights for ALS - WIP 2016-02-03 09:13:30 +02:00
Thorsten Renk
3ab3ba72e6 Support for Aurora Boeralis for ALS skydome and Earthview 2016-01-10 10:07:21 +02:00
Thorsten Renk
88bc96d346 Aurora Borealis shader effects for Earthview - not yet used 2015-12-23 13:39:45 +02:00
Thorsten Renk
a6110f9b48 Light scattering phenomena for ALS: rainbow, halo, sundogs and light pillar 2015-12-21 13:07:32 +02:00
Thorsten Renk
c275d3a8ad Improved light curves for Earthview in low light 2015-12-07 08:43:58 +02:00
Thorsten Renk
88bd9e97a4 Wing motion shader, currently adapted for Pterosaur Dragon model 2015-11-08 22:34:12 +02:00
Thorsten Renk
8e03960e3b Tentative procedural skid marks for paved runways, work in progress 2015-10-27 15:18:45 +02:00
Thorsten Renk
def0ee20d4 Vertical offset for ALS landing lights by Wayne Bragg 2015-10-22 12:06:12 +03:00
Thorsten Renk
9a53f8e331 Improvements to ALS dirt runway shader effect 2015-10-19 12:25:07 +03:00
Thorsten Renk
b45611c4f1 Tweaks to high quality space shader 2015-08-28 10:13:29 +03:00
Thorsten Renk
87a2f55562 Higher quality space shaders 2015-08-27 14:46:05 +03:00
Thorsten Renk
454fa8df8f More work on rendering lighting in ALS, public domain NOAA image resources are gratefully acknowledged 2015-08-12 11:31:05 +03:00
Thorsten Renk
a48dea9e48 Lightning for AW with ALS support - work in progress 2015-08-11 16:28:32 +03:00
Thorsten Renk
6168bbebf8 Bugfix for ALS effect indexing errors 2015-08-10 09:36:20 +03:00
Thorsten Renk
93e314a02a Irradiance map and residual ambience support for ALS model interior effect 2015-08-08 13:37:15 +03:00
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
Thorsten Renk
3d47f51761 Fix for broken bowwave effect under ALS 2015-05-26 14:19:56 +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
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