1
0
Fork 0
Commit graph

289 commits

Author SHA1 Message Date
Erik Hofman
151a00d31c Convert a few dds-only textures to png 2021-01-30 15:30:50 +01: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
Erik Hofman
4446373949 Remove the winter textures which are relaced with a snow shader now 2021-01-19 12:31:11 +01:00
Stuart Buchanan
d73b9d8128 WS30 Add transparency to primary material textures
The texture array used by WS30 requires that all
component textures be the same size and format.

This commit adds an alpha channel to those
png file used as primary textures in materials.xml
files which did not have one.
2020-12-05 12:46:06 +00:00
Eatdirt
b005ac0b5a Import slightly larger moon texture 2020-11-30 10:53:09 +00: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
7583a51b0a Improve littoral areas 2020-10-18 11:27:23 +02:00
Erik Hofman
ef3b0fffd5 Update the bathymery based on GEBCO 2020 data. Add land river colouring. 2020-10-16 13:44:25 +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
e1bc3d6744 Update to match the png version 2020-10-09 09:27:54 +02:00
Erik Hofman
5ee3aa97fc Fix some visible tiling 2020-10-09 09:27:21 +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
Erik Hofman
9f2a863409 Add a new summer airport grass texture and brighten up the autumn airport grass texture. 2020-10-06 09:23:49 +02:00
Erik Hofman
a28acaace0 A few more: Work towards a consistent hue, saturation and brightneess across textures. 2020-10-04 13:58:01 +02:00
Erik Hofman
9a1a1db295 Work towards a consistent hue, saturation and brightneess across textures. 2020-10-04 10:33:53 +02:00
Erik Hofman
a287f8ed1b Improved airport grass textures based on the old one and pictures I took myself 2020-10-03 12:59:35 +02:00
Stuart Buchanan
1079e5f803 Updated random building texture from Benih. 2020-09-12 16:30:01 +01:00
Stuart Buchanan
e3c975f23e Shader Buildings - Remove velux windows
Previously some rood textures included windows.  The transformations
that are now performed to create different roof types distorts these
textures, and in particular makes the roof windows incorrect. This
change simply removes the windows.
2019-12-08 18:47:09 +00:00
Delta Echo
4ecc3ce909 Merge branch 'next' of https://git.code.sf.net/p/flightgear/fgdata into next 2019-08-29 09:50:33 +02: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
Delta Echo
b305eae6f8 Add support for more linear airport features 2019-07-29 15:46:57 +02: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
8102f8f96d Tweaks and autumn fix for Europe regional textures 2018-09-17 11:34:46 +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
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
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
Rick Gruber-Riemer
cb11e863ec Atlas for 2017.2 using 16k*256 size
(cherry picked from commit b03580cb6d50c135948898f6584ff14da4569ba4)
2017-05-21 08:55:36 +02:00
Thorsten Renk
3458d8b420 OSM2City building texture atlas update request by Rick Gruber-Riemer 2017-05-18 08:15:25 +03:00
Stuart Buchanan
d5b8ae9ccf osm2city building, road, railway materials. 2017-05-09 14:16:44 +01:00
Thorsten Renk
c88b0d5060 Filter new splash screens through gimp import/export - fixes the crashes during splash load observed here 2017-02-26 10:27:48 +02:00
James Turner
4a27150cc3 New splash screens, remove old ones.
Still evaluating these, but this allows me to switch on the new code
path and get some feedback.
2017-02-25 21:50:14 +00:00
Thorsten Renk
6cdc86c9d7 Blend option for ALS urban shader effect 2016-08-05 12:57:21 +03:00
Erik Hofman
f716418b06 David Megginson: Fix VOR needle indicators for many aircraft 2016-05-30 09:39:21 +02:00
Thorsten Renk
0755e55b87 Hue blending between Caribbean textures and birds for the region 2016-05-03 11:15:29 +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
Erik Hofman
e03e6986ee Emilian pointed out that the actual depth map should be from +1m to -63m in 25cm increments which should be enough for any means. SO get back to the original texture with added rivers from the Natural Earth data set /and/ an added white line 1 pixel within the coast line. The end result should give the best of all needs, but might require just a bit of fine tuning for specific areas. 2016-03-28 10:28:02 +02:00
Erik Hofman
28f7caa800 Fine-tune the coastal depth map 2016-03-27 13:47:25 +02:00
Thorsten Renk
b7e543960b Starting to fix tiling in CA regional textures 2016-03-25 10:36:14 +02:00
Erik Hofman
b13f46e26e It was not yet meant to be committed but since it is push the smaller size version 2016-03-24 15:15:32 +01: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
Edward d'Auvergne
3bf57db6b4 Fixes for all PNG files with corrupted ICC color profiles.
The files were identified using the pngcrush software and repaired by stripping
out the PNG header including the ICC profile using the command:

$ pngcrush -fix -force old.png new.png; mv -f new.png old.png

Each file was manually checked in an image viewer to look for any corruptions.

This follows from the threads
http://thread.gmane.org/gmane.games.flightgear.devel/79895 and
http://thread.gmane.org/gmane.games.flightgear.devel/79898 .
2016-01-06 21:38:13 +01: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
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