fly/fgdata
1
0
Fork 0
Code Activity
8005 commits 7 branches 0 tags 4.4 GiB
Commit graph

253 commits

Author SHA1 Message Date
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
Vivian Meazza
7020a95698 Add bow-wave textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-12-01 22:06:40 +00:00
Emilian Huminiuc
f3373d0c7c New line feature textures, suitable for the new poly offset technique 2011-11-08 14:08:01 +01:00
Christian Schmitt
4841ab6206 Some 850 line feature textures changes 
-Remove the new pavement texture for now as it interferes with the old airports.
-remove unexisting entries from materials.xml.
-correct one texture's scale.
 2011-11-04 08:54:32 +01:00
Gijs de Rooy
de18f49ac8 Merge branch 'master' of git://mapserver.flightgear.org/fgdata 2011-10-25 23:55:54 +02:00
PSadrozinski
dccdec6471 Add lf_ textures and a new texture for concrete pavement 2011-10-23 16:12:15 +02:00
Emilian Huminiuc
364fc53970 added runway shoulder textures 2011-10-20 15:52:36 +02:00
Stuart Buchanan
0cbdcd6aa0 Fix bottom/middle/top shading, and update global clouds. 2011-10-13 22:39:27 +01:00
Vivian Meazza
759c8ded5a Add taxiway symbols in dds. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-10 10:51:25 +01:00
Durk Talsma
61c5c35ff4 Merge branch 'master' of gitorious.org:fg/fgdata 2011-10-07 17:48:10 +02:00
Vivian Meazza
f7b832d68a Add texture. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-07 14:29:46 +01:00
Vivian Meazza
d45670baa8 Water shader PhaseII improvements. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-10-07 12:46:01 +01:00
Durk Talsma
4eba6afa90 New Traffic files: Scandinavian airlines and Iberia. 
Updated traffic files: Delta and USAirways.
Added a new material for groundnetwork testing.
 2011-10-03 21:07:03 +02:00
Vivian Meazza
54291d2414 Merge commit 'refs/merge-requests/116' of git://gitorious.org/fg/fgdata into integration 2011-09-26 23:56:28 +01:00
Vivian Meazza
e758deced1 Add foam to water effect. Based on work by Emilian Huminuc. 2011-09-26 23:35:20 +01:00
Christian Schmitt
ffb872876f Add textures for runways with no threshold on one end. This is 
a preparation for 850 apt.dat support, too.
 2011-09-26 23:10:10 +02:00
Christian Schmitt
8b002c2655 Helipad support is coming.... 2011-09-26 23:10:09 +02:00
Christian Schmitt
d56c2b2f80 add specific UK runway aim zone textures 2011-09-26 23:10:09 +02:00
Vivian Meazza
09cddc8ee5 Compress 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-24 14:54:04 +01:00
Vivian Meazza
fd073fb803 Add UK textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-24 14:12:50 +01:00
Vivian Meazza
b9602b612d Add UK runway markings - first tranche 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-24 11:15:37 +01:00
Vivian Meazza
34f6c6258e Add Direct Draw Textures for Symbols 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-22 22:57:46 +01:00
Vivian Meazza
fd954315d0 Add grey sea texture 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-22 15:41:47 +01:00
Vivian Meazza
faa28f8a08 Tenth tranche of .dds textures. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 16:53:06 +01:00
Vivian Meazza
bcf2a72fd6 Sixth tranche of .dss textures. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 14:21:44 +01:00
Vivian Meazza
5c422acadc Fourth tranche of .dds textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 13:58:46 +01:00
Vivian Meazza
e2af689cf7 Third tranche of dds textures. 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 13:42:05 +01:00
Vivian Meazza
e0b94b2737 Second tranche of dds textures 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2011-09-05 13:22:49 +01:00
Durk Talsma
c9ea2bf2aa Merge branch 'master' into durk-atc 2011-07-24 08:59:08 +02:00
Martin Spott
eebadd1561 John Holden: Add naturalcrop terrain textures for a distinct material 
class.
 2011-06-13 15:54:42 +02:00
Martin Spott
96b3335b53 John Holden: Add golfcourse terrain textures for a distinct material 
class.
 2011-06-13 15:23:46 +02:00
Durk Talsma
9e186f8336 Merge commit 'refs/merge-requests/61' of git://gitorious.org/fg/fgdata into merge-requests/61 2011-05-07 10:37:48 +02:00
Durk Talsma
6ee5fcab3a Some prepatory work for User ATC/AI interactions. 
- Renable the ATC dialog in keyboard.xml
- Add two new materials in Symbols: A unidirectional and a bidirectional arrow tape.
 2011-04-21 08:02:17 +02:00
