1
0
Fork 0
Commit graph

159 commits

Author SHA1 Message Date
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
Stuart Buchanan
78f72a5ec3 WS30: Landclass to material map in materials.xml
Initial mapping of landclass to material names based
on CORINE.
2020-11-29 19:31:31 +00:00
Stuart Buchanan
4aff635cdb WS3.0: Initial commit of WS3.0 rendering 2020-11-08 22:44:34 +00:00
Erik Hofman
99ecc9a563 Some final tweaks to the iceland scenery 2020-10-30 12:32:52 +01:00
Erik Hofman
b82963c540 Complete overhaul of the Iceland materials file 2020-10-29 23:55:36 +01:00
Erik Hofman
5b01752fb0 Some final tweaks for a more consistent look and feel 2020-10-28 10:00:33 +01:00
Erik Hofman
e2b200cd27 Greatly improve the Brazilian cerradio areas (near SBMQ) 2020-10-27 12:45:31 +01:00
Erik Hofman
21675f903f vnts:
Materials changes version 2 - Iceland and California

1. Keep regional definitions for the new default airport BIKF, and Iceland. Uses
 new grass colours texture airport-grass-summer3.png with custom autumn effect i
n alpha channel, and bare volcanic bare ground layer - to produce patchy grass a
nd blend in with surrounding landclasses. 3d grass overlays have height modulati
on turned on so grass patches are followed. Actual grass cover and colour at BIK
F varies a lot even for the same month in different years going by photos, needs
 autumn effect to depict the range properly. The grass near the terminal areas s
eems to receive a more water while the rest is often quite bare in photos - the
current patchy-ness is a compromise. The texture for low settings is still autum
n-grass-summer2.png.

2. Keep regional definitions for KSFO and California. Switches to grass effect s
o 3d grass is enabled. Grass layer and patchy bare ground layer format with heig
ht modulation for 3d grass. Currently tuned to hints of dry green grass similar
to the old version.
2020-10-22 15:13:04 +02:00
Erik Hofman
a59ca8bd24 DOS line endings to Unix line endings 2020-10-22 15:12:20 +02:00
Erik Hofman
407350229f Also improve the littoral areas for other regions with the default littoral definition. 2020-10-18 15:30:42 +02:00
Erik Hofman
7583a51b0a Improve littoral areas 2020-10-18 11:27:23 +02:00
Erik Hofman
bf9c0f12e1 Materials changes version 1
1. Changed airport_grass_overlay.png to airport_grass_structure_overlay2.png

- africa_rainforest.xml, azores.xml, brazil_amazon_forest.xml, brazil_pampas.xml, brazil.pantanal.xml, california.xml, corse.xml, global-summer.xml, mexico.xml, south_east_asia.xml, southern_europe.xml, tropical_south_america.xml, us_southwest.xml

2. Added old airport_grass_overlay.png as airport_grass_structure_overlay1.png
- jan-mayen.xml, ascension.xml (volcanic island)

3. Changed <overlay_layer_magnification> for files using airport_grass_structure_overlay2.png. Conversion: 8.0 units in structure_overlay1 = 60.0 units in structure_overlay2.

- 60.0: africa_rainforest.xml, azores.xml, brazil_amazon_forest.xml, brazil_pampas.xml (4.0), brazil.pantanal.xml, california.xml (grain_layer), corse.xml (grain_layer), global-summer.xml, jan_mayen.xml, mexico.xml (grain_layer 4.0), south_east_asia.xml, southern_europe.xml (grain_layer 4.0), tropical_south_america.xml (grain_layer), us_southwest.xml (grain_layer)

4. Specified <overlay_layer_magnification> for AirportKeep using a normal texture in the n="14" slot instead of a structure texture without specifying magnification. The reason is the new default structure texture uses a much higher magnification. The old value used was 8.0 from global-summer.xml.
- us_southwest.xml (8.0), california.xml (8.0),

5. Specify <grain_layer_magnification> as 4.0 for jan-mayen.xml. Global-summer.xml didn't specify it so the material got settings from the effect default.

