1
0
Fork 0

Merge branch 'f-14b-xiii'

This commit is contained in:
Alexis Bory 2011-03-06 19:53:25 +01:00
commit 1b9916829b
3 changed files with 208 additions and 119 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View file

@ -1,8 +1,9 @@
AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 20 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 10 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 10 trans 0
MATERIAL "ac3dmat0" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 10 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 10 trans 0
MATERIAL "ac3dmat1" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 1
MATERIAL "ac3dmat1" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0
OBJECT world
@ -23,7 +24,7 @@ numvert 4
0 0.0393942 -0.0398285
numsurf 1
SURF 0x30
mat 5
mat 6
refs 4
3 0.5 0.5
2 0.5 0.5
@ -67,126 +68,126 @@ numvert 25
-0.00623698 0.00150404 -0.00299215
numsurf 19
SURF 0x0
mat 0
mat 2
refs 4
22 0.171762 0.769478
19 0.171916 0.773954
18 0.173413 0.774007
23 0.173845 0.76955
SURF 0x0
mat 0
mat 2
refs 4
23 0.173845 0.76955
18 0.173413 0.774007
17 0.173426 0.774748
24 0.173845 0.769539
SURF 0x0
mat 0
mat 2
refs 4
21 0.171762 0.769466
20 0.171825 0.774692
19 0.171916 0.773954
22 0.171762 0.769478
SURF 0x0
mat 0
mat 2
refs 4
17 0.173426 0.774748
18 0.173413 0.774007
19 0.171916 0.773954
20 0.171825 0.774692
SURF 0x0
mat 0
mat 2
refs 4
8 0.172141 0.765776
16 0.172106 0.765647
9 0.170939 0.767076
1 0.171028 0.767141
SURF 0x0
mat 0
mat 2
refs 4
7 0.173672 0.765816
15 0.173712 0.765691
16 0.172106 0.765647
8 0.172141 0.765776
SURF 0x0
mat 0
mat 2
refs 4
6 0.174669 0.767216
14 0.17476 0.767161
15 0.173712 0.765691
7 0.173672 0.765816
SURF 0x0
mat 0
mat 2
refs 4
5 0.174607 0.76906
13 0.174697 0.7691
14 0.17476 0.767161
6 0.174669 0.767216
SURF 0x0
mat 0
mat 2
refs 4
4 0.173535 0.770409
12 0.173571 0.770515
13 0.174697 0.7691
5 0.174607 0.76906
SURF 0x0
mat 0
mat 2
refs 4
2 0.170967 0.768951
10 0.170877 0.768983
11 0.171966 0.770455
3 0.172004 0.770353
SURF 0x0
mat 0
mat 2
refs 4
1 0.171028 0.767141
9 0.170939 0.767076
10 0.170877 0.768983
2 0.170967 0.768951
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
8 0.172141 0.765776
1 0.171028 0.767141
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
7 0.173672 0.765816
8 0.172141 0.765776
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
6 0.174669 0.767216
7 0.173672 0.765816
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
5 0.174607 0.76906
6 0.174669 0.767216
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
4 0.173535 0.770409
5 0.174607 0.76906
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
3 0.172004 0.770353
4 0.173535 0.770409
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
2 0.170967 0.768951
3 0.172004 0.770353
SURF 0x0
mat 0
mat 2
refs 3
0 0.172816 0.768133
1 0.171028 0.767141
@ -225,160 +226,160 @@ numvert 25
-0.012347 0.00451085 0.00435962
numsurf 24
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
8 0.130031 0.096618
1 0.12858 0.0927022
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
1 0.12858 0.0927022
2 0.125077 0.0910803
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
2 0.125077 0.0910803
3 0.121573 0.0927022
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
3 0.121573 0.0927022
4 0.120122 0.096618
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
4 0.120122 0.096618
5 0.121573 0.100534
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
5 0.121573 0.100534
6 0.125077 0.102156
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
6 0.125077 0.102156
7 0.12858 0.100534
SURF 0x10
mat 0
mat 2
refs 3
0 0.125077 0.096618
7 0.12858 0.100534
8 0.130031 0.096618
SURF 0x10
mat 0
mat 2
refs 4
1 0.0358929 0.0522682
8 0.0365473 0.0542604
10 0.0367956 0.0542604
9 0.0360684 0.0520468
SURF 0x10
mat 0
mat 2
refs 4
9 0.128969 0.0922671
10 0.130582 0.096618
12 0.130582 0.096618
11 0.128969 0.0922671
SURF 0x10
mat 0
mat 2
refs 4
2 0.0343129 0.0514429
1 0.0358929 0.0522682
9 0.0360684 0.0520468
13 0.0343129 0.0511299
SURF 0x10
mat 0
mat 2
refs 4
13 0.125077 0.090465
9 0.128969 0.0922671
11 0.128969 0.0922671
14 0.125077 0.090465
SURF 0x10
mat 0
mat 2
refs 4
3 0.0327328 0.0522682
2 0.0343129 0.0514429
13 0.0343129 0.0511299
15 0.0325573 0.0520468
SURF 0x10
mat 0
mat 2
refs 4
15 0.121184 0.0922671
13 0.125077 0.090465
14 0.125077 0.090465
16 0.121184 0.0922671
SURF 0x10
mat 0
mat 2
refs 4
4 0.0320784 0.0542604
3 0.0327328 0.0522682
15 0.0325573 0.0520468
17 0.03183 0.0542604
SURF 0x10
mat 0
mat 2
refs 4
17 0.119571 0.096618
15 0.121184 0.0922671
16 0.121184 0.0922671
18 0.119571 0.096618
SURF 0x10
mat 0
mat 2
refs 4
5 0.0327328 0.0562526
4 0.0320784 0.0542604
17 0.03183 0.0542604
19 0.0325573 0.0564739
SURF 0x10
mat 0
mat 2
refs 4
19 0.121184 0.100969
17 0.119571 0.096618
18 0.119571 0.096618
20 0.121184 0.100969
SURF 0x10
mat 0
mat 2
refs 4
6 0.0343129 0.0570778
5 0.0327328 0.0562526
19 0.0325573 0.0564739
21 0.0343129 0.0573908
SURF 0x10
mat 0
mat 2
refs 4
21 0.125077 0.102771
19 0.121184 0.100969
20 0.121184 0.100969
22 0.125077 0.102771
SURF 0x10
mat 0
mat 2
refs 4
7 0.0358929 0.0562526
6 0.0343129 0.0570778
21 0.0343129 0.0573908
23 0.0360684 0.0564739
SURF 0x10
mat 0
mat 2
refs 4
23 0.128969 0.100969
21 0.125077 0.102771
22 0.125077 0.102771
24 0.128969 0.100969
SURF 0x10
mat 0
mat 2
refs 4
8 0.0365473 0.0542604
7 0.0358929 0.0562526
23 0.0360684 0.0564739
10 0.0367956 0.0542604
SURF 0x10
mat 0
mat 2
refs 4
10 0.130582 0.096618
23 0.128969 0.100969
@ -388,7 +389,64 @@ kids 0
OBJECT group
name "drums"
loc -0.00375798 -0.00291064 -0.000649768
kids 7
kids 10
OBJECT poly
name "negativ-flag"
loc -0.00692231 0.00838725 0.0198654
texture "altimeter-mount.png"
crease 45.000000
numvert 4
0 0.00559777 -0.00701127
0 0.00559777 0.00701127
0 -0.00559777 0.00701127
0 -0.00559777 -0.00701127
numsurf 1
SURF 0x30
mat 0
refs 4
0 0.740563 0.688512
1 0.487505 0.688512
2 0.487505 0.50887
3 0.740563 0.50887
kids 0
OBJECT poly
name "below-1000-flag"
loc -0.00743772 0.00838725 0.0162683
texture "altimeter-mount.png"
crease 45.000000
numvert 4
0 0.00559777 -0.00340564
0 0.00559777 0.00340564
0 -0.00559777 0.00340564
0 -0.00559777 -0.00340564
numsurf 1
SURF 0x30
mat 0
refs 4
0 0.678626 0.490313
1 0.54719 0.490313
2 0.54719 0.310671
3 0.678626 0.310671
kids 0
OBJECT poly
name "below-10000-flag"
loc -0.00743772 0.00838725 0.023471
texture "altimeter-mount.png"
crease 45.000000
numvert 4
0 -0.00559777 -0.00340564
0 -0.00559777 0.00340564
0 0.00559777 0.00340564
0 0.00559777 -0.00340564
numsurf 1
SURF 0x30
mat 0
refs 4
3 0.617815 0.490313
2 0.486379 0.490313
1 0.486379 0.310671
0 0.617815 0.310671
kids 0
OBJECT poly
name "drum-inhg-1"
loc -0.00745182 -0.00594418 -0.0171411
@ -401,7 +459,7 @@ numvert 4
-1.83415e-05 0.00619633 0.00172197
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
2 0.926174 0.719127
0 1.00022 0.719127
@ -420,7 +478,7 @@ numvert 4
1.83443e-05 -0.00619632 -0.00177062
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
1 0.926174 0.719127
3 1.00022 0.719127
@ -439,7 +497,7 @@ numvert 4
-1.83415e-05 0.00619633 0.00173818
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
2 0.926174 0.719127
0 1.00022 0.719127
@ -458,7 +516,7 @@ numvert 4
1.83443e-05 -0.00619632 -0.00172195
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
1 0.926174 0.719127
3 1.00022 0.719127
@ -477,7 +535,7 @@ numvert 4
9.19048e-05 -0.0123196 -0.00338637
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
1 0.924428 0.720413
3 1.00172 0.720413
@ -496,7 +554,7 @@ numvert 4
-9.19066e-05 0.0123196 0.00338637
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
2 0.924428 0.720413
0 1.00172 0.720413
@ -515,7 +573,7 @@ numvert 4
9.19048e-05 -0.0123196 -0.00338636
numsurf 1
SURF 0x10
mat 1
mat 3
refs 4
1 0.924428 0.720413
3 1.00172 0.720413
@ -548,43 +606,43 @@ numvert 15
5.126e-05 -0.00978975 5.76191e-05
numsurf 7
SURF 0x0
mat 3
mat 1
refs 3
0 0.4 1
1 0.76 0.949541
2 0 0.958716
SURF 0x0
mat 3
mat 1
refs 3
1 0.76 0.949541
3 0.840002 0.087156
4 0.320001 0.0733945
SURF 0x0
mat 3
mat 1
refs 3
2 0 0.958716
1 0.76 0.949541
4 0.320001 0.0733945
SURF 0x0
mat 3
mat 1
refs 3
7 0 0.958716
6 0.76 0.949541
5 0.320001 0.0733945
SURF 0x0
mat 3
mat 1
refs 3
10 0.76 0.949541
9 0.840002 0.087156
8 0.320001 0.0733945
SURF 0x0
mat 1
mat 3
refs 3
11 0.320001 0.0733945
12 0.840002 0.087156
13 0.280001 0
SURF 0x0
mat 1
mat 3
refs 3
14 1 0.00458717
13 0.280001 0
@ -601,13 +659,13 @@ numvert 4
4.52753e-05 -0.00853676 0.000120744
numsurf 2
SURF 0x0
mat 2
mat 4
refs 3
0 0.320001 0.0733945
1 0.840002 0.087156
2 0.280001 0
SURF 0x0
mat 2
mat 4
refs 3
3 1 0.00458717
2 0.280001 0
@ -639,101 +697,101 @@ numvert 18
-5.41741e-05 0.0103467 0.0110924
numsurf 16
SURF 0x10
mat 0
mat 2
refs 3
15 -0.000430424 1.00001
17 0.321137 0.667456
16 0.405385 0.667456
SURF 0x10
mat 0
mat 2
refs 3
15 -0.000430424 1.00001
16 0.405385 0.667456
8 0.925113 1.00001
SURF 0x10
mat 0
mat 2
refs 4
15 -0.000430424 1.00001
14 0.139587 0.604733
13 0.321137 0.604733
17 0.321137 0.667456
SURF 0x10
mat 0
mat 2
refs 3
16 0.405385 0.667456
12 0.405385 0.604733
8 0.925113 1.00001
SURF 0x10
mat 0
mat 2
refs 4
15 -0.000430424 1.00001
1 -0.000430424 0.0721802
11 0.139587 0.47337
14 0.139587 0.604733
SURF 0x10
mat 0
mat 2
refs 3
12 0.405385 0.604733
9 0.405385 0.47337
8 0.925113 1.00001
SURF 0x10
mat 0
mat 2
refs 4
11 0.139587 0.47337
1 -0.000430424 0.0721802
7 0.321137 0.410648
10 0.321137 0.47337
SURF 0x10
mat 0
mat 2
refs 4
9 0.405385 0.47337
6 0.405385 0.410648
5 0.533537 0.388162
8 0.925113 1.00001
SURF 0x10
mat 0
mat 2
refs 3
8 0.925113 1.00001
5 0.533537 0.388162
4 0.713899 0.388162
SURF 0x10
mat 0
mat 2
refs 3
8 0.925113 1.00001
4 0.713899 0.388162
0 0.925113 0.0721802
SURF 0x10
mat 0
mat 2
refs 3
7 0.321137 0.410648
1 -0.000430424 0.0721802
6 0.405385 0.410648
SURF 0x10
mat 0
mat 2
refs 3
6 0.405385 0.410648
1 -0.000430424 0.0721802
5 0.533537 0.388162
SURF 0x10
mat 0
mat 2
refs 3
1 -0.000430424 0.0721802
3 0.533537 0.317154
5 0.533537 0.388162
SURF 0x10
mat 0
mat 2
refs 3
4 0.713899 0.388162
2 0.713899 0.317154
0 0.925113 0.0721802
SURF 0x10
mat 0
mat 2
refs 3
1 -0.000430424 0.0721802
0 0.925113 0.0721802
3 0.533537 0.317154
SURF 0x10
mat 0
mat 2
refs 3
3 0.533537 0.317154
0 0.925113 0.0721802
@ -793,252 +851,252 @@ numvert 46
0.00250081 -0.0138084 0.0332893
numsurf 38
SURF 0x30
mat 0
mat 2
refs 3
0 0.92116 0.434405
21 0.929543 0.442095
8 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
21 0.929543 0.442095
0 0.92116 0.434405
7 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
1 0.92116 0.434405
14 0.92126 0.435209
29 0.921271 0.442095
SURF 0x30
mat 0
mat 2
refs 3
29 0.921271 0.442095
2 0.92116 0.434405
1 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
14 0.92126 0.435209
1 0.92116 0.434405
13 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 4
27 0.921329 0.449319
3 0.92116 0.434405
2 0.92116 0.434405
28 0.92126 0.44889
SURF 0x30
mat 0
mat 2
refs 4
26 0.921557 0.449494
4 0.92116 0.434405
3 0.92116 0.434405
27 0.921329 0.449319
SURF 0x30
mat 0
mat 2
refs 3
25 0.925407 0.449491
5 0.92116 0.434405
4 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
25 0.925407 0.449491
24 0.92116 0.434405
5 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
26 0.921557 0.449494
25 0.925407 0.449491
4 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
17 0.925407 0.434699
11 0.92116 0.434405
10 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
17 0.925407 0.434699
16 0.921532 0.434695
11 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
18 0.929207 0.434695
17 0.925407 0.434699
10 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 4
19 0.929434 0.434848
18 0.929207 0.434695
10 0.92116 0.434405
9 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 4
20 0.929529 0.435254
19 0.929434 0.434848
9 0.92116 0.434405
8 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
21 0.929543 0.442095
20 0.929529 0.435254
8 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
22 0.929542 0.448958
21 0.929543 0.442095
7 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 4
6 0.92116 0.434405
23 0.92116 0.434405
22 0.929542 0.448958
7 0.92116 0.434405
SURF 0x0
mat 1
mat 3
refs 4
30 0.076149 0.503444
31 0.108446 0.664747
28 0.0117448 0.948318
29 0.0130355 0.503444
SURF 0x0
mat 1
mat 3
refs 4
31 0.108446 0.664747
32 0.200421 0.801487
27 0.0199547 0.976399
28 0.0117448 0.948318
SURF 0x0
mat 1
mat 3
refs 4
32 0.200421 0.801487
33 0.338073 0.892862
26 0.0467756 0.987878
27 0.0199547 0.976399
SURF 0x0
mat 1
mat 3
refs 4
33 0.338073 0.892862
34 0.500443 0.924936
25 0.500443 0.987637
26 0.0467756 0.987878
SURF 0x0
mat 1
mat 3
refs 4
34 0.500443 0.924936
35 0.662812 0.892862
24 0.958475 0.987877
25 0.500443 0.987637
SURF 0x0
mat 1
mat 3
refs 4
35 0.662812 0.892862
36 0.800465 0.801487
23 0.980891 0.974908
24 0.958475 0.987877
SURF 0x0
mat 1
mat 3
refs 4
36 0.800465 0.801487
37 0.892439 0.664747
22 0.987659 0.952755
23 0.980891 0.974908
SURF 0x0
mat 1
mat 3
refs 4
37 0.892439 0.664747
38 0.924737 0.503444
21 0.98785 0.503444
22 0.987659 0.952755
SURF 0x0
mat 1
mat 3
refs 4
38 0.924737 0.503444
39 0.892439 0.342142
20 0.986188 0.0556207
21 0.98785 0.503444
SURF 0x0
mat 1
mat 3
refs 4
39 0.892439 0.342142
40 0.800465 0.205402
19 0.975014 0.029042
20 0.986188 0.0556207
SURF 0x0
mat 1
mat 3
refs 4
40 0.800465 0.205402
41 0.662812 0.114027
18 0.948233 0.0189992
19 0.975014 0.029042
SURF 0x0
mat 1
mat 3
refs 4
41 0.662812 0.114027
42 0.500443 0.0819523
17 0.500443 0.0192504
18 0.948233 0.0189992
SURF 0x0
mat 1
mat 3
refs 4
42 0.500443 0.0819523
43 0.338073 0.114027
16 0.0438026 0.0190005
17 0.500443 0.0192504
SURF 0x0
mat 1
mat 3
refs 4
43 0.338073 0.114027
44 0.200421 0.205402
15 0.0243895 0.0304906
16 0.0438026 0.0190005
SURF 0x0
mat 1
mat 3
refs 4
44 0.200421 0.205402
45 0.108446 0.342142
14 0.0117448 0.052664
15 0.0243895 0.0304906
SURF 0x0
mat 1
mat 3
refs 4
45 0.108446 0.342142
30 0.076149 0.503444
29 0.0130355 0.503444
14 0.0117448 0.052664
SURF 0x30
mat 0
mat 2
refs 4
24 0.92116 0.434405
23 0.92116 0.434405
6 0.92116 0.434405
5 0.92116 0.434405
SURF 0x30
mat 0
mat 2
refs 3
2 0.92116 0.434405
29 0.921271 0.442095
28 0.92126 0.44889
SURF 0x30
mat 0
mat 2
refs 4
13 0.92116 0.434405
12 0.92116 0.434405
15 0.921367 0.43487
14 0.92126 0.435209
SURF 0x30
mat 0
mat 2
refs 4
12 0.92116 0.434405
11 0.92116 0.434405
@ -1056,7 +1114,7 @@ numvert 4
0 -0.00725443 -0.00589755
numsurf 1
SURF 0x30
mat 4
mat 5
refs 4
0 1 1
1 0 1
@ -1074,7 +1132,7 @@ numvert 4
0 0.00725442 -0.00589755
numsurf 1
SURF 0x30
mat 4
mat 5
refs 4
3 1 1
2 0 1

View file

@ -20,7 +20,7 @@
<type>rotate</type>
<object-name>needle</object-name>
<property>instrumentation/altimeter/indicated-altitude-ft</property>
<factor>3.6</factor>
<factor>0.36</factor>
<axis>
<x>-1</x>
<y>0</y>
@ -76,6 +76,37 @@
</axis>
</animation>
<animation>
<type>select</type>
<object-name>negativ-flag</object-name>
<condition>
<less-than>
<property>instrumentation/altimeter/indicated-altitude-ft</property>
<value>0</value>
</less-than>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>below-1000-flag</object-name>
<condition>
<less-than>
<property>instrumentation/altimeter/indicated-altitude-ft</property>
<value>1000</value>
</less-than>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>below-10000-flag</object-name>
<condition>
<less-than>
<property>instrumentation/altimeter/indicated-altitude-ft</property>
<value>10000</value>
</less-than>
</condition>
</animation>
<!-- barometer drum counter -->
<animation>
<type>textranslate</type>