ThorstenB
afaaf62e18 Fixed some file modes (not executable). 2011-03-27 21:01:43 +02:00
Ryan Miller
fdecd7b7f6 Updated textures for taxiways, stopways, grass runways, and airport grass 2011-03-12 10:18:44 -08:00
Gijs de Rooy
992ab2ba50 Runway stopway materials, were never fully implemented apparently 2011-01-20 16:45:38 +01:00
gral@who.net
d10a9b8eff Adding files 2010-09-30 01:29:41 +02:00
gral@who.net
0ff2d597f5 Adding the files ... 2010-08-23 12:16:07 +02:00
gral@who.net
64c5757f6d Working on transitions, adding herbtundra 2010-08-23 12:15:09 +02:00
gral@who.net
10f97d1718 New combination of snow and glacier/permanent snow 2010-08-22 23:05:46 +02:00
gral@who.net
5a39f0738c As always, I forgot to add the files 2010-08-21 13:10:19 +02:00
gral@who.net
1a9bf761fe Added cropgrass effect and associated textures 2010-08-15 16:30:11 +02:00
gral@who.net
2815e36789 Added low-res textures for forest (high-res already changed) 2010-08-13 11:02:21 +02:00
fredb
52c46e87c9 Create effects for shrub type landmass with no or little height. Add a new shrub texture contributed by Yves 2010-04-11 08:36:36 +00:00
ehofman
da8d8679de Just to be safe: use license free font types 'BGP Elite Bold' (with custom shear) and 'Dustismo Bold Italic' 2010-02-21 09:35:32 +00:00
ehofman
9c58ea2c9e now without the typo.. 2010-02-20 12:50:39 +00:00
ehofman
db6f793793 revert to previous 2010-02-20 10:07:23 +00:00
ehofman
32e9adc221 New set of splash screens 2010-02-20 10:03:23 +00:00
ehofman
3b962cadfe Cumulus clouds from real photographs. Rename the original texture. 2009-10-22 12:22:07 +00:00
durk
0a7625593e Stuart Buchanan: 
Improvements to the cloudsystem:
        - A new xml format
        - Texture indexing based on the position of the sprite in the cloud
          mass, allowing more control over the texture set.
        - Improved fog and shading
        - Better sprite distribution
        - A more natural distribution of clouds, so no more obvious grids.
 2009-10-02 05:43:42 +00:00
timoore
943ba2a4fe Till Busch - effects, shaders and textures for crop and water effects 
Incorporated changes to effects file syntax. Changed Till's landmass
to mix in the base terrain texture. Some shader cleanup.

Also, add a GUI control for enabling shaders.
 2009-08-08 10:17:58 +00:00
stuart
29541548b6 Updated Cumulus cloud textures from Argyle. 2009-04-29 20:22:00 +00:00
stuart
d1f0e836ee Updated Cloud textures and layer definitions from Heiko SCHULZ. 2008-12-14 17:59:21 +00:00
fredb
4cd1c72bda New cloud textures and layout from Heiko Schulz 2008-11-30 23:14:19 +00:00
curt
d39df8c1e1 Remove depricated .rgb and .rgba textures which are now converted to .png 2008-10-30 23:58:20 +00:00
fredb
a24f54b7e8 3D clouds from Stuart Buchanan. Need a recent driver update, --enable-clouds3d option and a Weather Scenario to show up 2008-10-26 09:38:46 +00:00
sydadams
37bba43061 re adding rgb sky textures until patch is applied 2008-10-14 04:22:23 +00:00
sydadams
0d92354f3b Switching Textures to png format 2008-10-14 00:52:33 +00:00
sydadams
97c7c1c68f adding new tree textures 2008-02-15 04:50:46 +00:00
sydadams
f23ba6322d winter texture updates 2008-02-11 07:50:32 +00:00
sydadams
6b7ace320a Adding missing winter textures ...more to come 2008-02-11 06:52:30 +00:00
timoore
cefe3edeb2 Latest trees update from Stuart Buchanan. 
Random variation of tree texture maps.
 2008-02-07 23:11:38 +00:00
mfranz
bebbbc28e6 s/asphault/asphalt/ 2007-05-13 11:44:35 +00:00
durk
75a82f8db3 New Textures for Mark's dynamic sun color change code. These replace the 
original halo.rgba file.
 2006-07-27 05:14:06 +00:00
mfranz
708fd9b924 adjust colors 2006-04-23 21:03:57 +00:00
mfranz
7208f2d695 thanks to Erik's texture map I can now drop empty.rgb altogether and just 
specify the same texture in the "foo.lighted" and "foo.unlighted" material
entry. This also allows to drop the state cloning and thereby solves the
most urgent apt_signs.cxx TODO. :-)
 2006-04-22 13:40:58 +00:00
mfranz
6e36a0a8db now even smaller: 576 Bytes on disk, 64 bytes in memory 2006-04-22 09:45:50 +00:00