1
0
Fork 0
Commit graph

319 commits

Author SHA1 Message Date
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
Thorsten Renk
83cbd1ec32 More detailed moon texture 2015-08-27 14:42:06 +03:00
Thorsten Renk
8e0e8ee4e0 Texture sun brilliance effect (requires SG patch to be seen) 2015-08-25 11:36:28 +03:00
Stuart Buchanan
46ee99255b Replace CC-BY-SA textures.
Replace textures that aren't GPL license-compatible.

From https://github.com/gilbertohasnofb/new-regional-textures
commit 581fb2795a4e068f807ad8c45558eddcf4c0b69c

As requested by Gilberto AGOSTINHO.
2015-07-05 19:49:32 +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
af2ce00f49 Detailed concrete texture by forum user Catalanoic 2015-06-07 20:21:20 +03:00
Thorsten Renk
79fbcfe777 Regional texture definitions for Florida 2015-05-25 15:01:35 +03:00
Edward d'Auvergne
fff6be0b10 Removal of the unused executable bit from two affected Textures PNG files. 2015-04-29 17:49:08 +02:00
Emilian Huminiuc
3dc0e641c1 Rewrite ubershader reflection. Objects using the dynamic option will now display the reflection properly when affected by a spin/rotate animation. Improved appearance of reflection + normalmap. Normalmap support added to random-buildings when ubershader active.
Also fixes some bugs exposed on AMD GPUs
2015-03-29 13:49:36 +02:00
Thorsten Renk
85486a0f51 Airport keep follows autumn coloring 2014-11-30 13:30:56 +02:00
Clément de l'Hamaide
1fa06dc92f Merge Textures.high into Textures 2014-08-27 19:40:36 +02:00
Thorsten Renk
6b67f6938b Improved runway shoulder to greenspace transitions 2014-08-04 11:05:19 +03:00
Rebecca Palmer
102e6b88e2 Restore previously-removed splash screens
Used at Viewer/splash.cxx:212-214
2014-06-16 08:19:56 +01:00
Rebecca Palmer
7a540ca6d6 Remove/move unused textures
Unused duplicate/downsampled and .dds-only textures are deleted,
unused unique .png are moved to Unused for possible future use
2014-06-12 23:53:24 +01:00
Thorsten Renk
bee317ccdc Alternative tree textures, deciduous variants based on work by forum user Zbyszek 2014-03-17 09:16:55 +02:00
Stuart Buchanan
b2f261ea0a Improved Random building texturesa - Gabo Huerta
Improved textures, lightmaps from Gabo Huerta.
Improved interaction with the urban shader from Thorsten Renk.
2013-12-28 20:36:49 +00:00
Clément de l'Hamaide
740921934e Change landmass colour to fix the appearance of rivers that have a sea material assigned 2013-11-18 17:04:48 +01:00
Vivian Meazza
85df642774 Sea colour effect by Emilian Huminiuc
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2013-11-03 18:41:20 +00:00
Clément de l'Hamaide
590acec3db Revert "Add new textures for textured line by Christian Thiriot"
This reverts commit d011ebfff1d0ce7681a1a13db7626a2c6def889c.
2013-10-01 00:53:04 +02:00
Clément de l'Hamaide
32fdc703d7 Add new textures for textured line by Christian Thiriot 2013-09-30 23:16:07 +02:00
Stuart Buchanan
88163bffad Square textures for mixed shrubs. 2013-05-19 21:41:38 +01:00
Stuart Buchanan
3929e8d091 Use square tree textures with reduce UV coordinates. 2013-05-19 21:30:20 +01:00
Stuart Buchanan
1b8c05b162 Fix black border on trees.
- Add additional property checks for multisampling.
- Add transparent background with appropriate color for each tree
- Add conversion script to generate .dds and low rez trees easily.
2013-05-16 22:40:36 +01:00
Stuart Buchanan
5689d76dca Change tree texture format from a 8x4 block to 32x1 to avoid UV bleeding problems. 2013-05-10 20:04:18 +01: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
Vivian Meazza
cf4b80c43d add Orchard textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2013-03-04 00:03:00 +00:00
Thorsten Renk
37205368d1 Regional definitions for North Atlantic Islands (Faroe, Shetland, Greenland, also updates for Iceland) 2013-02-25 14:38:32 +02:00
Vivian Meazza
c8a63c20ad Add UK Textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2013-02-16 09:22:35 +00:00
Thorsten Renk
deba78c4da Autumn colors by pixel postprocessing with color rotation encoded in the terrain texture alpha channel, used for Atmospheric Light Scattering 2013-02-11 14:01:31 +02:00
Thorsten Renk
3132065120 Regional texture definitions for the Middle East region 2013-01-29 13:06:45 +02:00
Thorsten Renk
2acdb6dd23 Iceland regional textures 2012-12-13 15:40:20 +02:00
Christian Schmitt
0a18e606da Add runway designation letters/numbers in an SVG file for future use for texturing
The letters are according to FAA AC 150/5340-1K
2012-12-09 14:57:40 +01:00
Stuart Buchanan
cb1ce70688 Increase opacity of clouds, discard transparent fragments. 2012-12-05 21:37:16 +00:00
Emilian Huminiuc
ca0afd7039 Updated signs textures
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-11-01 21:43:40 +02:00
Thorsten Renk
9be134b34d Procedural Texturing 2012-08-07 09:01:14 +02:00
Frederic Bouvier
c3bcb8a6de Add film wear to the cinema postprocessing effects 2012-08-05 18:51:02 +02:00
Frederic Bouvier
6013f3360e Night vision post processing effect in Rembrandt 2012-08-05 00:08:23 +01:00
Stuart Buchanan
ba6f14c435 Regional materials update:
- Re-factor common properties (including condition statements) into separate files.
Note that using "index=0" attributes these can be over-ridden.
- Add caribbean regional textures and building definitions
- Add missing low-resolution rainforest-hawaii.png
2012-07-19 22:16:24 +01:00
Emilian Huminiuc
f412338f41 refresh object masks
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 20:38:00 +03:00
Emilian Huminiuc
9d49f9643f Make water-inland.eff Rembrandt compatible.
Fix a longstanding ati bug in transition.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 15:58:42 +03:00
Emilian Huminiuc
786ab23d7c cleanup and optimization of dds terrain textures
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-07 23:43:53 +03:00
Stuart Buchanan
ab21e069f7 Correct atmospheric scattering for trees, where we were applying ambient lighting twice, making them too dark, and not using an alpha test.
Also fix the tropical trees, where only half the texture was defined.
2012-07-02 23:27:44 +01:00
Emilian Huminiuc
6ef4f5eca0 Make water efect use png textures by default, and rely on their dds counterparts only when using the dds materials file.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-16 18:57:14 +03:00
Stuart Buchanan
d18371b6e3 Ensure that each texture referred to in the base, default and region material.xml file exists under the Textures directory, by generating appropriate 256x256 png textures from the Textures.high/ directory. 2012-05-27 22:54:04 +01:00
Stuart Buchanan
268b4566d7 Further masks and material updates for regional textures.
- Masks for European Urban, and Asian Rice
- Change tree types to deciduous for Urban/Town and reduce size to match buildings.
2012-05-27 22:04:53 +01:00
Stuart Buchanan
e456bc9daa Tiled images and object masks for regional materials. 2012-05-26 00:11:33 +01:00
Emilian Huminiuc
626d758f30 Add texture and material definition for casing on 3d Taxiway signs.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-11 11:51:34 +03:00
Stuart Buchanan
76b0a99ab5 Building mask for european town texture, and increase in tree density. 2012-05-10 23:05:06 +01:00
Vivian Meazza
505ce42582 Bring grey texture into line with blue
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 16:39:29 +01:00
Emilian Huminiuc
e29735f3d4 fix buildings-lightmap missalignment
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-07 14:22:05 +03:00
Emilian Huminiuc
22352ec485 Switch building.eff to the ubershader.
Tweak building lightmap to work with ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-07 02:05:02 +03:00
Tuomas Kuosmanen
976713e308 Changes: one new building and matching lightmap,
also resize buildings and lightmap images to 2048 pixels accross.
2012-05-07 00:12:15 +03:00
Vivian Meazza
0235f95ed5 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-05-05 20:07:43 +01:00
Vivian Meazza
9657518663 Optimise water shaders after ideas and suggestions by Thorsten Renk
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-05 19:59:22 +01:00
Christian Schmitt
1261833a5b 3D taxiway signs textures for the case 2012-05-05 13:40:33 +02:00
Stuart Buchanan
de70c6404e Emissive lighting for random buildings. Part 1. 2012-05-01 22:35:10 +01:00
Vivian Meazza
068e965d20 remove alpha channel
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-04-25 11:05:54 +01:00
Stuart Buchanan
98e7a194e8 Random buildings - initial commit of data portion. Requires
simgear change to have any effect.
2012-04-24 21:55:37 +01:00
Emilian Huminiuc
d43770ab58 Effects/model-default.eff move skydome to technique 5 to provide more headroom
Effects/model-combined.eff fix techniques numbering. Make active under rembrandt too. add model-combined-deferred as a stub for now for specific
Rembrandt use.
Users of model-combined with normalmaps should change the technique number to 9, and duplicate that entry for technique 8.
Fix some longstanding png warnings. Provide null_reflectdir.png for model-combined
This should fix part of bug #726
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-03-31 15:00:36 +03:00
Martin Spott
3920245eee Blue Marble for SimGear Paged Terrain 2012-03-04 18:44:00 +01:00
Stuart Buchanan
cefb8f83a0 Updated DDS object masks. Also change farmland trees to deciduous. 2012-02-27 23:00:58 +00:00
Emilian Huminiuc
90924a359d Revert "countryside.mask convert to .dds. Flip png version to keep correct orientation"
This reverts commit beb89d56d0e02dd27316f6f68368394a6ff5c091.
2012-02-27 01:56:46 +02:00
Emilian Huminiuc
83df7f0f75 Revert "add actual files"
This reverts commit acde460ba6f170fb55746fbed2fa5a7d901a3a17.
2012-02-27 01:56:07 +02:00
Emilian Huminiuc
60bdf0f80f add actual files
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 23:11:40 +02:00
Emilian Huminiuc
b8494f9a33 countryside.mask convert to .dds. Flip png version to keep correct orientation
ammend materials files
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 23:10:00 +02:00
Emilian Huminiuc
65a01ba8cd fix texture orientation
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 00:23:46 +02:00
Stuart Buchanan
9c901780ac Split out common materials and settings from materials files, create file structure
to support more materials definitions in future. Also make a couple of fixes:
- Runway effect now works for both dds and non-dds
- PNG definitions for pa_shoulder and pc_shoulder
- Defined Industrial area (previously this was common with Urban)
2012-02-24 21:17:44 +00:00
Emilian Huminiuc
35193f0633 Make runway effect use png textures by default. Add runway png normalmap. Provide runway-dds.eff
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-23 23:56:28 +02:00
Stuart Buchanan
171e3cf136 Improved tree textures:
- Made alpha all-or-nothing.
- Shifted colour-balance slightly from blue to yellow.
2012-02-10 22:14:28 +00:00
Stuart Buchanan
207b6edf60 Random object and vegetation masks, and vegetation density control. 2012-02-05 23:08:08 +00:00
Vivian Meazza
86f9ffac79 add texture
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-01 23:01:20 +00:00