Merge branch 'master' of \New Git\fgdata
This commit is contained in:
Vivian Meazza
commit
464f14c1d2
6 changed files with 6058 additions and 4183 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -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>
|
||||
|
|
|
|||
BIN
Aircraft/c172p/Models/fuel-selector.png
Normal file
BIN
Aircraft/c172p/Models/fuel-selector.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 65 KiB |
|
|
@ -51,7 +51,7 @@ var init_actions = func {
|
|||
filteredGS1.setDoubleValue(0.0);
|
||||
|
||||
# Make sure that init_actions is called when the sim is reset
|
||||
setlistener("sim/signals/reset", init_actions);
|
||||
setlistener("sim/signals/reset", init_actions);
|
||||
|
||||
# Request that the update fuction be called next frame
|
||||
settimer(update_actions, 0);
|
||||
|
|
@ -113,15 +113,25 @@ var update_actions = func {
|
|||
|
||||
var scissor_angle = func(H,C,L,phi) {
|
||||
var a = (H - C)/2/L;
|
||||
# Use 2 iterates of Newton's method and 4th order Taylor series to
|
||||
# Use 2 iterates of Newton's method and 4th order Taylor series to
|
||||
# approximate theta where sin(phi - theta) = a
|
||||
var theta = phi - 2*a/3 - a/3/(1-a*a/2);
|
||||
return theta;
|
||||
}
|
||||
|
||||
# Setup listener call to start update loop once the fdm is initialized
|
||||
#
|
||||
setlistener("sim/signals/fdm-initialized", init_actions);
|
||||
#
|
||||
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);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<script>gui.save_flight()</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
<item>
|
||||
<label>Scenario</label>
|
||||
<binding>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
setprop(d, f < 0 ? 0 : f > 2 ? 0 : f);
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
</item>
|
||||
<label>High-Res Snapshot</label>
|
||||
<enabled>false</enabled>
|
||||
<binding>
|
||||
|
|
@ -459,13 +459,13 @@
|
|||
<menu>
|
||||
<label>AI</label>
|
||||
<item>
|
||||
<label>AI Options</label>
|
||||
<label>Traffic Options</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>ai</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
<!-- Not working at present
|
||||
<!-- Not working at present
|
||||
<item>
|
||||
<label>ATC Services in range</label>
|
||||
<binding>
|
||||
|
|
@ -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 - takes effect on next run</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>scenario</dialog-name>
|
||||
|
|
@ -702,6 +702,14 @@
|
|||
</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>
|
||||
|
|
@ -724,23 +732,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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue