fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of \New Git\fgdata

Browse source
This commit is contained in:
Vivian Meazza 2010-10-12 20:45:56 +01:00
commit 39affdc8cd
13 changed files with 1747 additions and 1747 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Aircraft/Generic/WalkView/walkview.nas
View file

@ -362,7 +362,7 @@ var TO_DEG = 180/math.pi;
var walkers = {}; var walkers = {};
var closerXY = func (pos, p1, p2) { var closerXY = func (pos, p1, p2) {
l1 = [p1[0] - pos[0], p1[1] - pos[1]]; var l1 = [p1[0] - pos[0], p1[1] - pos[1]];
l2 = [p2[0] - pos[0], p2[1] - pos[1]]; var l2 = [p2[0] - pos[0], p2[1] - pos[1]];
return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]); return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]);
} }

38
Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
View file

@ -279,7 +279,10 @@ properties' values.
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>vs-minus</object-name> <object-name>vs-minus</object-name>
<object-name>vs-digits-minus</object-name> <object-name>vs-digit2-minus</object-name>
<object-name>vs-digit3-minus</object-name>
<object-name>vs-digit4-minus</object-name>
<object-name>vs-digit5-minus</object-name>
<condition> <condition>
<and> <and>
<equals> <equals>
@ -287,15 +290,18 @@ properties' values.
<value type="bool">true</value> <value type="bool">true</value>
</equals> </equals>
<greater-than> <greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</greater-than> </greater-than>
</and> </and>
</condition> </condition>
</animation> </animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>vs-digits</object-name> <object-name>vs-digit2</object-name>
<object-name>vs-digit3</object-name>
<object-name>vs-digit4</object-name>
<object-name>vs-digit5</object-name>
<condition> <condition>
<and> <and>
<equals> <equals>
@ -303,8 +309,8 @@ properties' values.
<value type="bool">true</value> <value type="bool">true</value>
</equals> </equals>
<less-than> <less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</less-than> </less-than>
</and> </and>
</condition> </condition>
@ -312,11 +318,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit5</object-name> <object-name>vs-digit5</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<less-than> <less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</less-than> </less-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -331,11 +336,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit4</object-name> <object-name>vs-digit4</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<less-than> <less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</less-than> </less-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -350,11 +354,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit3</object-name> <object-name>vs-digit3</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<less-than> <less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</less-than> </less-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -369,11 +372,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit2</object-name> <object-name>vs-digit2</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<less-than> <less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</less-than> </less-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -388,11 +390,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit5-minus</object-name> <object-name>vs-digit5-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<greater-than> <greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</greater-than> </greater-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -407,11 +408,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit4-minus</object-name> <object-name>vs-digit4-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<greater-than> <greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</greater-than> </greater-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -426,11 +426,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit3-minus</object-name> <object-name>vs-digit3-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<greater-than> <greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</greater-than> </greater-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@ -445,11 +444,10 @@ properties' values.
<animation> <animation>
<type>textranslate</type> <type>textranslate</type>
<object-name>vs-digit2-minus</object-name> <object-name>vs-digit2-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition> <condition>
<greater-than> <greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>
<value>0</value>
</greater-than> </greater-than>
</condition> </condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property> <property>/autopilot/KAP140/settings/target-pressure-rate</property>

2
Environment/metarinterpolator.xml
View file

@ -28,7 +28,7 @@
--> -->
<name>MetarController:pressure-sea-level-inhg</name> <name>MetarController:pressure-sea-level-inhg</name>
<type>noise-spike</type> <type>noise-spike</type>
<max-rate-of-change>0.0003</max-rate-of-change> <max-rate-of-change>0.006</max-rate-of-change>
<enable> <enable>
<condition> <condition>
<property>/environment/metar/valid</property> <property>/environment/metar/valid</property>

14
Input/Keyboard/multikey.xml
View file

