fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of D:\Git_New\fgdata

Browse source
This commit is contained in:
Vivian Meazza 2012-07-07 22:31:19 +01:00
commit ac8be514bb
17 changed files with 1631 additions and 1847 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3246
Aircraft/c172p/Models/c172p.ac
View file

File diff suppressed because it is too large Load diff

93
Aircraft/c172p/Models/c172p.xml
View file

@ -2441,6 +2441,18 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>TaxiLightCone</object-name>
<condition>
<and>
<property>/sim/rendering/rembrandt/enabled</property>
<property>controls/lighting/taxi-light</property>
</and>
</condition>
</animation>
<!--landinglight-->
<animation>
<type>select</type>
@ -2471,39 +2483,88 @@
<z>0.536</z>
</position>
<direction>
<x>-29</x>
<y>6.76</y>
<z>-3.6</z>
<x>-1</x>
<y>0</y>
<z>-0.1</z>
</direction>
<ambient>
<r>0.03</r>
<g>0.03</g>
<b>0.03</b>
<r>0.5</r>
<g>0.5</g>
<b>0.55</b>
<a>1.0</a>
</ambient>
<diffuse>
<r>0.7</r>
<g>0.7</g>
<b>0.6</b>
<r>0.95</r>
<g>0.95</g>
<b>0.8</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.7</r>
<g>0.7</g>
<r>0.95</r>
<g>0.95</g>
<b>0.8</b>
<a>1.0</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.0</l>
<q>0.00015</q>
</attenuation>
<exponent>25</exponent>
<cutoff>85</cutoff>
<near-m>2</near-m>
<far-m>250</far-m>
</animation>
<animation>
<type>light</type>
<light-type>spot</light-type>
<name>TaxiLight</name>
<object-name>TaxiLightCone</object-name>
<nopreview/>
<condition>
<property>controls/lighting/taxi-light</property>
</condition>
<position>
<x>-0.078</x>
<y>-3.086</y>
<z>0.536</z>
</position>
<direction>
<x>-1</x>
<y>0</y>
<z>-0.3</z>
</direction>
<ambient>
<r>0.5</r>
<g>0.5</g>
<b>0.55</b>
<a>1.0</a>
</ambient>
<diffuse>
<r>0.85</r>
<g>0.85</g>
<b>0.65</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.85</r>
<g>0.85</g>
<b>0.7</b>
<a>1.0</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.002</l>
<q>0.00005</q>
<l>0.0</l>
<q>0.0018</q>
</attenuation>
<exponent>30.0</exponent>
<cutoff>40</cutoff>
<exponent>4.5</exponent>
<cutoff>160</cutoff>
<near-m>2</near-m>
<far-m>50</far-m>
<far-m>150</far-m>
</animation>
<animation>
<type>select</type>
<object-name>landinglightcover</object-name>

1
Aircraft/c172p/c172p-set.xml
View file

@ -143,7 +143,6 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<strobe type="bool">false</strobe>
<beacon type="bool">false</beacon>
<nav-lights type="bool">false</nav-lights>
<taxi-light type="bool">false</taxi-light>
</lighting>
</controls>

2
Effects/transition-base-grass-inverse.eff
View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">
<image>Textures.high/Terrain/grass12.dds</image>
<image>Textures.high/Terrain/herbtundra.dds</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>

60
Materials/dds/materials.xml
View file

