1
0
Fork 0
Commit graph

205 commits

Author SHA1 Message Date
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
Thorsten Renk
e98b4ef46f De-activating California regional definitions for the time being, this really needs to be merged carefully into the existing US Southwest to avoid jarring visuals 2016-04-06 09:42:43 +03:00
Thorsten Renk
4bc3619fdb Restore Florida regional definitions 2016-04-01 13:17:36 +03:00
Thorsten Renk
5ba62b5f12 Remove rainfores-hires.png - the texture is near-identical to rainforest-hawaii.png, larger than the agreed-upon size for terrain textures and tiles with pronounced seams 2016-03-30 11:38:53 +03:00
Thorsten Renk
523135cfae Easing tiling and contrasts in South America rainforest 2016-03-29 09:11:12 +03:00
Thorsten Renk
58cdc743d1 Fix area definition of Pantanal 2016-03-29 07:56:54 +03:00
Thorsten Renk
8e3434cdcb Tweaks to close-up visuals of airport keep 2016-03-28 18:39: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
6a423160dd Alaska forest terrain as test case for ALS tree optimization shader 2016-03-28 12:58:09 +03:00
Thorsten Renk
b64945929f Fix wrong tree number and mitigate tiling issues in Southern Europe regional textures 2016-03-26 08:58:35 +02:00
Thorsten Renk
ceac7032a4 Fix regional definition hierarchy problems 2016-03-26 08:49:28 +02:00
Thorsten Renk
b7e543960b Starting to fix tiling in CA regional textures 2016-03-25 10:36:14 +02:00
Erik Hofman
7736e9ab80 agsagostinho:
the fixes missing from FGDATA are:

- fixing the Portuguese and Spanish islands in the Atlantic (Madeira, etc.) which had been erroneously assigned to Africa given their proximity. Now they belong to European Mediterranean region, which makes them look better
- improvements to autumn textures in Europe
- huge improvement of the airport grasses all over the world, including hi-res overlays
- matching runway shoulders for the whole globe
- Asian capitals added to list of large cities so they get more density of road lights
- Emirates region

and possibly more.
2016-03-24 14:17:50 +01:00
Thorsten Renk
630a46c11d Restoring the airport keep effect for CA. This isn't just an aesthetic problem - at lower quality levels it's needed for rendering landing lights and in general for snowdrift and the runway edges without creating visual artifacts. Such artifacts at the runway edge where pilots regularly look are far more worrisome than at the interface between airport keep and terrain 2016-01-11 08:44:31 +02:00
Erik Hofman
41562e4b87 Gilberto Agostinho:
I created a substantial quantity of new work in the New Regional
Textures project and I would like to ask if anyone could review and
perhaps commit them into FGDATA. The modifications are:

- New textures and material definitions for California
- New textures and material definitions for Mexico
- New material definitions for Central America
- New textures and material definitions for Southern Europe
(Mediterranean region: Portugal, Spain, south of Italy, Greece, coast of
Balkans)
- New airport grass texture (global)
- New airport grass texture for Latin America
- New American town texture (global)
- Small improvement to grass blade textures (to better fit the airport
grass texture)

If this will be committed, we must add a note thanking the United States
Geological Survey (USGS) for the satellite images of California (
http://www.usgs.gov/ ) to the Thanks file.
2015-12-30 17:13:18 +01:00
Erik Hofman
4cfda541ad Gilberto Agostinho:
I created a substantial quantity of new work in the New Regional
Textures project and I would like to ask if anyone could review and
perhaps commit them into FGDATA. The modifications are:

- New textures and material definitions for California
- New textures and material definitions for Mexico
- New material definitions for Central America
- New textures and material definitions for Southern Europe
(Mediterranean region: Portugal, Spain, south of Italy, Greece, coast of
Balkans)
- New airport grass texture (global)
- New airport grass texture for Latin America
- New American town texture (global)
- Small improvement to grass blade textures (to better fit the airport
grass texture)

If this will be committed, we must add a note thanking the United States
Geological Survey (USGS) for the satellite images of California (
http://www.usgs.gov/ ) to the Thanks file.
2015-12-30 10:06:57 +01:00
Thorsten Renk
a89c966067 Use hires tree textures in US Southwest 2015-11-08 20:38:15 +02:00
Thorsten Renk
b40b1a8696 Skid marks enabled for concrete runways 2015-10-30 15:14:36 +02:00
Erik Hofman
507f8f7f68 Gilberto Agostinho:
I did quite a lot of work on textures and materials lately and I'd like
to ask if someone could please take a look on it and maybe commit it to
FGDATA if judged positively.

Starting with commit 0da71d2288836df05548f5f343fe3977ebb2955f of my
repository (see
https://github.com/gilbertohasnofb/new-regional-textures/commits/master
) I did:

- improved urban effect for the Latin American city texture
- improved the Mediterranean city texture (and also better urban effect)
- created new textures for asphalt and concrete runways
- created a new industrial texture (as well as winter version and urban
effect)
- created winter versions for European 18th century city and town textures
- applied urban effect to European 18th century city and town textures
- created a new material in which small areas around 80 large cities
around the world in which the street lights have higher density (1000
for mega cities such as NY and Tokyo, 2000 for large cities such as
Munich and Dubai, while keeping the default 10000 for all the rest of
the globe)

I also created a texture with skid marks for Thorsten's new effect, but
we are still working on this one and this may not even be used.
Everything else is ready to go.

I know this is a lot of things to test, and as Thorsten pointed out in
the forum I it would be better if next time I submit my work in several
chunks (which makes testing easier). So I could break this new work like
that if necessary, but here is a reasonable plan for anyone willing to
test it as it is now:

- start at LIRN at noon during summer. Check the new asphalt runway.
Take off fly around the city centre (it's just in front of the airport).
Test the improved European 18th century city and town textures, as well
as the new industrial texture. Change the environment to winter and
check these three textures once again.
- start at KLAX at noon. Check the new concrete runway. Take off, change
the time to midnight and check the street lights (Los Angeles is a "mega
city" so should be very bright).
- start at SBRJ at noon and check the improved Latin American city
texture. Take off, change the time to midnight and check the street
lights (Rio de Janeiro is a "large city" so should be quite bright).
- start at DTTG @ runway 06 and check the town by the left of the
airport for the improved Mediterranean city texture.

Also, there are plenty of screenshots of this work starting with this
post here: http://forum.flightgear.org/viewtopic.php?f=5&t=26031&start=150#p261282
2015-10-30 10:24:13 +01:00
Thorsten Renk
8e03960e3b Tentative procedural skid marks for paved runways, work in progress 2015-10-27 15:18:45 +02:00
Thorsten Renk
9a53f8e331 Improvements to ALS dirt runway shader effect 2015-10-19 12:25:07 +03:00
Stuart Buchanan
aea4e306c9 Minor updates to Brazil regional texture defs.
from Gilbert AGOSTINHO.

Commit 39767ef05cc89ce4af1719784afaaf2ecfc0cc96
from https://github.com/gilbertohasnofb/new-regional-textures
2015-07-24 18:25:54 +01:00
Erik Hofman
432a442afc New regional texture specifications from Gilberto (gsagostinho) for savanna, tropical, pampa, latin america, brazil and africa 2015-06-14 11:29:16 +02:00
Thorsten Renk
79fbcfe777 Regional texture definitions for Florida 2015-05-25 15:01:35 +03:00
Thorsten Renk
12c0eb98f4 Bugfix - winter scenery has no ocean landclass defined 2015-02-25 15:34:31 +02:00
Thorsten Renk
ce77fcfac9 European deciduous trees change autumn color in ALS 2015-02-18 10:35:00 +02:00
Thorsten Renk
95f060abc8 Europe uses procedural rock effect, Alaska uses detailed tree textures 2014-11-30 13:53:30 +02:00
Thorsten Renk
66f05c210f Grassland in CORINE data should not be rendered as fields, change suggested by forum user abassign 2014-11-03 09:57:36 +02:00
Stuart Buchanan
260282e11e Add missing definitions from previous format
Specifically
bb17edc1a90a5b58964280570e71253857983dc1
51474c93713c69f31c80332039abed45d99a4ed7
2014-08-17 21:43:48 +01:00
Stuart Buchanan
40930c1a77 New materials.xml format 2014-08-09 20:33:50 +01:00
Thorsten Renk
e6edd424c3 (Ugly) fix for runway designator signs being invisible in ALS - in principle, they should be rendered as objects and not terrain 2014-08-04 11:16:12 +03: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
4ff258ad70 US Southwest regional texture definitions 2014-06-17 10:04:44 +03:00
Thorsten Renk
856f45b472 Alaska and Northwest Territories regional texture definitions 2014-05-16 11:35:10 +02:00
Thorsten Renk
17799e8450 Vertically stratified noise function for ALS 2014-05-14 13:01:14 +03:00
Thorsten Renk
021133e657 Agriculture de-tiling effect for ALS terrain rendering 2014-05-05 14:27:33 +03:00
Thorsten Renk
37e6c44815 Fixes for incomplete autumn coloring 2014-03-17 09:42:38 +02:00
Thorsten Renk
bee317ccdc Alternative tree textures, deciduous variants based on work by forum user Zbyszek 2014-03-17 09:16:55 +02:00
Thorsten Renk
a505e29309 Regional texture definitions for Ireland 2014-02-17 09:49:13 +02:00
Thorsten Renk
aae72d7266 High quality dirt runway effect for ALS 2014-01-23 13:16:20 +02:00
Thorsten Renk
49d9da2af0 Regional texture definitions for South Africa 2014-01-23 11:40:40 +02:00
Thorsten Renk
cc6c7ab3d8 Revised regional texture definitions for Iceland for new world scenery 2014-01-14 11:19:51 +02:00
Thorsten Renk
df82561b75 Separate, non-agricultural texture definition for Grassland landclass, corrsponding fix for correct cloud generation on the landclass in Advanced Weather 2014-01-13 10:54:07 +02:00
Thorsten Renk
21cc0e08f7 Autumn coloring of natural crop landclass 2013-11-22 09:42:04 +02:00
Thorsten Renk
c747dcb1f1 Regional texturing definitions for Corsica 2013-11-22 09:29:53 +02:00
Thorsten Renk
3a9ddfa5ab Regional texture definition updates for Ascension Island (by Neilson) and Scandinavia to work with 2.0 world scenery 2013-11-22 09:14:08 +02:00
Thorsten Renk
410d29cca2 Ascension island regional definitions (by Neilson) 2013-10-17 10:55:06 +03:00
Thorsten Renk
b8996b8dab Scandinavia regional texture definitions 2013-10-17 10:49:34 +03:00
Clément de l'Hamaide
405b0577b1 Revert "Add materials definition for textured lines"
This reverts commit ce7358a23ca305f51fad983ba282e78798c9d0bd.
2013-10-01 00:52:33 +02:00
Clément de l'Hamaide
af47809f1b Add materials definition for textured lines 2013-09-30 23:17:05 +02:00
Vivian Meazza
63138932cb Add "lagoon" is preparation for next scenery build
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2013-04-28 22:45:15 +01:00
Thorsten Renk
f1c16e1592 Bugfix restoring trees to the Caribbean 2013-04-22 09:20:46 +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
ec0e9291e8 Madagascar regional texture definitions 2013-04-09 09:07:36 +03:00