fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2011-01-08 11:07:28 +01:00
commit a4aba7629b
4 changed files with 77 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Environment/environment.xml
View file

@ -213,7 +213,30 @@
<cloudlayers include="cloudlayers.xml"/>
<realwx>
<metar>/environment/metar</metar>
<!-- Spawn a metar loader for each metar node
index 0..9 are reserved for internal (hardcoded) loaders
and will be set from FlightGear's subsystems.
Index 10..n may be used by user defined systems
To retrieve a METAR in /environment/metar[10], write
the station id (e.g. KSFO) to
/enviornment/metar[10]/station-id and set
/environment/metar[10]/time-to-live to zero
Wait for
/environment/metar[10]/valid to become true.
-->
<metar n="0">/environment/metar[0]</metar> <!-- nearest airport -->
<metar n="1">/environment/metar[1]</metar> <!-- NAV1 -->
<metar n="2">/environment/metar[2]</metar> <!-- NAV2 -->
<metar n="3">/environment/metar[3]</metar> <!-- VHF-COMM1 -->
<metar n="4">/environment/metar[4]</metar> <!-- VHF-COMM2 -->
<metar n="5">/environment/metar[5]</metar> <!-- UHF-COMM1 -->
<metar n="6">/environment/metar[6]</metar> <!-- UHF-COMM2 -->
<!-- User defined queries -->
<metar n="10">/environment/metar[10]</metar>
<metar n="11">/environment/metar[11]</metar>
<!-- use NOAA for METAR (no aloft data) -->
<data-source>noaa</data-source>

1
Input/Joysticks/Logitech/extreme-3d-pro.xml
View file

@ -30,6 +30,7 @@ $Id$
<name>Logitech Extreme 3D Pro USB</name>
<name>Logitech Extreme 3D Pro USB</name>
<name>Logitech Extreme 3D</name>
<name>Logitech Logitech Extreme 3D</name>
<axis n="0">
<desc>Aileron</desc>

36
gui/dialogs/display.xml
View file

@ -4,6 +4,7 @@
<name>display</name>
<modal>false</modal>
<layout>vbox</layout>
<padding>20</padding>
<group>
<layout>hbox</layout>
@ -62,7 +63,7 @@
<checkbox>
<halign>left</halign>
<label>Show 2D Panel</label>
<label>Show 2D panel</label>
<property>/sim/panel/visibility</property>
<binding>
<command>dialog-apply</command>
@ -71,12 +72,43 @@
<checkbox>
<halign>left</halign>
<label>Autohide Menubar</label>
<label>Autohide menubar</label>
<property>/sim/menubar/autovisibility/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<checkbox>
<label>Autohide cursor in</label>
<property>/sim/mouse/hide-cursor</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<input>
<live>true</live>
<pref-width>40</pref-width>
<pref-height>10</pref-height>
<enable>
<property>/sim/mouse/hide-cursor</property>
</enable>
<property>/sim/mouse/cursor-timeout-sec</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<text>
<label>sec.</label>
</text>
</group>
</group>
<hrule/>

24
materials.xml
View file

@ -1736,11 +1736,23 @@ Shared parameters for various materials.
</condition>
<name>BuiltUpCover</name>
<name>Urban</name>
<texture>Terrain/city1.png</texture>
<texture>Terrain/city2.png</texture>
<texture>Terrain/city3.png</texture>
<xsize>1024</xsize>
<ysize>1024</ysize>
<effect>Effects/urban</effect>
<texture-set>
<texture>Terrain/city1.png</texture>
<texture n="2">Terrain/city1-relief-light.png</texture>
</texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
<texture n="2">Terrain/city3-relief-light.png</texture>
</texture-set>
-->
<xsize>1000</xsize>
<ysize>1000</ysize>
<light-coverage>100000.0</light-coverage>
<emissive>
<r>0.05</r>
@ -1802,7 +1814,7 @@ Shared parameters for various materials.
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>