@ -836,9 +836,9 @@
<name>Sclerophyllous</name>
<name>Heath</name>
<texture>Terrain/shrub.dds</texture>
<texture>Terrain/shrub1.dds</texture>
<!--<texture>Terrain/shrub1.dds</texture>
<texture>Terrain/shrub2.dds</texture>
<texture>Terrain/shrub3.dds</texture>
<texture>Terrain/shrub3.dds</texture>-->
<xsize>2000</xsize>
<ysize>2000</ysize>
<diffuse>
@ -1158,7 +1158,7 @@
<name>Cemetery</name>
<effect>Effects/transition-base-rock</effect>
<texture>Terrain/grass10c.dds</texture>
<texture>Terrain/grass10b.dds</texture>
<!-- <texture>Terrain/grass10b.dds</texture> -->
<xsize>500</xsize>
<ysize>500</ysize>
<light-coverage>4000000.0</light-coverage>
@ -1193,8 +1193,8 @@
<name>HerbTundra</name>
<effect>Effects/transition-base-rock</effect>
<texture>Terrain/herbtundra.dds</texture>
<texture>Terrain/herbtundra2.dds</texture>
<texture>Terrain/herbtundra3.dds</texture>
<!-- <texture>Terrain/herbtundra2.dds</texture>
<texture>Terrain/herbtundra3.dds</texture>-->
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>4000000.0</light-coverage>
@ -1251,7 +1251,7 @@
<name>Greenspace</name>
<effect>Effects/transition-base-dirt</effect>
<texture>Terrain/grass10b.dds</texture>
<texture>Terrain/grass10c.dds</texture>
<!-- <texture>Terrain/grass10c.dds</texture> -->
<xsize>250</xsize>
<ysize>250</ysize>
<light-coverage>4000000.0</light-coverage>
@ -1286,12 +1286,14 @@
<name>MixedCropPastureCover</name>
<name>MixedCrop</name>
<name>ComplexCrop</name>
<texture>Terrain/mixedcrop1.dds</texture>
<texture>Terrain/countryside1.green.dds</texture>
<!-- <texture>Terrain/mixedcrop1.dds</texture>
<texture>Terrain/mixedcrop4.dds</texture>
<texture>Terrain/mixedcrop3.dds</texture>
<object-mask>Terrain/mixedcrop1.mask.png</object-mask>
<texture>Terrain/mixedcrop3.dds</texture>-->
<object-mask>Terrain/countryside1.green.mask.png</object-mask>
<!-- <object-mask>Terrain/mixedcrop1.mask.png</object-mask>
<object-mask>Terrain/mixedcrop4.mask.png</object-mask>
<object-mask>Terrain/mixedcrop3.mask.png</object-mask>
<object-mask>Terrain/mixedcrop3.mask.png</object-mask>-->
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1301,7 +1303,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
<wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1323,12 +1325,14 @@
<name>Olives</name>
<name>Vineyard</name>
<name>Rice</name>
<texture>Terrain/irrcrop1.dds</texture>
<texture>Terrain/irrcrop.dds</texture>
<!--<texture>Terrain/irrcrop1.dds</texture>
<texture>Terrain/irrcrop2.dds</texture>
<texture>Terrain/irrcrop3.dds</texture>
<object-mask>Terrain/irrcrop1.mask.png</object-mask>
<texture>Terrain/irrcrop3.dds</texture>-->
<object-mask>Terrain/irrcrop-dds.mask.png</object-mask>
<!--<object-mask>Terrain/irrcrop1.mask.png</object-mask>
<object-mask>Terrain/irrcrop2.mask.png</object-mask>
<object-mask>Terrain/irrcrop3.mask.png</object-mask>
<object-mask>Terrain/irrcrop3.mask.png</object-mask>-->
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1338,7 +1342,7 @@
<bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
<wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1357,7 +1361,7 @@
<name>DryCropPastureCover</name>
<name>DryCrop</name>
<texture-set>
<texture>Terrain/countryside1.green.dds</texture>
<texture>Terrain/uk_countryside1.dds</texture>
<texture n="4">Terrain.winter/countryside1.winter.dds</texture>
</texture-set>
<!--<texture-set>
@ -1373,9 +1377,9 @@
<texture n="4">Terrain.winter/countryside4.winter.dds</texture>
</texture-set> -->
<object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.green.mask.png</object-mask>
<!--<object-mask>Terrain/countryside2.green.mask.png</object-mask>
<object-mask>Terrain/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.png</object-mask>-->
<xsize>1800</xsize>
<ysize>1800</ysize>
<solid>1</solid>
@ -1385,7 +1389,7 @@
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>4000.0</wood-coverage>
<wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/deciduous-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1432,10 +1436,12 @@
<name>CropGrassCover</name>
<name>CropGrass</name>
<name>Grassland</name>
<texture>Terrain/cropgrass1.dds</texture>
<texture>Terrain/cropgrass2.dds</texture>
<xsize>1500</xsize>
<ysize>1500</ysize>
<texture>Terrain/cropgrass.dds</texture>
<!--<texture>Terrain/cropgrass1.dds</texture>
<texture>Terrain/cropgrass2.dds</texture>-->
<object-mask>Terrain/cropgrass-dds.mask.png</object-mask>
<xsize>1399</xsize>
<ysize>1399</ysize>
<light-coverage>2000000.0</light-coverage>
<diffuse>
<r>0.93</r>
@ -1455,7 +1461,7 @@
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>500000.0</wood-coverage>
<wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/deciduous-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1515,7 +1521,7 @@
<name>AgroForest</name>
<effect>Effects/transition-base-dirt</effect>
<texture>Terrain/cropwood.dds</texture>
<object-mask>Terrain/cropwood.mask.png</object-mask>
<object-mask>Terrain/cropwood-dds.mask.png</object-mask>
<xsize>1500</xsize>
<ysize>1500</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1524,7 +1530,7 @@
<rolling-friction>0.6</rolling-friction>
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
<wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>

