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

203 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