James.Hester
c6b526f343
Create overlay mixing scales based on texture scale.
2021-07-26 11:13:00 +01:00
Fernando García Liñán
9eaef501c7
HDR pipeline: a lot of improvements to atmospheric scattering
2021-07-26 12:11:37 +02:00
Fernando García Liñán
1215f1eba2
HDR pipeline: add placeholder shaders for WS 3.0
2021-07-24 13:35:53 +02:00
Fernando García Liñán
96313e7eb0
Initial commit of the HDR pipeline
2021-07-23 07:46:05 +02:00
Fernando García Liñán
49fa42faac
Add shaders for osgText
2021-05-14 22:45:36 +02:00
Erik Hofman
55209d40b5
Cleanup:
...
- water.eff: technique 2: air_pollution uniform is not used by water-ALS-base.frag
- water.eff: ocean_flag is now a parameter
- water-inland.eff now inherits from water.eff as it's a copy, except for ocean_flag value
2021-05-10 11:52:28 +02:00
Stuart Buchanan
8a94ffa7e1
WS30 Use proper inheritance for ws30water
2021-05-08 20:41:58 +01:00
Erik Hofman
5abacfbaf4
Also use the new Gray-Alpha texture for water depth information for ws30 water too.
2021-05-07 15:39:48 +02:00
Erik Hofman
e741d069ab
Use the new Gray-Alpha texture for water depth information for inland water too
2021-05-07 15:24:47 +02:00
Erik Hofman
055ce55be4
Use a Gray-Alpha texture for water depth information and use the globe-colors.jpg texture for water color.
2021-05-07 15:14:56 +02:00
Stuart Buchanan
c87798c610
WS30i: Initial coastlines
2021-05-03 15:47:13 +01:00
Erik Hofman
6d0c1439f0
There is no reason not to keep ocean_depth_1 as a JPEG file saving around 120MB of diskspace (and installer space)
2021-05-01 12:55:16 +02:00
Fernando García Liñán
3497d531fc
Add dummy techniques to model-combined.eff
...
This should fix issues with empty techniques in effects inheriting from model-combined.
2021-04-29 12:44:58 +02:00
Stuart Buchanan
4db5d00c16
Simplify building.eff, fix lack of orthoTexCoord
2021-04-25 21:36:02 +01:00
James Turner
bde07c8862
Fix inherits-from breaking lightmap.eff fallback
2021-04-22 10:29:59 +01:00
Fernando García Liñán
23f908665f
Fix random buildings shader errors
2021-04-16 07:46:35 +02:00
Fernando García Liñán
b6c0e65a38
Fix terrain-overlay.eff not properly checking for geometry shaders
2021-04-02 21:44:17 +02:00
Fernando García Liñán
69387f09f4
Reduce shader complexity and implement graphics presets
...
- All non-ALS Effects have been removed (except generic ones from model-default and terrain-default).
- The rendering dialog has been reworked to accomodate the changes.
- All necessary properties have been added to graphics-properties.xml
- Five graphics presets have been added: Minimal, Low, Medium, High and Ultra.
- Some unused properties have been removed from defaults.xml
2021-03-31 04:05:34 +02:00
Stuart Buchanan
bd4b4ffbec
WS30: Clean up WS30 Effect.
...
Remove redundant and possibly confusing texture assignment
2021-03-28 19:48:14 +01:00
Stuart Buchanan
0e578c1e78
WS30: Initial Water Effect and configuration
...
Separate Effect and configuration in landclass-mapping.xml
to identify which landclasses should use it.
2021-03-20 21:52:36 +00:00
Erik Hofman
f3ded8b3c2
Add support for snow on the rooftops
2021-03-02 11:51:27 +01:00
Scott Giese
09d6163ef7
Maintenance: cityLM Effort
...
remove leading slash
2021-02-27 00:26:39 -06:00
Stuart Buchanan
9d357e58e6
WS30: Improve ALS frame-rate
...
... by removing depth buffer check for scenery.
2021-02-06 18:01:58 +00:00
Stuart Buchanan
580c375d4b
WS30: Use perlin texture to reduce tiling
...
Use a perlin noise texture to rotate some of the landclass
textures to reduce tiling.
Also add a quality=1 technique which uses it.
2021-01-26 20:17:17 +00:00
Stuart Buchanan
d058b514f2
WS30: Add basic shaders
2021-01-23 17:15:12 +00:00
Fernando García Liñán
916322d0ed
Add clustered shading support to most Effects and shaders
2020-12-23 11:10:34 +01:00
Fernando García Liñán
7158dfdff3
Revert "Add clustered shading support to most Effects and shaders"
...
This reverts commit b3237e207a
2020-12-22 17:22:05 +01:00
Fernando García Liñán
b3237e207a
Add clustered shading support to most Effects and shaders
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
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
6a15207b42
Fix taxiway flickering at lower shader quality levels
2020-12-03 19:25:01 +01:00
Scott Giese
76f7f1b698
Photoscenery: Initial commit
...
Author: Nathaniel Warner
2020-11-23 19:48:01 -06:00
Stuart Buchanan
2a30377124
WS3.0: Remove Effect dependence on ALS.
...
For the moment, as we have only one technique, stop it from
only being active if ALS is active.
2020-11-21 22:07:40 +00: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
d2e5ad9d60
Remove unused fallback Effect
2020-11-17 15:28:01 +01:00
Fernando García Liñán
9b589f8061
Change shadow fallback technique index to -10
...
Canvas displays stop working with a technique index of 1000. There is no apparent reason for this, but changing it to 0 or a lower value fixes the issue. There doesn't seem to be any negative consequences from doing this.
2020-11-17 15:28: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
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
