1
0
Fork 0

Merge remote branch 'gitorious/master'

This commit is contained in:
Tim Moore 2010-12-26 18:24:51 +01:00
commit 2504a4d9fb
16 changed files with 26678 additions and 13110 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -0,0 +1,349 @@
<?xml version="1.0"?>
<PropertyList>
<path>SCR-522C.ac</path>
<animation>
<type>translate</type>
<object-name>SCR-522C-OFF</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>1</ind>
<dep>0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>SCR-522C-T-base</object-name>
<object-name>SCR-522C-T-sw-handle</object-name>
<object-name>SCR-522C-T-stem</object-name>
<property>/systems/comm/SCR-522C/tr</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>30</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>-0.01</y-m>
<z-m>0.05</z-m>
</center>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-A</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-B</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-C</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-D</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>-0.005</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-A</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-B</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>2</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-C</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>3</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-D</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>4</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-T</object-name>
<condition>
<and>
<property>/systems/comm/SCR-522C/tr</property>
<greater-than>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>0</value>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-light-cont-1</object-name>
<property>/systems/comm/SCR-522C/channel-dimmer</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.005</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>0</dep>
</entry>
</interpolation>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-light-cont-2</object-name>
<property>/systems/comm/SCR-522C/tr-dimmer</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.005</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>0</dep>
</entry>
</interpolation>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>material</type>
<object-name>SCR-522C-top</object-name>
<object-name>SCR-522C-box</object-name>
<object-name>SCR-522C-A</object-name>
<object-name>SCR-522C-B</object-name>
<object-name>SCR-522C-C</object-name>
<object-name>SCR-522C-D</object-name>
<object-name>SCR-522C-T-base</object-name>
<object-name>SCR-522C-T-sw-handle</object-name>
<object-name>SCR-522C-T-stem</object-name>
<object-name>SCR-522C-light-cont-2</object-name>
<object-name>SCR-522C-light-cont-1</object-name>
<object-name>SCR-522C-OFF</object-name>
<object-name>right-outer-bracket</object-name>
<object-name>left-inner-bracket</object-name>
<object-name>left-outer-bracket</object-name>
<emission>
<factor-prop>controls/lighting/cabin-norm</factor-prop>
<red>0.28</red>
<green>0.18</green>
<blue>0.18</blue>
</emission>
</animation>
</PropertyList>

File diff suppressed because it is too large Load diff

View file

@ -1728,6 +1728,141 @@
</center>
</animation>
<!-- Fuel Selector -->
<animation>
<type>select</type>
<object-name>FuelSelectorOff</object-name>
<condition>
<and>
<not>
<property>consumables/fuel/tank[0]/selected</property>
</not>
<not>
<property>consumables/fuel/tank[1]/selected</property>
</not>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>FuelSelectorLeft</object-name>
<condition>
<and>
<property>consumables/fuel/tank[0]/selected</property>
<not>
<property>consumables/fuel/tank[1]/selected</property>
</not>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>FuelSelectorRight</object-name>
<condition>
<and>
<not>
<property>consumables/fuel/tank[0]/selected</property>
</not>
<property>consumables/fuel/tank[1]/selected</property>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>FuelSelectorBoth</object-name>
<condition>
<and>
<property>consumables/fuel/tank[0]/selected</property>
<property>consumables/fuel/tank[1]/selected</property>
</and>
</condition>
</animation>
<animation>
<type>pick</type>
<object-name>FuelHotspotOff</object-name>
<visible>true</visible>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[0]/selected</property>
<value>false</value>
</binding>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[1]/selected</property>
<value>false</value>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FuelHotspotLeft</object-name>
<visible>true</visible>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[0]/selected</property>
<value>true</value>
</binding>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[1]/selected</property>
<value>false</value>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FuelHotspotRight</object-name>
<visible>true</visible>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[0]/selected</property>
<value>false</value>
</binding>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[1]/selected</property>
<value>true</value>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FuelHotspotBoth</object-name>
<visible>true</visible>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[0]/selected</property>
<value>true</value>
</binding>
<binding>
<command>property-assign</command>
<property>consumables/fuel/tank[1]/selected</property>
<value>true</value>
</binding>
</action>
</animation>
<!-- Switches -->
<animation>
<type>rotate</type>

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

View file

