fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Alexis Bory 2010-09-06 13:33:54 +02:00
commit 76db496d5b
7 changed files with 58687 additions and 58661 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -1853,7 +1853,6 @@
<!-- Airframe --> <!-- Airframe -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Propeller</object-name> <object-name>Propeller</object-name>
<condition> <condition>
@ -1862,26 +1861,6 @@
<value>500</value> <value>500</value>
</less-than> </less-than>
</condition> </condition>
</animation>
<animation>
<type>select</type>
<object-name>Propeller.Slow</object-name>
<condition>
<and>
<greater-than>
<property>engines/engine[0]/rpm</property>
<value>400</value>
</greater-than>
<less-than>
<property>engines/engine[0]/rpm</property>
<value>1200</value>
</less-than>
</and>
</condition>
</animation> </animation>
<animation> <animation>
@ -1890,11 +1869,20 @@
<condition> <condition>
<greater-than> <greater-than>
<property>engines/engine[0]/rpm</property> <property>engines/engine[0]/rpm</property>
<value>1200</value> <value>400</value>
</greater-than> </greater-than>
</condition> </condition>
</animation> </animation>
<animation>
<type>blend</type>
<object-name>Propeller.Fast</object-name>
<property>engines/engine[0]/rpm</property>
<factor>0.0004</factor>
<max>1.0</max>
<min>0.0</min>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>navlight_left</object-name> <object-name>navlight_left</object-name>

BIN
Aircraft/c172p/Models/prop.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

3
Translations/strings-default.xml
View file

@ -75,8 +75,9 @@
<verbose-desc>Show all command line options when combined with --help or -h</verbose-desc> <verbose-desc>Show all command line options when combined with --help or -h</verbose-desc>
<version-desc>Display the current FlightGear version</version-desc> <version-desc>Display the current FlightGear version</version-desc>
<fg-root-desc>Specify the root data path</fg-root-desc> <fg-root-desc>Specify the root data path</fg-root-desc>
<fg-scenery-desc n="0">Specify the base scenery path;</fg-scenery-desc> <fg-scenery-desc n="0">Specify the scenery path(s);</fg-scenery-desc>
<fg-scenery-desc n="1">Defaults to $FG_ROOT/Scenery</fg-scenery-desc> <fg-scenery-desc n="1">Defaults to $FG_ROOT/Scenery</fg-scenery-desc>
<fg-aircraft-desc>Specify additional aircraft directory path(s)</fg-aircraft-desc>
<language-desc>Select the language for this session</language-desc> <language-desc>Select the language for this session</language-desc>
<disable-game-mode-desc>Disable full-screen game mode</disable-game-mode-desc> <disable-game-mode-desc>Disable full-screen game mode</disable-game-mode-desc>
<enable-game-mode-desc>Enable full-screen game mode</enable-game-mode-desc> <enable-game-mode-desc>Enable full-screen game mode</enable-game-mode-desc>

182
gui/dialogs/osg_display_settings.xml Normal file
View file

@ -0,0 +1,182 @@
<?xml version="1.0"?>
<PropertyList>
<!-- Control the weather -->
<name>osg-display-settings</name>
<modal>false</modal>
<resizable>false</resizable>
<layout>vbox</layout>
<default-padding>3</default-padding>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<empty>
<stretch>true</stretch>
</empty>
<text>
<label>OSG Display Settings (experimental)</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend></legend>
<key>Esc</key>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Stereo Mode</label></text>
<empty><stretch>true</stretch></empty>
<combo>
<width>250</width>
<height>25</height>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/stereo-mode</property>
<value>OFF</value>
<value>QUAD_BUFFER</value>
<value>ANAGLYPHIC</value>
<value>HORIZONTAL_SPLIT</value>
<value>VERTICAL_SPLIT</value>
<value>LEFT_EYE</value>
<value>RIGHT_EYE</value>
<value>HORIZONTAL_INTERLACE</value>
<value>VERTICAL_INTERLACE</value>
<value>CHECKERBOARD</value>
<binding>
<command>dialog-apply</command>
</binding>
</combo>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Screen Distance</label></text>
<empty><stretch>true</stretch></empty>
<slider>
<min>0</min>
<max>1.0</max>
<property>/sim/rendering/osg-displaysettings/screen-distance</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-distance</property>
</text>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Eye Separation</label></text>
<empty><stretch>true</stretch></empty>
<slider>
<min>0</min>
<max>0.2</max>
<property>/sim/rendering/osg-displaysettings/eye-separation</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/eye-separation</property>
</text>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Double Buffer</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/double-buffer</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Depth Buffer</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/depth-buffer</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>RGB</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/rgb</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Screen Width</label></text>
<empty><stretch>true</stretch></empty>
<input>
<width>100</width>
<height>25</height>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-width</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Screen Height</label></text>
<empty><stretch>true</stretch></empty>
<input>
<width>100</width>
<height>25</height>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-height</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
</group>
</PropertyList>

8
gui/menubar.xml
View file

@ -155,6 +155,14 @@
<dialog-name>static-lod</dialog-name> <dialog-name>static-lod</dialog-name>
</binding> </binding>
</item> </item>
<item>
<label>OSG Display Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>osg-display-settings</dialog-name>
</binding>
</item>
</menu> </menu>
<menu> <menu>

10
options.xml
View file

@ -77,6 +77,13 @@
<brief/> <brief/>
</option> </option>
<option>
<name>fg-aircraft</name>
<arg>path</arg>
<description>strings/fg-aircraft-desc</description>
<brief/>
</option>
<option> <option>
<name>language</name> <name>language</name>
<arg>code</arg> <arg>code</arg>
@ -537,11 +544,12 @@
<description>strings/disable-auto-coordination-desc</description> <description>strings/disable-auto-coordination-desc</description>
</option> </option>
<!--
<option> <option>
<name>aircraft-dir</name> <name>aircraft-dir</name>
<arg>path</arg> <arg>path</arg>
<description>strings/aircraft-dir-desc</description> <description>strings/aircraft-dir-desc</description>
</option> </option> -->
<option> <option>
<name>livery</name> <name>livery</name>