6. Multiply alpha channel of airport_grass_structure_overlay2.png by 0.7 to reduce very subtle tiling to almost zero for worst case (e.g. white areas of southern_europe.xml keep). This is visible only at closer ranges at very specific angles. Change southern_europe.xml grain_layer_magnification to 50.0. Best fixed with grain_alpha uniform.a new

7. Increase <overlay_alpha> to greater than 1.0 in global_summer.xml for structure overlays for keeps to compensate for multiplying strucuture_overlay2.png alpha by 0.7. Target goal was 0.85 - there is some almost imperceptible tiling from very specific angle close up and this can be lowered a bit further if needed.

8. Specify <overlay_alpha> as 1.0 for overlays where airport_grass_structure_overlay2.png is not used, or is used in the n="15" grain layer slot.
- africa_desert.xml,  africa_mediteranean.xml, ascension.xml, brazil-caatinga.xml, corse.xml, california.xml, greenland.xml (new definition), hawaii.xml, iceland.xml (new definition), southern_europe.xml, tropical_south_america.xml

9. Changed name of airport-grass-autumn.png to airport-grass-summer2.png.

10. Use airport-grass-summer2.png (brown-grey-green) grass texture for in greenland.xml as the green one is out of place. D-ECHO is working further on Northern area keep.

11. Changed <texture> reference in california.xml from airport-grass-autumn.png to airport-grass-summer.png.

12 Grass scale for airport-grass-structureoverlay2.png: roughly 60 (roughly guessed by displaying RBG strucuture texture against airport_grass2.png.).

13. Changed california-grass.png to california-grass2.png:
mexico.xml,

14. Added 3d grass to california and iceland grass definitions.

15. Iceland and BIKF for the moment uses the dull brown-grey.green airport-grass-summer2.png. Once a control for specifying grass texture magnification is in it's possible to do a dark volcanic underlying texture with spots of grass/moss.

16. Started a Keep definition in europe.xml so maybe in future a new global grass type can be a bit less yellow than for Europe and mid latitude locations away from the equator.

----
Note:

Possible unresolved minor problem found with colour of 3d grass: AirportKeep effects can specify textures with grass colours in either the base slot or the overlay slot. e.g. us-southwest.xml specifies the grass colour in the overlay slot and the ground underneath in the base layer slot.
The 3d grass shader assumes a magnification of 1.0. When overlay or base layer magnifications are not 1.0 same the grass colours don't quite line up. Some difference between ground underneath and grass is probably desired to make the grass blades more obvious. It's not a big problem in dryer areas as the grass density is low and the dry textures colours are similar looking. Eventual fix: add a <grass_color_layer_magnification>.
2020-10-13 10:38:41 +02:00
Erik Hofman
738cd3d963 Fix an issue for deserts introduced by the texture color matching process: too dark spots in the desert 2020-10-08 12:37:21 +02:00
Erik Hofman
8f38c737a2 Improved California regional definition by vnts 2020-10-07 13:35:40 +02:00
Erik Hofman
cf24eb2376 Improved airport grass overlays in coorporation with vnts 2020-10-07 13:35:12 +02:00
Erik Hofman
687df1abf6 Update the global materials to use the new summer grass airport keep 2020-10-06 10:15:26 +02:00
Delta Echo
d850f211fb Add Cliffs material to Rock material block in regions/global and regions/europe 2020-07-12 07:31:03 +02:00
Stuart Buchanan
ce0373cc2c 60N minimum lat for N Atlantic Island materials
Change the minimum latitude for the North Atlantic Islands
regional materials from 55N to 60N.  This means it doesn't
cover Scotland, and therefore interfere with the united_kingdom.xml
materials.xml.

