1
0
Fork 0
Commit graph

696 commits

Author SHA1 Message Date
Fernando García Liñán
b3237e207a Add clustered shading support to most Effects and shaders 2020-12-22 10:53:31 +01:00
Fernando García Liñán
a058bed4d5 (Another) significant rework of the clustered shading feature 2020-12-22 10:53:31 +01:00
Stuart Buchanan
ba89f4c153 WS30: Improved material atlas
Add
- texture size
- shininess
- diffuse
- specular

from material.xml into the fragment shader via sampler1D.
2020-12-08 21:15:13 +00:00
Fernando García Liñán
00b465b84f Decrease shadow mapping bias and better 3rd cascade depth range 2020-12-06 14:44:03 +01:00
Stuart Buchanan
3e3593119c WS30: Shader change to use texture atlas
These changes use the generated Texture2DArray for
texture lookup, supporting arbritary sets of material
textures.
2020-12-05 13:11:59 +00:00
Fernando García Liñán
3f489619c5 Fix landmass geometry shader errors
It was using features from GLSL 120 and 150. Only use 120 features for now.
2020-12-03 23:24:40 +01:00
Scott Giese
5512934374 Photoscenery: patch to fix missed merge items.
Author: Nathaniel Warner
2020-11-23 20:55:30 -06:00
Scott Giese
76f7f1b698 Photoscenery: Initial commit
Author: Nathaniel Warner
2020-11-23 19:48:01 -06:00
Fernando García Liñán
7c16104149 Add the possibility to use shadow mapping on model-interior 2020-11-17 17:21:01 +01:00
Fernando García Liñán
ed3cbf96ff Make model-interior use a separate vertex shader
generic-ALS-base.vert uses shadows, while model-interior does not.
2020-11-17 00:57:56 +01:00
Fernando García Liñán
fc33a8d71a Fix non-ALS runway shader not implementing shadows 2020-11-17 00:41:02 +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
Erik Hofman
167cbc6a3d Changing file permissions to remove execute bit 2020-09-02 09:42:36 +02:00
Eatdirt
6f4279a5ed Remove rgb normalization and relax cut on NdotL to positive or null (fix visible redcuts) 2020-07-12 18:40:38 +02: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
73d7e5e1c2 Fix bug about body width 2020-03-02 10:05:17 +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
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
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
Thorsten Renk
1ab8786d37 Fix for light point sprite shader when light definition is initially small and creates nmerical issues 2019-10-06 11:26:42 +03: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
Fernando García Liñán
6d58c143c0 Added dithering as an ALS post-processing effect to prevent banding 2019-04-21 18:53:19 +02: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
d4cd51b43b ALS: Improve snow rendering of procedural rock shader 2018-09-17 11:21:35 +03:00
Thorsten Renk
d8c0387744 ALS: Fix rainbow fringing order in Cirrus clouds 2018-09-05 09:20:20 +03: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
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
d0789a1907 ALS: tentative fix for skydome monolith artifact - apparently this is a numerical accuracy issue (?) 2018-02-13 15:00:21 +02: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
1407ff3166 ALS: do not clamp haze color in object shaders, this leads to mismatch with terrain at high light intensity 2018-02-09 14:08:01 +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
Nikolai V. Chr
3283e9721f Ported the specular lightning from combined shader to ALS interior detailed shader, to make the spot independent of view direction. 2017-10-10 18:11:59 +02:00
Nikolai V. Chr
a206b3cb51 Change to the up vector used in sky irradiance light in ALS shader.
Models that are xml offset with pitch, heading or yaw should now be correct lighted.
2017-10-10 17:58:32 +02:00
Thorsten Renk
a7e2ffc869 Some fixes for the ALS overlay shader 2017-09-18 12:47:21 +03:00
Thorsten Renk
1c00d1d7d6 Tentatively make ALS grass shader more palatable to AMD/Radeon 2017-09-18 12:38:19 +03:00
Thorsten Renk
affad6c43f Remove unused g_num_layers from grass shaders 2017-09-16 09:47:14 +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
4e41f9b9be Make ALS procedural light shader palatable to nouveau driver 2017-09-01 12:57:11 +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
0df35c2516 ALS space shader: Allow dirt overlay to influence glow visuals 2017-06-14 15:06:05 +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
54f08d8891 Reverse traffic direction on dual-lane roads in ALS traffic shader 2017-05-15 09:55:28 +03:00
Thorsten Renk
1a0e8d22cb Support for dual-lane highways in ALS road shader 2017-05-13 13:22:22 +03:00
Thorsten Renk
0eff76715e Tentative fix for ALS cloud shadows leaking upward above cloud layer 2017-05-13 13:04:04 +03:00
Thorsten Renk
d7df75bff2 ALS road shader renders no lightmap when diffuse material red is zero, apply color correction for car headlights to avoid blending with base lightmap color 2017-05-09 18:19:23 +03: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
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
Erik Hofman
fdb76cb689 Thorsten Renk: since the 2d and 3d shadow share the fragment shader, you've unfortunately just broken the 2d shadow technique which does not generate varying alpha_correction in the vertex shader 2017-03-25 14:34:19 +01:00
Erik Hofman
44cabc2eec flug:
* fix the 'slanting shadow > 75 meters' problem
* lay down the shadow flat on the ground