@ -89,16 +89,6 @@
</binding> </binding>
</key> </key>
<key n="99">
<name>c</name>
<desc>Clouds</desc>
<exit/>
<binding>
<command>dialog-show</command>
<dialog-name>clouds</dialog-name>
</binding>
</key>
<key n="102"> <key n="102">
<name>f</name> <name>f</name>
<desc>Fuel and Payload</desc> <desc>Fuel and Payload</desc>
@ -241,7 +231,6 @@
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/environment/weather-scenario", "Fair weather"); setprop("/environment/weather-scenario", "Fair weather");
setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
</script> </script>
</binding> </binding>
</key> </key>
@ -253,7 +242,6 @@
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/environment/weather-scenario", "METAR"); setprop("/environment/weather-scenario", "METAR");
setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
</script> </script>
</binding> </binding>
</key> </key>
@ -265,7 +253,6 @@
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/environment/weather-scenario", "none"); setprop("/environment/weather-scenario", "none");
setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
</script> </script>
</binding> </binding>
</key> </key>
@ -277,7 +264,6 @@
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/environment/weather-scenario", "Thunderstorm"); setprop("/environment/weather-scenario", "Thunderstorm");
setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
</script> </script>
</binding> </binding>
</key> </key>

2
Nasal/contrail.nas
View file