This was causing a problem in cases where united_kingdom.xml was
inheriting texture definitions, in particular Landmass.
2020-05-23 18:50:33 +01:00
Rick Gruber-Riemer
85570b2f29 Adding default material for buildings lists (used e.g. in osm2city) 2019-11-10 18:42:38 +01:00
Thorsten Renk
ce80930dc9 Improved material definitions for Jan Mayen island by Jonathan Redpath 2019-10-06 11:34:15 +03:00
Delta Echo
24553feb57 Fix duplicate material name as pointed out by Scott 2019-08-30 09:45:53 +02:00
Delta Echo
41b1561b9d Merge branch 'next' of ssh://git.code.sf.net/u/deltaecho/flightgear_fgdata into next 2019-07-30 07:43:30 +02:00
Delta Echo
b305eae6f8 Add support for more linear airport features 2019-07-29 15:46:57 +02:00
Scott Giese
9d7cbc1810 [asia] Terrain/deciduous-hires_mask.png does not exist 2019-07-04 13:58:42 -05:00
Thorsten Renk
2622ae8222 Overlay effect definitions for Iceland regional texturing 2019-05-20 09:58:45 +03:00
Richard Harrison
adb6553cc0 Asia regional textures;
Credit to V12 : https://forum.flightgear.org/viewtopic.php?t=35717&p=347120#p347120
2019-04-29 17:11:12 +02:00
James Turner
b42f58779e Winter greenspace material friction improvement
By Wayne Bragg
2019-03-26 21:16:26 +01:00
wlbragg
c15ab03ad8 Change rolling-friction and add friction-factor to winter "frozen water" land classes 2019-03-17 19:39:35 -05:00
Keith Paterson
1a9f4eb0d4 Review issues 2019-03-03 19:32:44 +01:00
Keith Paterson
b05c60262f Sand airport keep for Barra (EGPR) 2019-03-03 16:17:46 +01:00
Thorsten Renk
8102f8f96d Tweaks and autumn fix for Europe regional textures 2018-09-17 11:34:46 +03:00
Thorsten Renk
740356ec8e Overlay effect definitions for North Atlantic Islands, airport and keep for Jan Mayen island 2018-09-15 10:25:45 +03:00
Thorsten Renk
3ce77a7733 Improved visuals for mediterranean shrublands using new vegetation texture sheet and overlay effect 2017-11-12 17:43:21 +02:00
Thorsten Renk
cfa967db1d Redesigned regional definitions for Scandinavia - automn coloring corrected, overlay definitions for close visuals 2017-09-26 09:20:11 +03:00
Thorsten Renk
a55c14c3ec New Hawaii regional texture definition using new shrub texture and ALS overlay texturing effect 2017-09-18 12:59:19 +03:00
Thorsten Renk
23dcec6340 Mojave desert shrub textures extracted from CC0-licensed imagery 2017-06-04 14:11:08 +03:00
Thorsten Renk
7c44bf6721 Activate ALS volumetric grass effect for more regions 2017-06-03 17:45:04 +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
4e75be8d86 Mediterranean evergreen tree textures (cypress, cedar, pine,...) based on CC0 licensed photographs on pixabay and publicdomainpictures 2017-05-22 12:21:57 +03:00
Stuart Buchanan
d5b8ae9ccf osm2city building, road, railway materials. 2017-05-09 14:16:44 +01:00
Torsten Dreyer
5e47e6d04d Azores custom scenery from Benedikt Wolf
Ref:
https://sourceforge.net/p/flightgear/mailman/message/35640805/
2017-02-02 07:03:51 +01:00
Thorsten Renk
0a853f5a4d Domain-based de-tiling for Southern Europe city definitions 2016-08-08 10:05:43 +03:00
Thorsten Renk
8d6413796a Some preparation for Rio Visuals 2016-08-08 09:20:04 +03:00
Thorsten Renk
6cdc86c9d7 Blend option for ALS urban shader effect 2016-08-05 12:57:21 +03:00
Thorsten Renk
69a3e1e717 Regional definitions for Bermuda 2016-07-22 14:15:07 +03:00
Thorsten Renk
0755e55b87 Hue blending between Caribbean textures and birds for the region 2016-05-03 11:15:29 +03:00
Thorsten Renk
de451490bb Tweak for more consistent colors in mediterranean texture scheme 2016-05-03 10:54:33 +03:00
Thorsten Renk
fb4f5497df A few birds for Spain regional definitions 2016-05-02 13:56:13 +03:00
Stuart Buchanan
c536976237 Correct number of tree varieties for Med marshland
... was causing odd quadruple tree formations.
2016-04-11 21:12:45 +01:00
Stuart Buchanan
97d54bf17f Make LOD for trees/buildings/objects/STG configurable.
Now based on /sim/rendering/static-lod/rough.

This commit removes a large number of range
settings that should in general be set by the user.
2016-04-08 22:39:29 +01:00