9
Materials/regions/materials.xml
View file

@ -1822,6 +1822,7 @@
<name>MixedCrop</name>
<name>ComplexCrop</name>
<texture>Terrain/rice1.png</texture>
<object-mask>Terrain/rice1.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -2874,10 +2875,10 @@
<texture>Terrain.winter/drycrop2.png</texture>
<texture>Terrain.winter/drycrop3.png</texture>
<texture>Terrain.winter/drycrop4.png</texture>
<object-mask>Terrain/drycrop1.png</object-mask>
<object-mask>Terrain/drycrop2.png</object-mask>
<object-mask>Terrain/drycrop3.png</object-mask>
<object-mask>Terrain/drycrop4.png</object-mask>
<object-mask>Terrain/drycrop1.mask.png</object-mask>
<object-mask>Terrain/drycrop2.mask.png</object-mask>
<object-mask>Terrain/drycrop3.mask.png</object-mask>
<object-mask>Terrain/drycrop4.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<solid>1</solid>

BIN
Textures/Terrain/crop.dds
View file

Binary file not shown.

BIN
Textures/Terrain/cropgrass-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
Textures/Terrain/cropgrass.dds
View file

Binary file not shown.

BIN
Textures/Terrain/cropwood-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Textures/Terrain/forest.dds
View file

Binary file not shown.

BIN
Textures/Terrain/irrcrop-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

19
gui/dialogs/atc-ai.xml
View file

@ -31,26 +31,9 @@
<checkbox>
<halign>left</halign>
<label>Enable AI traffic</label>
<property>/sim/ai-traffic/enabled</property>
<property>/sim/traffic-manager/enabled</property>
</checkbox>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>AI traffic density:</label>
</text>
<combo>
<halign>left</halign>
<property>/sim/ai-traffic/level</property>
<value>1</value>
<value>2</value>
<value>3</value>
</combo>
</group>
</group>
<empty>

29
gui/dialogs/rendering.xml
View file

@ -196,7 +196,7 @@
<group>
<layout>hbox</layout>
<text>
<label>Scenery objects</label>
<label>Scenery</label>
<halign>left</halign>
</text>
<hrule>
@ -204,6 +204,33 @@
</hrule>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Season (ground textures): </label>
<halign>left</halign>
</text>
<empty>
<stretch>true</stretch>
</empty>
<combo>
<name>season</name>
<halign>left</halign>
<live>true</live>
<property>/sim/startup/season</property>
<value>summer</value>
<value>winter</value>
<binding>
<command>dialog-apply</command>
<object-name>season</object-name>
</binding>
</combo>
<empty>
<stretch>true</stretch>
</empty>
</group>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>

1
gui/dialogs/scenario.xml
View file

@ -54,6 +54,7 @@
<label>Enable AI traffic</label>
<name>enable-ai-traffic</name>
<property>/sim/traffic-manager/enabled</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>enable-ai-traffic</object-name>

12
gui/dialogs/sound.xml
View file

@ -295,6 +295,18 @@
<property>/sim/sound/enabled</property>
</enable>
</checkbox>
<slider>
<row>6</row>
<col>2</col>
<property>/sim/sound/aimodels/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable>
<property>/sim/sound/enabled</property>
</enable>
</slider>
</group>
<hrule/>

6
preferences.xml
View file

@ -60,7 +60,7 @@ Started September 2000 by David Megginson, david@megginson.com
<season type="string" preserve="y">summer</season>
</startup>
<rendering>
<materials-file>Materials/default/materials.xml</materials-file>
<materials-file>Materials/regions/materials.xml</materials-file>
<rembrandt>
<enabled type="bool">false</enabled>
<renderer>default-pipeline</renderer>
@ -297,6 +297,7 @@ Started September 2000 by David Megginson, david@megginson.com
</voices>
<aimodels>
<enabled type="bool" userarchive="y">false</enabled>
<volume type="float" userarchive="y">0.6</volume>
</aimodels>
</sound>
<speed-up type="double">1.0</speed-up>
@ -689,12 +690,13 @@ Started September 2000 by David Megginson, david@megginson.com
</atc>
<ai-traffic>
<!-- Obsolete and unused - to be removed -->
<enabled type="bool" userarchive="y">false</enabled>
<level type="int" userarchive="y">1</level>
</ai-traffic>
<traffic-manager>
<enabled type="bool">true</enabled>
<enabled type="bool" userarchive="y">true</enabled>
<heuristics type="bool">true</heuristics>
<datafile type="string"></datafile>
<instantaneous-action type="bool">false</instantaneous-action>