@ -26,7 +26,7 @@ updateContrail = func{
### Contrail ### Contrail
print ("init contrail"); printlog ("debug", "init contrail");
_setlistener("/sim/signals/nasal-dir-initialized", func { _setlistener("/sim/signals/nasal-dir-initialized", func {
props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE"); props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE");
props.globals.initNode("environment/temperature-degc", 1, "DOUBLE"); props.globals.initNode("environment/temperature-degc", 1, "DOUBLE");

45
Nasal/mp_broadcast.nas
View file

@ -45,24 +45,25 @@ BroadcastChannel.new = func (mpp_path, process,
accept_predicate = nil, accept_predicate = nil,
on_disconnect = nil, on_disconnect = nil,
enable_send=1) { enable_send=1) {
obj = { parents : [BroadcastChannel], var obj = { parents : [BroadcastChannel],
mpp_path : mpp_path, mpp_path : mpp_path,
send_node : enable_send ? props.globals.getNode(mpp_path, 1) send_node : enable_send ? props.globals.getNode(mpp_path, 1)
: nil, : nil,
process_msg : process, process_msg : process,
send_to_self : send_to_self, send_to_self : send_to_self,
accept_predicate : (accept_predicate != nil) ? accept_predicate : accept_predicate :
func (p) { return 1; }, (accept_predicate != nil) ? accept_predicate
on_disconnect : (on_disconnect != nil) ? on_disconnect : : func (p) { return 1; },
func (p) { return; }, on_disconnect : (on_disconnect != nil) ? on_disconnect
# Internal state. : func (p) { return; },
send_buf : [], # Internal state.
peers : {}, send_buf : [],
loopid : 0, peers : {},
PERIOD : 1.3, loopid : 0,
last_time : 0.0, # For join handling. PERIOD : 1.3,
last_send : 0.0, # For the send queue last_time : 0.0, # For join handling.
SEND_TIME : 0.5 }; last_send : 0.0, # For the send queue
SEND_TIME : 0.5 };
if (enable_send and (obj.send_node == nil)) { if (enable_send and (obj.send_node == nil)) {
printlog("warn", printlog("warn",
"BroadcastChannel invalid send node."); "BroadcastChannel invalid send node.");
@ -232,10 +233,10 @@ Binary.decodeCoord = func (str) {
# The same object is seldom used for both sending and receiving. # The same object is seldom used for both sending and receiving.
var MessageChannel = {}; var MessageChannel = {};
MessageChannel.new = func (n = nil, process = nil) { MessageChannel.new = func (n = nil, process = nil) {
obj = { parents : [MessageChannel], var obj = { parents : [MessageChannel],
node : n, node : n,
process_msg : process, process_msg : process,
old : "" }; old : "" };
return obj; return obj;
} }
MessageChannel.update = func { MessageChannel.update = func {

2
Nasal/seaport.nas
View file

@ -1,5 +1,5 @@
_setlistener("/sim/presets/latitude-deg", func { _setlistener("/sim/presets/latitude-deg", func {
print("*** NEW LOCATION ***"); printlog("info", "*** NEW LOCATION ***");
settimer(func { settimer(func {
var typ = getprop("/sim/type"); var typ = getprop("/sim/type");
var lat = getprop("/position/latitude-deg"); var lat = getprop("/position/latitude-deg");

2
Nasal/startup.nas
View file

@ -1,6 +1,4 @@
var set_runway_from_metar_wind = func { var set_runway_from_metar_wind = func {
if (!getprop("/environment/realwx/enabled"))
return printlog("info", "metar-rwy: no live weather");
if (!getprop("/environment/metar/valid")) if (!getprop("/environment/metar/valid"))
return printlog("info", "metar-rwy: no valid metar"); return printlog("info", "metar-rwy: no valid metar");
if (!getprop("/sim/startup/options/airport")) if (!getprop("/sim/startup/options/airport"))

14
gui/dialogs/display.xml
View file

@ -42,13 +42,23 @@
</binding> </binding>
</checkbox> </checkbox>
<item> <checkbox>
<halign>left</halign>
<label>Show 2D Panel</label> <label>Show 2D Panel</label>
<property>/sim/panel/visibility</property> <property>/sim/panel/visibility</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</item> </checkbox>
<checkbox>
<halign>left</halign>
<label>Autohide Menubar</label>
<property>/sim/menubar/autovisibility/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group> </group>
<hrule/> <hrule/>

2
gui/dialogs/location-in-air.xml
View file

@ -260,6 +260,8 @@
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/sim/presets/parkpos", "");
if (!mode.airport.getBoolValue()) { if (!mode.airport.getBoolValue()) {
setprop("/sim/presets/airport-id", ""); setprop("/sim/presets/airport-id", "");
setprop("/sim/presets/runway", ""); setprop("/sim/presets/runway", "");

7
gui/dialogs/weather.xml
View file

@ -1467,7 +1467,6 @@
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>metar-updates-winds-aloft</object-name> <object-name>metar-updates-winds-aloft</object-name>
</binding> </binding>
<name>aloft</name>
</checkbox> </checkbox>
</group> </group>
@ -1493,6 +1492,12 @@
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
<checkbox>
<property>/environment/metar/valid</property>
<label>valid</label>
<live>true</live>
<editable>false</editable>
</checkbox>
</group> </group>
<textbox> <textbox>

36
materials.xml
View file

@ -1313,9 +1313,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
@ -1376,9 +1376,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
@ -1437,9 +1437,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
@ -2133,9 +2133,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
@ -2195,9 +2195,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
@ -2257,9 +2257,9 @@ Shared parameters for various materials.
<path>Models/Buildings/red-barn.ac</path> <path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <path>Models/Buildings/cow-stable.ac</path>
<path>Models/Buildings/farmhouse1.ac</path> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/farmhouse2.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/farmhouse3.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2> <coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>

8
preferences.xml
View file

@ -290,14 +290,14 @@ Started September 2000 by David Megginson, david@megginson.com
<name>autopilot helpers</name> <name>autopilot helpers</name>
<path>Aircraft/Generic/generic-autopilot-helper.xml</path> <path>Aircraft/Generic/generic-autopilot-helper.xml</path>
</autopilot> </autopilot>
<property-rule>
<name>Environment Interpolation Rule</name>
<path>Environment/interpolator.xml</path>
</property-rule>
<property-rule> <property-rule>
<name>Environment METAR Interpolation Rule</name> <name>Environment METAR Interpolation Rule</name>
<path>Environment/metarinterpolator.xml</path> <path>Environment/metarinterpolator.xml</path>
</property-rule> </property-rule>
<property-rule>
<name>Environment Interpolation Rule</name>
<path>Environment/interpolator.xml</path>
</property-rule>
</systems> </systems>
<instrumentation> <instrumentation>
<path>Aircraft/Generic/generic-instrumentation.xml</path> <path>Aircraft/Generic/generic-instrumentation.xml</path>