fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Vivian Meazza 2010-10-12 20:09:40 +01:00
commit df6864ac07
4 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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");

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
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", "");

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>