Merge branch 'master' of git://mapserver.flightgear.org/fgdata
This commit is contained in:
commit
2a1712b5f9
18 changed files with 12739 additions and 12706 deletions
Aircraft
Instruments-3d
flaps
magneto-switch
c172p/Models
Environment
Input/Joysticks/Saitek
preferences.xml
|
@ -1,243 +1,243 @@
|
||||||
AC3Db
|
AC3Db
|
||||||
MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0
|
MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0
|
||||||
MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0
|
MATERIAL "WhiteLightOff" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 72 trans 0
|
||||||
MATERIAL "WhiteLightOff" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 72 trans 0
|
OBJECT world
|
||||||
OBJECT world
|
kids 3
|
||||||
kids 3
|
OBJECT poly
|
||||||
OBJECT poly
|
name "rect"
|
||||||
name "rect"
|
loc 0 -0.0136416 0.00484141
|
||||||
loc 0 -0.0136416 0.00484141
|
texture "flaps.png"
|
||||||
texture "flaps.rgb"
|
crease 45.000000
|
||||||
crease 45.000000
|
numvert 4
|
||||||
numvert 4
|
0 -0.0403456 -0.0189484
|
||||||
0 -0.0403456 -0.0189484
|
0 -0.0403456 0.0400651
|
||||||
0 -0.0403456 0.0400651
|
0 0.066308 0.0400651
|
||||||
0 0.066308 0.0400651
|
0 0.066308 -0.0189484
|
||||||
0 0.066308 -0.0189484
|
numsurf 1
|
||||||
numsurf 1
|
SURF 0x20
|
||||||
SURF 0x20
|
mat 0
|
||||||
mat 0
|
refs 4
|
||||||
refs 4
|
3 1 1
|
||||||
3 1 1
|
2 0 1
|
||||||
2 0 1
|
1 0 0
|
||||||
1 0 0
|
0 1 0
|
||||||
0 1 0
|
kids 0
|
||||||
kids 0
|
OBJECT poly
|
||||||
OBJECT poly
|
name "FlapPos"
|
||||||
name "FlapPos"
|
loc -0.00118963 0.0362646 0.0251696
|
||||||
loc -0.00118963 0.0362646 0.0251696
|
crease 45.000000
|
||||||
crease 45.000000
|
numvert 16
|
||||||
numvert 16
|
0.00443064 0.000999995 -0.00400197
|
||||||
0.00443064 0.000999995 -0.00400197
|
0.00802631 0.000999995 -0.00400197
|
||||||
0.00802631 0.000999995 -0.00400197
|
0.00802631 0.000999995 0.00400197
|
||||||
0.00802631 0.000999995 0.00400197
|
0.00443064 0.000999995 0.00400197
|
||||||
0.00443064 0.000999995 0.00400197
|
0.00443064 -0.000999998 0.00400197
|
||||||
0.00443064 -0.000999998 0.00400197
|
0.00802631 -0.000999998 0.00400197
|
||||||
0.00802631 -0.000999998 0.00400197
|
0.00802631 -0.000999998 -0.00400197
|
||||||
0.00802631 -0.000999998 -0.00400197
|
0.00443064 -0.000999998 -0.00400197
|
||||||
0.00443064 -0.000999998 -0.00400197
|
-0.00802631 0.000999998 -0.00122597
|
||||||
-0.00802631 0.000999998 -0.00122597
|
0.00481799 0.000999998 -0.00122597
|
||||||
0.00481799 0.000999998 -0.00122597
|
0.00481799 0.000999998 0.00148963
|
||||||
0.00481799 0.000999998 0.00148963
|
-0.00802631 0.000999998 0.00148963
|
||||||
-0.00802631 0.000999998 0.00148963
|
-0.00802631 -0.000999995 0.00148963
|
||||||
-0.00802631 -0.000999995 0.00148963
|
0.00481799 -0.000999995 0.00148963
|
||||||
0.00481799 -0.000999995 0.00148963
|
0.00481799 -0.000999995 -0.00122597
|
||||||
0.00481799 -0.000999995 -0.00122597
|
-0.00802631 -0.000999995 -0.00122597
|
||||||
-0.00802631 -0.000999995 -0.00122597
|
numsurf 12
|
||||||
numsurf 12
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
7 0 0
|
||||||
7 0 0
|
6 1 0
|
||||||
6 1 0
|
5 1 1
|
||||||
5 1 1
|
4 0 1
|
||||||
4 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
0 0 0
|
||||||
0 0 0
|
3 1 0
|
||||||
3 1 0
|
2 1 1
|
||||||
2 1 1
|
1 0 1
|
||||||
1 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
3 0 0
|
||||||
3 0 0
|
4 1 0
|
||||||
4 1 0
|
5 1 1
|
||||||
5 1 1
|
2 0 1
|
||||||
2 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
1 0 0
|
||||||
1 0 0
|
6 1 0
|
||||||
6 1 0
|
7 1 1
|
||||||
7 1 1
|
0 0 1
|
||||||
0 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
0 0 0
|
||||||
0 0 0
|
7 1 0
|
||||||
7 1 0
|
4 1 1
|
||||||
4 1 1
|
3 0 1
|
||||||
3 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
2 0 0
|
||||||
2 0 0
|
5 1 0
|
||||||
5 1 0
|
6 1 1
|
||||||
6 1 1
|
1 0 1
|
||||||
1 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
15 0 0
|
||||||
15 0 0
|
14 1 0
|
||||||
14 1 0
|
13 1 1
|
||||||
13 1 1
|
12 0 1
|
||||||
12 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
8 0 0
|
||||||
8 0 0
|
11 1 0
|
||||||
11 1 0
|
10 1 1
|
||||||
10 1 1
|
9 0 1
|
||||||
9 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
11 0 0
|
||||||
11 0 0
|
12 1 0
|
||||||
12 1 0
|
13 1 1
|
||||||
13 1 1
|
10 0 1
|
||||||
10 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
9 0 0
|
||||||
9 0 0
|
14 1 0
|
||||||
14 1 0
|
15 1 1
|
||||||
15 1 1
|
8 0 1
|
||||||
8 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
8 0 0
|
||||||
8 0 0
|
15 1 0
|
||||||
15 1 0
|
12 1 1
|
||||||
12 1 1
|
11 0 1
|
||||||
11 0 1
|
SURF 0x30
|
||||||
SURF 0x30
|
mat 1
|
||||||
mat 2
|
refs 4
|
||||||
refs 4
|
10 0 0
|
||||||
10 0 0
|
13 1 0
|
||||||
13 1 0
|
14 1 1
|
||||||
14 1 1
|
9 0 1
|
||||||
9 0 1
|
kids 0
|
||||||
kids 0
|
OBJECT poly
|
||||||
OBJECT poly
|
name "FlapSwitch"
|
||||||
name "FlapSwitch"
|
loc 0.0267165 0.0384582 -0.000771669
|
||||||
loc 0.0267165 0.0384582 -0.000771669
|
texture "manilla.png"
|
||||||
crease 45.000000
|
crease 45.000000
|
||||||
numvert 20
|
numvert 20
|
||||||
0.0355965 -0.0038875 -0.0105119
|
0.0355965 -0.0038875 -0.0105119
|
||||||
0.0355965 -0.0038875 0.0103359
|
0.0355965 -0.0038875 0.0103359
|
||||||
7.87415e-005 0.00666422 0.0103359
|
7.87415e-005 0.00666422 0.0103359
|
||||||
7.87415e-005 0.00666422 -0.0105119
|
7.87415e-005 0.00666422 -0.0105119
|
||||||
-0.00171348 -0.00349997 -0.0105119
|
-0.00171348 -0.00349997 -0.0105119
|
||||||
-0.00171348 -0.00349997 0.0103359
|
-0.00171348 -0.00349997 0.0103359
|
||||||
0.0351283 -0.00666425 0.0103359
|
0.0351283 -0.00666425 0.0103359
|
||||||
0.0351283 -0.00666425 -0.0105119
|
0.0351283 -0.00666425 -0.0105119
|
||||||
-0.0355964 -0.00219359 0.000157867
|
-0.0355964 -0.00219359 0.000157867
|
||||||
0.00320959 -0.00219359 0.000157867
|
0.00320959 -0.00219359 0.000157867
|
||||||
0.00320959 -0.00219359 0.00315787
|
0.00320959 -0.00219359 0.00315787
|
||||||
-0.0355964 -0.00219359 0.00315787
|
-0.0355964 -0.00219359 0.00315787
|
||||||
-0.0355964 0.00232242 0.00315787
|
-0.0355964 0.00232242 0.00315787
|
||||||
0.00320959 0.00232242 0.00315787
|
0.00320959 0.00232242 0.00315787
|
||||||
0.00320959 0.00232242 0.000157867
|
0.00320959 0.00232242 0.000157867
|
||||||
-0.0355964 0.00232242 0.000157867
|
-0.0355964 0.00232242 0.000157867
|
||||||
0.0352444 -0.00388747 0.0105119
|
0.0352444 -0.00388747 0.0105119
|
||||||
0.0352444 -0.00388747 -0.0103359
|
0.0352444 -0.00388747 -0.0103359
|
||||||
-0.000273386 0.00666425 -0.0103359
|
-0.000273386 0.00666425 -0.0103359
|
||||||
-0.000273386 0.00666425 0.0105119
|
-0.000273386 0.00666425 0.0105119
|
||||||
numsurf 12
|
numsurf 12
|
||||||
SURF 0x10
|
SURF 0x10
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
0 0.603516 0.175781
|
0 0.603516 0.175781
|
||||||
1 0.603516 0.0878903
|
1 0.603516 0.0878903
|
||||||
6 0.691406 0.0878903
|
6 0.691406 0.0878903
|
||||||
7 0.691406 0.175781
|
7 0.691406 0.175781
|
||||||
SURF 0x10
|
SURF 0x10
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
1 0.603516 0.175781
|
1 0.989715 0.969592
|
||||||
2 0.603516 0.0878903
|
2 -0.00300926 0.996381
|
||||||
5 0.691406 0.0878903
|
5 0.0211005 0.720806
|
||||||
6 0.691406 0.175781
|
6 0.996856 0.894456
|
||||||
SURF 0x10
|
SURF 0x10
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
2 0.603516 0.175781
|
2 0.603516 0.175781
|
||||||
3 0.603516 0.0878903
|
3 0.603516 0.0878903
|
||||||
4 0.691406 0.0878903
|
4 0.691406 0.0878903
|
||||||
5 0.691406 0.175781
|
5 0.691406 0.175781
|
||||||
SURF 0x10
|
SURF 0x10
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
3 0.603516 0.175781
|
3 -0.00605563 1.00611
|
||||||
0 0.603516 0.0878903
|
0 0.986668 0.979323
|
||||||
7 0.691406 0.0878903
|
7 0.993809 0.904188
|
||||||
4 0.691406 0.175781
|
4 0.018054 0.730537
|
||||||
SURF 0x10
|
SURF 0x10
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
6 0.691406 0.175781
|
6 0.308594 0.175781
|
||||||
5 0.691406 0.0878903
|
5 0.308594 0.0878903
|
||||||
4 0.603516 0.0878903
|
4 0.396484 0.0878903
|
||||||
7 0.603516 0.175781
|
7 0.396484 0.175781
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
13 0 0
|
13 0 0
|
||||||
10 1 0
|
10 1 0
|
||||||
9 1 1
|
9 1 1
|
||||||
14 0 1
|
14 0 1
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
15 0 0
|
15 0 0
|
||||||
8 1 0
|
8 1 0
|
||||||
11 1 1
|
11 1 1
|
||||||
12 0 1
|
12 0 1
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
14 0 0
|
14 0 0
|
||||||
9 1 0
|
9 1 0
|
||||||
8 1 1
|
8 1 1
|
||||||
15 0 1
|
15 0 1
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
12 0 0
|
12 0 0
|
||||||
11 1 0
|
11 1 0
|
||||||
10 1 1
|
10 1 1
|
||||||
13 0 1
|
13 0 1
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
15 0 0
|
15 0 0
|
||||||
12 1 0
|
12 1 0
|
||||||
13 1 1
|
13 1 1
|
||||||
14 0 1
|
14 0 1
|
||||||
SURF 0x30
|
SURF 0x30
|
||||||
mat 1
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
8 0 0
|
8 0 0
|
||||||
9 1 0
|
9 1 0
|
||||||
10 1 1
|
10 1 1
|
||||||
11 0 1
|
11 0 1
|
||||||
SURF 0x20
|
SURF 0x20
|
||||||
mat 0
|
mat 1
|
||||||
refs 4
|
refs 4
|
||||||
19 0 0
|
19 0.994515 -0.00785261
|
||||||
18 0 0
|
18 0.994515 1.00635
|
||||||
17 0 0
|
17 -0.0110846 1.00635
|
||||||
16 0 0
|
16 -0.0110846 -0.00785267
|
||||||
kids 0
|
kids 0
|
||||||
|
|
BIN
Aircraft/Instruments-3d/flaps/flaps.png
Normal file
BIN
Aircraft/Instruments-3d/flaps/flaps.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 19 KiB |
Binary file not shown.
BIN
Aircraft/Instruments-3d/flaps/manilla.png
Normal file
BIN
Aircraft/Instruments-3d/flaps/manilla.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 18 KiB |
File diff suppressed because it is too large
Load diff
BIN
Aircraft/Instruments-3d/magneto-switch/mag_switch.png
Normal file
BIN
Aircraft/Instruments-3d/magneto-switch/mag_switch.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 36 KiB |
Binary file not shown.
BIN
Aircraft/Instruments-3d/magneto-switch/metal_black.png
Normal file
BIN
Aircraft/Instruments-3d/magneto-switch/metal_black.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 8.6 KiB |
BIN
Aircraft/c172p/Models/Pedals/pedal.png
Normal file
BIN
Aircraft/c172p/Models/Pedals/pedal.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 32 KiB |
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
BIN
Aircraft/c172p/Models/Yoke/yoke.png
Normal file
BIN
Aircraft/c172p/Models/Yoke/yoke.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 112 KiB |
|
@ -34,14 +34,9 @@
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>Yoke</object-name>
|
<object-name>Yoke</object-name>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<not>
|
||||||
<not>
|
<property>sim/model/hide-yoke</property>
|
||||||
<property>sim/model/hide-yoke</property>
|
</not>
|
||||||
</not>
|
|
||||||
<not>
|
|
||||||
<property>/sim/panel-hotspots</property>
|
|
||||||
</not>
|
|
||||||
</and>
|
|
||||||
</condition>
|
</condition>
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before ![]() (image error) Size: 458 KiB After ![]() (image error) Size: 706 KiB ![]() ![]() |
Binary file not shown.
Before ![]() (image error) Size: 123 KiB After ![]() (image error) Size: 90 KiB ![]() ![]() |
|
@ -76,6 +76,26 @@
|
||||||
<weather-scenario>Fair weather</weather-scenario>
|
<weather-scenario>Fair weather</weather-scenario>
|
||||||
<config>
|
<config>
|
||||||
|
|
||||||
|
<!-- definitions for the metar generated fog/mist/haze layer -->
|
||||||
|
<fog-mist-haze-layer>
|
||||||
|
<offset-from-station-elevation-ft>-200</offset-from-station-elevation-ft>
|
||||||
|
<visibility-above-layer-m>20000</visibility-above-layer-m>
|
||||||
|
|
||||||
|
<fog-thickness-ft>500</fog-thickness-ft>
|
||||||
|
<fog-2dlayer-alpha>0.6</fog-2dlayer-alpha>
|
||||||
|
<fog-2dlayer-coverage>broken</fog-2dlayer-coverage>
|
||||||
|
<fog-bc-2dlayer-coverage>scattered</fog-bc-2dlayer-coverage>
|
||||||
|
<fog-shallow-thickness-ft>30</fog-shallow-thickness-ft>
|
||||||
|
|
||||||
|
<mist-thickness-ft>2000</mist-thickness-ft>
|
||||||
|
<mist-2dlayer-alpha>0.8</mist-2dlayer-alpha>
|
||||||
|
<mist-2dlayer-coverage>overcast</mist-2dlayer-coverage>
|
||||||
|
|
||||||
|
<haze-thickness-ft>2000</haze-thickness-ft>
|
||||||
|
<haze-2dlayer-alpha>0.6</haze-2dlayer-alpha>
|
||||||
|
<haze-2dlayer-coverage>overcast</haze-2dlayer-coverage>
|
||||||
|
</fog-mist-haze-layer>
|
||||||
|
|
||||||
<boundary-transition-ft>500</boundary-transition-ft>
|
<boundary-transition-ft>500</boundary-transition-ft>
|
||||||
|
|
||||||
<boundary>
|
<boundary>
|
||||||
|
|
|
@ -120,7 +120,6 @@
|
||||||
<property>/controls/flight/aileron</property>
|
<property>/controls/flight/aileron</property>
|
||||||
<dead-band type="double">0.01</dead-band>
|
<dead-band type="double">0.01</dead-band>
|
||||||
<offset type="double">0.0</offset>
|
<offset type="double">0.0</offset>
|
||||||
<squared type="bool">true</squared>
|
|
||||||
</binding>
|
</binding>
|
||||||
</axis>
|
</axis>
|
||||||
|
|
||||||
|
@ -139,7 +138,6 @@
|
||||||
<dead-band type="double">0.01</dead-band>
|
<dead-band type="double">0.01</dead-band>
|
||||||
<offset type="double">0.0</offset>
|
<offset type="double">0.0</offset>
|
||||||
<factor type="double">-1.0</factor>
|
<factor type="double">-1.0</factor>
|
||||||
<squared type="bool">true</squared>
|
|
||||||
</binding>
|
</binding>
|
||||||
</axis>
|
</axis>
|
||||||
|
|
||||||
|
@ -158,7 +156,6 @@
|
||||||
<dead-band type="double">0.01</dead-band>
|
<dead-band type="double">0.01</dead-band>
|
||||||
<offset type="double">0.0</offset>
|
<offset type="double">0.0</offset>
|
||||||
<factor type="double">1.0</factor>
|
<factor type="double">1.0</factor>
|
||||||
<squared type="bool">true</squared>
|
|
||||||
</binding>
|
</binding>
|
||||||
<!-- binding>
|
<!-- binding>
|
||||||
<command>nasal</command>
|
<command>nasal</command>
|
||||||
|
|
|
@ -28,7 +28,7 @@ Started September 2000 by David Megginson, david@megginson.com
|
||||||
<read type="string"/>
|
<read type="string"/>
|
||||||
<write type="string"/>
|
<write type="string"/>
|
||||||
</validate>
|
</validate>
|
||||||
<use-custom-scenery-data type="bool">false</use-custom-scenery-data>
|
<use-custom-scenery-data type="bool">true</use-custom-scenery-data>
|
||||||
</paths>
|
</paths>
|
||||||
|
|
||||||
<intl include="Translations/locale.xml"/>
|
<intl include="Translations/locale.xml"/>
|
||||||
|
|
Loading…
Add table
Reference in a new issue