@ -123,5 +123,15 @@ var scissor_angle = func(H,C,L,phi) {
#
setlistener("sim/signals/fdm-initialized", init_actions);
#
# Listeners to tie the /consumables/fuels/tank[]/selected to
# /fdm/jsbsim/propulsion/tank[]/priority
setlistener("consumables/fuel/tank[0]/selected", func(selected) {
setprop("/fdm/jsbsim/propulsion/tank[0]/priority", selected.getBoolValue() ? 1 : 0);
});
setlistener("consumables/fuel/tank[1]/selected", func(selected) {
setprop("/fdm/jsbsim/propulsion/tank[1]/priority", selected.getBoolValue() ? 1 : 0);
});

View file

@ -112,6 +112,40 @@
<output>/environment/config/aloft/entry[0]/visibility-m</output>
</filter>
<filter>
<!--
transfer the rain intensity to the target environment
-->
<name>MetarController:rain-norm</name>
<type>noise-spike</type>
<max-rate-of-change>1.0</max-rate-of-change>
<enable>
<condition>
<property>/environment/metar/valid</property>
<property>/environment/params/metar-updates-environment</property>
</condition>
</enable>
<input>/environment/metar/rain-norm</input>
<output>/environment/rain-norm</output>
</filter>
<filter>
<!--
transfer the snow intensity to the target environment
-->
<name>MetarController:snow-norm</name>
<type>noise-spike</type>
<max-rate-of-change>1.0</max-rate-of-change>
<enable>
<condition>
<property>/environment/metar/valid</property>
<property>/environment/params/metar-updates-environment</property>
</condition>
</enable>
<input>/environment/metar/snow-norm</input>
<output>/environment/snow-norm</output>
</filter>
<!-- interpolate the wind vector's components -->
<filter>
<name>MetarController:wind-from-north-fps</name>

View file

@ -442,7 +442,7 @@
<col>0</col>
<live>true</live>
<halign>fill</halign>
<property>/environment/metar/rain-norm</property>
<property>/environment/rain-norm</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -459,7 +459,7 @@
<row>1</row>
<col>1</col>
<halign>fill</halign>
<property>/environment/metar/snow-norm</property>
<property>/environment/snow-norm</property>
<live>true</live>
<pref-height>30</pref-height>
<binding>
@ -1601,7 +1601,7 @@
combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
}
me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); }, 1, 1 );
me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 1 );
},

View file

@ -207,7 +207,7 @@
<label>Location</label>
<item>
<label>Position Aircraft (on ground)</label>
<label>Position Aircraft On Ground</label>
<binding>
<command>dialog-show</command>
<dialog-name>location-on-ground</dialog-name>
@ -215,7 +215,7 @@
</item>
<item>
<label>Position Aircraft (in air)</label>
<label>Position Aircraft In Air</label>
<binding>
<command>dialog-show</command>
<dialog-name>location-in-air</dialog-name>
@ -223,7 +223,7 @@
</item>
<item>
<label>Select Airport from List</label>
<label>Select Airport From List</label>
<binding>
<command>dialog-show</command>
<dialog-name>airports</dialog-name>
@ -231,7 +231,7 @@
</item>
<item>
<label>Random Attitude</label>H
<label>Random Attitude</label>
<binding>
<command>property-assign</command>
<property>/sim/presets/trim</property>
@ -258,7 +258,7 @@
</item>
<item>
<label>Tower position</label>
<label>Tower Position</label>
<binding>
<command>dialog-show</command>
<dialog-name>location-of-tower</dialog-name>
@ -393,7 +393,7 @@
</item>
<item>
<label>Fuel and Payload</label>
<label>Fuel And Payload</label>
<name>fuel-and-payload</name>
<binding>
<command>nasal</command>
@ -459,7 +459,7 @@
<menu>
<label>AI</label>
<item>
<label>AI Options</label>
<label>Traffic Options</label>
<binding>
<command>dialog-show</command>
<dialog-name>ai</dialog-name>
@ -475,7 +475,7 @@
-->
<item>
<label>AI Formation</label>
<label>Wingman Controls</label>
<binding>
<command>dialog-show</command>
<dialog-name>formation</dialog-name>
@ -483,7 +483,7 @@
</item>
<item>
<label>AI Tanker</label>
<label>Tanker Controls</label>
<name>tanker</name>
<enabled>false</enabled>
<binding>
@ -493,7 +493,7 @@
</item>
<item>
<label>AI Carrier Options</label>
<label>Carrier Controls</label>
<binding>
<command>dialog-show</command>
<dialog-name>AIcarrier</dialog-name>
@ -501,7 +501,7 @@
</item>
<item>
<label>AI Scenario Select - takes effect on next run </label>
<label>Scenario Select (requires restart)</label>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
@ -525,7 +525,7 @@
</item>
<item>
<label>Chat Menu</label>
<label>Chat Menu (-)</label>
<binding>
<command>dialog-show</command>
<dialog-name>chat-menu</dialog-name>
@ -541,7 +541,7 @@
</item>
<item>
<label>MPCarrier selection</label>
<label>MPCarrier Selection</label>
<binding>
<command>nasal</command>
<script>
@ -696,12 +696,20 @@
<item>
<label>Help (opens in browser)</label>
<label>Help (opens in browser)</label>
<binding>
<command>old-help-dialog</command>
</binding>
</item>
<item>
<label>Aircraft Help (?)</label>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help")</script>
</binding>
</item>
<item>
<label>Joystick Information</label>
<name>joystick-info</name>
@ -711,10 +719,6 @@
</binding>
</item>
<item>
<label> --- Key Reference ---</label>
</item>
<item>
<label>Basic Simulator Keys</label>
<binding>
@ -724,23 +728,7 @@
</item>
<item>
<label>Common Aircraft Keys</label>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help/common")</script>
</binding>
</item>
<item>
<label> Current Aircraft Keys (?)</label>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help")</script>
</binding>
</item>
<item>
<label> ---------------------</label>
<label>------------------</label>
</item>
<item>