fly/fgdata
1
0
Fork 0
Code Activity

some nasal var and error fixes ...

Browse source
This commit is contained in:
sydadams 2007-12-03 07:18:24 +00:00
parent bcc9fb1532
commit 3b5333d02b
5 changed files with 195 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Aircraft/Instruments-3d/clock/M877/M877.nas
View file

@ -19,12 +19,12 @@ setlistener("/sim/signals/fdm-initialized", func {
settimer(update_clock,2);
});
setlistener("/instrumentation/clock/m877/mode", func {
MODE = cmdarg().getValue();
setlistener("/instrumentation/clock/m877/mode", func(md) {
MODE = md.getValue();
modestring.setValue(modetext[MODE]);
});
},0,0);
update_clock = func{
var update_clock = func{
var FThr =getprop("/instrumentation/clock/flight-meter-hour");
var FM =0;
@ -47,8 +47,11 @@ update_clock = func{
}
if (MODE == 3) {
setprop("/instrumentation/clock/m877/indicated-hour",getprop("/instrumentation/clock/ET-hr"));
setprop("/instrumentation/clock/m877/indicated-min",getprop("/instrumentation/clock/ET-min"));
var ETH = getprop("/instrumentation/clock/ET-hr");
if(ETH != nil){
setprop("/instrumentation/clock/m877/indicated-hour",getprop("/instrumentation/clock/ET-hr"));
setprop("/instrumentation/clock/m877/indicated-min",getprop("/instrumentation/clock/ET-min"));
}
}
settimer(update_clock,0);

2
Aircraft/Instruments-3d/clock/M877/m877-hotspots.xml
View file

@ -13,7 +13,6 @@
</layers>
<actions>
<!--
<action>
<name>outline</name>
@ -24,7 +23,6 @@
<h>60</h>
</action>
-->
<action>
<name>mode increment</name>
<button>0</button>

31
Aircraft/Instruments-3d/primus-1000/mfd-hotspots.xml
View file

@ -62,15 +62,6 @@ Primus 1000 MFD hotspots
<property>/instrumentation/primus1000/nav-dist-nm</property>
<format>%3.1f</format>
</chunk>
<color>
<red>0.8</red>
<green>0.8</green>
<blue>0.8</blue>
</color>
<chunk>
<type>literal</type>
<text>nm</text>
</chunk>
</chunks>
<transformations>
<transformation>
@ -84,28 +75,6 @@ Primus 1000 MFD hotspots
</transformations>
</layer>
<layer>
<name>NAV/DSTtxt</name>
<condition>
<property>instrumentation/primus1000/mfd/serviceable</property>
</condition>
<type>text</type>
<font>arial_black</font>
<point-size>6</point-size>
<color>
<red>0.8</red>
<green>0.8</green>
<blue>0.8</blue>
</color>
<chunks>
<chunk>
<type>literal</type>
<text>nm</text>
</chunk>
</chunks>
</layer>
<layer>
<name>NAV/ID</name>
<condition>

334
Aircraft/Instruments-3d/primus-1000/mfd.ac
View file

@ -4,7 +4,7 @@ MATERIAL "gloss" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0.504136 0.504136 0.504136
MATERIAL "illum" rgb 1 1 1 amb 0 0 0 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0
MATERIAL "flatblack" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 8
kids 9
OBJECT poly
name "MFD"
data 8
@ -380,7 +380,7 @@ OBJECT poly
name "MFD.hdg"
data 8
Mesh.002
texture "pfd-1.rgb"
texture "mfd-1.rgb"
texrep 1 1
crease 30.000000
numvert 7
@ -395,34 +395,34 @@ numsurf 4
SURF 0x00
mat 2
refs 3
2 0.71272289753 0.411140829325
6 0.725648760796 0.411140859127
3 0.71272289753 0.449894040823
2 0.749579429626 0.923830688
6 0.787013828754 0.923830807209
3 0.749579429626 0.987177073956
SURF 0x00
mat 2
refs 3
1 0.786487221718 0.411140829325
0 0.786487221718 0.449894040823
5 0.771103739738 0.411140859127
1 0.870155096054 0.923830688
0 0.870155096054 0.987177073956
5 0.833946287632 0.923830807209
SURF 0x00
mat 2
refs 3
4 0.749600410461 0.391135841608
5 0.771103739738 0.411140859127
6 0.725648760796 0.411140859127
4 0.812481105328 0.891130387783
5 0.833946287632 0.923830807209
6 0.787013828754 0.923830807209
SURF 0x00
mat 2
refs 4
0 0.786487221718 0.449894040823
3 0.71272289753 0.449894040823
6 0.725648760796 0.411140859127
5 0.771103739738 0.411140859127
0 0.870155096054 0.987177073956
3 0.749579429626 0.987177073956
6 0.787013828754 0.923830807209
5 0.833946287632 0.923830807209
kids 0
OBJECT poly
name "MFD.page"
data 9
Plane.006
texture "pfd-1.rgb"
texture "mfd-1.rgb"
texrep 1 1
crease 30.000000
numvert 4
@ -434,10 +434,10 @@ numsurf 1
SURF 0x00
mat 2
refs 4
0 0.896223306656 0.383097290993
3 0.603379011154 0.383097290993
2 0.603379011154 0.0920885652304
1 0.896223306656 0.092088535428
0 0.742979168892 0.626381576061
3 0.26256608963 0.626381576061
2 0.26256608963 0.148979783058
1 0.742979168892 0.148979738355
kids 0
OBJECT poly
name "MFD.range"
@ -446,19 +446,7 @@ Circle.001
texture "pfd-1.rgb"
texrep 1 1
crease 30.000000
numvert 31
0.00132 -0.073187 0.046864
0.00132 -0.073187 -0.047647
0.00132 -0.053874 0.046864
0.00132 -0.053874 -0.047647
0.00132 -0.073187 -0.065582
0.00132 -0.053874 -0.065582
0.00132 -0.073187 0.064799
0.00132 -0.053874 0.064799
0.00132 -0.020565 -0.065582
0.00132 -0.020565 -0.047647
0.00132 -0.027934 0.064799
0.00132 -0.027934 0.046864
numvert 19
0.001428 0.052677 -0.021809
0.001428 0.043651 -0.029383
0.001428 0.032578 -0.033413
@ -478,150 +466,172 @@ numvert 31
0.001428 0.060615 0
0.001428 0.058569 -0.011604
0.001428 0.026686 0
numsurf 23
numsurf 18
SURF 0x00
mat 2
refs 3
1 0.85169672966 0.80814152956
0 0.825511395931 0.839348077774
18 0.750113546848 0.749492585659
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
2 0.865629732609 0.769861161709
1 0.85169672966 0.80814152956
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
3 0.865629732609 0.729123950005
2 0.865629732609 0.769861161709
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
4 0.85169672966 0.690843462944
3 0.865629732609 0.729123950005
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
5 0.825511455536 0.65963691473
4 0.85169672966 0.690843462944
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
6 0.790231883526 0.63926833868
5 0.825511455536 0.65963691473
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
7 0.750113666058 0.632194459438
6 0.790231883526 0.63926833868
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
8 0.70999532938 0.639268279076
7 0.750113666058 0.632194459438
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
9 0.674715876579 0.65963691473
8 0.70999532938 0.639268279076
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
10 0.648530483246 0.690843462944
9 0.674715876579 0.65963691473
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
11 0.634597480297 0.7291238904
10 0.648530483246 0.690843462944
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
12 0.634597361088 0.7698610425
11 0.634597480297 0.7291238904
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
13 0.648530364037 0.80814152956
12 0.634597361088 0.7698610425
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
14 0.674715697765 0.839348018169
13 0.648530364037 0.80814152956
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
15 0.709995210171 0.859716713428
14 0.674715697765 0.839348018169
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
16 0.750113487244 0.86679059267
15 0.709995210171 0.859716713428
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
17 0.790231823921 0.859716713428
16 0.750113487244 0.86679059267
SURF 0x00
mat 2
refs 3
18 0.750113546848 0.749492585659
0 0.825511395931 0.839348077774
17 0.790231823921 0.859716713428
kids 0
OBJECT poly
name "MFD.range.001"
data 6
Circle
texture "mfd-1.rgb"
texrep 1 1
crease 30.000000
numvert 12
0.00132 -0.027934 0.046864
0.00132 -0.027934 0.070485
0.00132 -0.020565 -0.047647
0.00132 -0.020565 -0.071337
0.00132 -0.053874 0.070485
0.00132 -0.073187 0.070485
0.00132 -0.053874 -0.071337
0.00132 -0.073187 -0.071337
0.00132 -0.053874 -0.047647
0.00132 -0.053874 0.046864
0.00132 -0.073187 -0.047647
0.00132 -0.073187 0.046864
numsurf 5
SURF 0x00
mat 2
refs 4
0 0.595761299133 0.0205063745379
1 0.90372812748 0.0205063223839
3 0.90372812748 0.0834380686283
2 0.595761299133 0.0834381505847
0 0.252164781094 0.380012601614
1 0.128329634666 0.380012601614
4 0.128329634666 0.145931482315
9 0.252164781094 0.145931482315
SURF 0x00
mat 2
refs 4
3 0.90372812748 0.0834380686283
1 0.90372812748 0.0205063223839
4 0.96617180109 0.0205063223839
5 0.96617180109 0.0834380686283
8 0.747639119625 0.145931273699
6 0.87183457613 0.145931273699
3 0.87183457613 0.402134388685
2 0.747639119625 0.402134388685
SURF 0x00
mat 2
refs 4
0 0.595761299133 0.0205063745379
2 0.595761299133 0.0834381505847
7 0.533317625523 0.0834381505847
6 0.533317625523 0.0205063745379
11 0.252164781094 0.00890104006976
9 0.252164781094 0.145931482315
4 0.128329634666 0.145931482315
5 0.128329634666 0.00890104006976
SURF 0x00
mat 2
refs 4
3 0.90372812748 0.0834380686283
5 0.96617180109 0.0834380686283
8 0.96617180109 0.195175632834
9 0.90372812748 0.195175632834
8 0.747639119625 0.145931273699
10 0.747639119625 0.00890095066279
7 0.87183457613 0.00890095066279
6 0.87183457613 0.145931273699
SURF 0x00
mat 2
refs 4
7 0.533317625523 0.0834381505847
2 0.595761299133 0.0834381505847
11 0.595761299133 0.167963117361
10 0.533317625523 0.167963117361
SURF 0x00
mat 2
refs 3
13 0.85169672966 0.80814152956
12 0.825511395931 0.839348077774
30 0.750113546848 0.749492585659
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
14 0.865629732609 0.769861161709
13 0.85169672966 0.80814152956
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
15 0.865629732609 0.729123950005
14 0.865629732609 0.769861161709
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
16 0.85169672966 0.690843462944
15 0.865629732609 0.729123950005
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
17 0.825511455536 0.65963691473
16 0.85169672966 0.690843462944
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
18 0.790231883526 0.63926833868
17 0.825511455536 0.65963691473
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
19 0.750113666058 0.632194459438
18 0.790231883526 0.63926833868
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
20 0.70999532938 0.639268279076
19 0.750113666058 0.632194459438
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
21 0.674715876579 0.65963691473
20 0.70999532938 0.639268279076
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
22 0.648530483246 0.690843462944
21 0.674715876579 0.65963691473
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
23 0.634597480297 0.7291238904
22 0.648530483246 0.690843462944
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
24 0.634597361088 0.7698610425
23 0.634597480297 0.7291238904
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
25 0.648530364037 0.80814152956
24 0.634597361088 0.7698610425
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
26 0.674715697765 0.839348018169
25 0.648530364037 0.80814152956
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
27 0.709995210171 0.859716713428
26 0.674715697765 0.839348018169
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
28 0.750113487244 0.86679059267
27 0.709995210171 0.859716713428
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
29 0.790231823921 0.859716713428
28 0.750113487244 0.86679059267
SURF 0x00
mat 2
refs 3
30 0.750113546848 0.749492585659
12 0.825511395931 0.839348077774
29 0.790231823921 0.859716713428
11 0.252164781094 0.00890104006976
10 0.747639119625 0.00890095066279
8 0.747639119625 0.145931273699
9 0.252164781094 0.145931482315
kids 0
OBJECT poly
name "MFD.screen"

26
Aircraft/Instruments-3d/primus-1000/pfd.ac
View file

@ -23,7 +23,7 @@ numvert 4
0.001858 0.088873 0.032206
numsurf 1
SURF 0x00
mat 0
mat 1
refs 4
0 0.367767989635 0.635342538357
3 0.131497889757 0.635342538357
@ -1480,6 +1480,8 @@ OBJECT poly
name "FDbars"
data 8
Mesh.016
texture "pfd-2.rgb"
texrep 1 1
crease 30.000000
numvert 6
0.001998 0.046746 -0.023469
@ -1492,15 +1494,15 @@ numsurf 2
SURF 0x10
mat 4
refs 3
2 0 0
5 0 0
3 0 0
2 0.539082527161 0.691541314125
5 0.62709492445 0.730888485909
3 0.542497634888 0.703621268272
SURF 0x10
mat 4
refs 3
1 0 0
0 0 0
4 0 0
1 0.714333713055 0.691541314125
0 0.711974859238 0.703621268272
4 0.628215789795 0.730888485909
kids 0
OBJECT poly
name "FromFlag"
@ -1874,13 +1876,13 @@ numvert 4
0.003823 -0.08482 0.083768
0.003823 0.113466 0.083768
numsurf 1
SURF 0x20
SURF 0x00
mat 5
refs 4
0 0 0
3 0 0
2 0 0
1 0 0
0 0.0 1.0
3 0.0 0.0
2 1.0 0.0
1 1.0 1.0
kids 0
OBJECT poly
name "Plane"