wlbragg:
* add fading effect based o altitude
2017-03-25 09:57:36 +01: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
24375cfcb6 Tackle some lighting artifacts 2017-03-07 11:40:36 +02:00
Thorsten Renk
96193187b7 ALS road shader: Render car proxies, fix numerical issues 2017-03-07 10:32:05 +02:00
Thorsten Renk
58ef0ce998 ALS road shader development 2017-03-06 12:21:54 +02:00
Thorsten Renk
0349a7ca97 Some procedural road lightmapping code, currently inactive 2017-03-05 15:05:12 +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
0791c66c5f Make ALS procedural light sprite more palatable to nouveau GPU driver 2017-03-04 10:01:45 +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
5f5440be81 Correction to the reflection behavior of the ALS model shader suggested by Heiko Schulz 2017-02-24 08:51:28 +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
320eab688f Discard approximate HV solution in ALS model shader 2016-12-11 17:30:33 +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
wlbragg
dce488af92 ALS lightspot second projectable spot correction. 2016-10-05 14:47:44 -05:00
Thorsten Renk
e6646d9f8f ALS space shader darkmap also affects geolight 2016-08-19 12:14:17 +03:00
Thorsten Renk
400409f10b Bugfixes for ALS light addition 2016-08-18 09:25:03 +03:00
Thorsten Renk
c859fe7f89 Switch ALS model shaders to light addition in intensity space rather than perception space 2016-08-14 09:21:18 +03:00
Thorsten Renk
d1673bef6d Check surface normal when computing rain effect 2016-08-08 09:40:21 +03:00
Thorsten Renk
e9bafac525 ALS urban shader development, minor fixes 2016-08-08 09:19:22 +03:00
Erik Hofman
fc2db8871b Add an appropriate version number to all vertex shaders 2016-08-05 13:16:23 +02:00
Thorsten Renk
34f9480f2c Merge branch 'next' of https://git.code.sf.net/p/flightgear/fgdata into next 2016-08-05 12:57:35 +03:00
Thorsten Renk
6cdc86c9d7 Blend option for ALS urban shader effect 2016-08-05 12:57:21 +03:00
Erik Hofman
3fa2ade35f Add missing shader version tags for the other shaders too 2016-08-03 09:59:29 +02:00
Erik Hofman
727c3feb11 specify the shader version (default is 1.0): reported by glslangValidator 2016-08-03 09:31:07 +02:00
Thorsten Renk
12f4129a0d Lightspot effect for ALS runway shader 2016-08-01 12:32:57 +03:00
Thorsten Renk
5fc5e8263f Introduce detailed version of thruster flame 2016-08-01 11:47:44 +03:00
Thorsten Renk
8c3a321c21 Small tweak to lightning illumination of clouds 2016-07-31 15:40:03 +03:00
Thorsten Renk
1e51bf00c0 Experimental additional lighting options for ALS model shaders 2016-07-31 10:29:02 +03:00
Erik Hofman
f705d0f908 Fix a few GLSL errors as reported by glslangValidator 2016-06-29 11:53:24 +02:00
Thorsten Renk
4000ced617 Noise overlay for Earthview night light appearance 2016-06-14 10:15: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
94c96a29c7 ALS bird shader 2016-04-30 21:27:28 +03:00
Thorsten Renk
f3d79f18e3 Rain layer effect to ALS filtering 2016-04-08 15:57:59 +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
9de1d6751a Bugfix for ALS airfield shader 2016-02-17 10:30:32 +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
459d8a02e0 Simple Aurora Borealis strength manager dependent on viewer latitude 2016-01-10 13:00:15 +02:00
Thorsten Renk
3ab3ba72e6 Support for Aurora Boeralis for ALS skydome and Earthview 2016-01-10 10:07:21 +02:00
Thorsten Renk
7ab9b4be4f Reduce ALS surface light core desaturation for better color recognition (suggested by HHS) 2016-01-10 09:42:04 +02:00
Thorsten Renk
d6659667aa Bugfix - NVIDIA drivers are waaay too tolerant... 2015-12-30 13:14:00 +02:00
Thorsten Renk
3dc8b32f67 De-saturating the core of ALS surface and runway lights as suggested by Gilberto Agostinho 2015-12-29 11:53:46 +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
fd0b47865f Tentative change to linear-parabolic wingbeat animation for ALS wingflex shader 2015-11-14 13:27:38 +02:00
Thorsten Renk
9937c758c9 Change convention of wingsweep in ALS wingflex shader 2015-11-13 09:54:56 +02:00
Thorsten Renk
4f51ab3bec Wing sweep animation for ALS wingflex shader 2015-11-11 11:34:41 +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
403e18728a Change to light balance in ALS space shader 2015-10-09 19:48:37 +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
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
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