diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index 7feecc34..f3e93ca9 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -101,6 +101,7 @@ rotate bank + slipskid orientation/roll-deg
0 @@ -114,6 +115,18 @@ + + translate + slipskid + /instrumentation/slip-skid-ball/indicated-slip-skid + -0.002 + + 0 + 1 + 0 + + + select fd_roll @@ -124,6 +137,8 @@ /it-autoflight/output/fd1 1 + /gear/gear[1]/wow + /gear/gear[2]/wow orientation/roll-deg 45 @@ -134,6 +149,14 @@ + + + + select + rudder_bar + + unused/unused + diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 50eda2b5..d61f7f77 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -101,6 +101,7 @@ rotate bank + slipskid orientation/roll-deg
0 @@ -114,6 +115,18 @@ + + translate + slipskid + /instrumentation/slip-skid-ball/indicated-slip-skid + -0.002 + + 0 + 1 + 0 + + + select fd_roll @@ -124,6 +137,8 @@ /it-autoflight/output/fd2 1 + /gear/gear[1]/wow + /gear/gear[2]/wow orientation/roll-deg 45 @@ -134,6 +149,14 @@ + + + + select + rudder_bar + + unused/unused + diff --git a/Models/Instruments/PFD/res/autoland.png b/Models/Instruments/PFD/res/autoland.png index 44ff1b23..519c7a25 100644 Binary files a/Models/Instruments/PFD/res/autoland.png and b/Models/Instruments/PFD/res/autoland.png differ diff --git a/Models/Instruments/PFD/res/pfd-3d.ac b/Models/Instruments/PFD/res/pfd-3d.ac index c56e12f2..0e2ba120 100644 --- a/Models/Instruments/PFD/res/pfd-3d.ac +++ b/Models/Instruments/PFD/res/pfd-3d.ac @@ -1,7 +1,26 @@ AC3Db MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0 OBJECT world -kids 30 +kids 32 +OBJECT poly +name "rudder_bar" +loc 0.00132974 -0.00872025 0.00491576 +texture "rudder-bar.png" +crease 45.000000 +numvert 4 +0 -0.0105466 -0.00420202 +0 -0.0105466 0.00420203 +0 0.0105466 0.00420202 +0 0.0105466 -0.00420203 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 OBJECT poly name "target-alt-sel" loc 0.000960576 -0.000264099 -0.0431903 @@ -462,25 +481,6 @@ refs 4 0 0.66857 0.0450599 kids 0 OBJECT poly -name "bank" -loc 0.00147448 0.0381779 0.00511426 -texture "symbols.png" -crease 45.000000 -numvert 4 -0 -0.00444023 -0.00535177 -0 -0.00444022 0.00535178 -0 0.00444023 0.00535178 -0 0.00444023 -0.00535177 -numsurf 1 -SURF 0x30 -mat 0 -refs 4 -3 0.348876 0.567016 -2 0.505593 0.567016 -1 0.505593 0.295057 -0 0.348876 0.295057 -kids 0 -OBJECT poly name "alt-tape-2" loc 0.00133137 0.000295199 -0.0595814 texture "alt-tape-2.png" @@ -594,3 +594,41 @@ refs 4 1 0.762653 0.461267 0 0.510324 0.461267 kids 0 +OBJECT poly +name "bank" +loc 0.00147448 0.0381779 0.00511426 +texture "symbols.png" +crease 45.000000 +numvert 4 +0 -0.000568084 -0.00535177 +0 -0.000568084 0.00535178 +0 0.00444023 -0.00535177 +0 0.00444023 0.00535178 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +0 0.348876 0.413639 +2 0.348876 0.567016 +3 0.505593 0.567016 +1 0.505593 0.413639 +kids 0 +OBJECT poly +name "slipskid" +loc 0.00147448 0.0381779 0.00511426 +texture "symbols.png" +crease 45.000000 +numvert 4 +0 -0.00444023 -0.00535177 +0 -0.00444022 0.00535178 +0 -0.000568084 0.00535178 +0 -0.000568084 -0.00535177 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +2 0.505593 0.413639 +1 0.505593 0.295057 +0 0.348876 0.295057 +3 0.348876 0.413639 +kids 0 diff --git a/Models/Instruments/PFD/res/pfd-3d.ac.bak b/Models/Instruments/PFD/res/pfd-3d.ac.bak index c56e12f2..036b616d 100644 --- a/Models/Instruments/PFD/res/pfd-3d.ac.bak +++ b/Models/Instruments/PFD/res/pfd-3d.ac.bak @@ -1,7 +1,27 @@ AC3Db +MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0 MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0 OBJECT world -kids 30 +kids 33 +OBJECT poly +name "rudder_bar" +loc 0.00132974 -0.00872025 0.00491576 +texture "rudder-bar.png" +crease 45.000000 +numvert 4 +0 -0.0105466 -0.00420202 +0 -0.0105466 0.00420203 +0 0.0105466 0.00420202 +0 0.0105466 -0.00420203 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 OBJECT poly name "target-alt-sel" loc 0.000960576 -0.000264099 -0.0431903 @@ -14,7 +34,7 @@ numvert 4 0 0.0428304 -0.00623311 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.990386 0.217208 2 0.022378 0.217208 @@ -33,7 +53,7 @@ numvert 4 0 -0.0424935 -0.00258292 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.998074 0.321737 1 0.800781 0.321737 @@ -52,7 +72,7 @@ numvert 4 0 -0.0443777 -0.0369368 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.5875 0.5875 1 0.4125 0.5875 @@ -71,7 +91,7 @@ numvert 4 0 0.00631731 -0.0361253 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.0605338 0.994588 2 -0.0513565 0.994588 @@ -90,7 +110,7 @@ numvert 4 0 0.00631731 -0.0361253 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.0605338 0.994588 2 -0.0513565 0.994588 @@ -109,7 +129,7 @@ numvert 4 0 0.00631731 -0.0361253 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.0605338 0.994588 2 -0.0513565 0.994588 @@ -128,7 +148,7 @@ numvert 4 0 0.00601731 -0.0361253 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.0605338 0.994588 2 -0.0513565 0.994588 @@ -147,7 +167,7 @@ numvert 4 0 -0.0428304 -0.00806341 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.990386 0.217208 1 0.022378 0.217208 @@ -166,7 +186,7 @@ numvert 4 0 0.0428304 -0.00990531 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.498074 0.321737 2 0.00829178 0.321737 @@ -185,7 +205,7 @@ numvert 4 0 0.040099 -0.00314169 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.660342 0.662271 2 0.638535 0.662271 @@ -204,7 +224,7 @@ numvert 4 0 -0.0210118 -0.00234548 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0 0.496308 1 1.03601 0.496308 @@ -223,7 +243,7 @@ numvert 4 0 -0.000747245 -0.01934 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.510324 0.464321 1 0.762653 0.464321 @@ -242,7 +262,7 @@ numvert 4 0 0.00534438 -0.0329828 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.403727 0.933591 2 0.909275 0.933591 @@ -261,7 +281,7 @@ numvert 4 0 0.0056307 0.00676597 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.791565 0.449709 2 0.68209 0.449709 @@ -284,14 +304,14 @@ numvert 8 0 0.00402807 -0.0455873 numsurf 2 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.629302 0.44775 1 0.520441 0.44775 2 0.520441 0.0183234 3 0.629302 0.0183234 SURF 0x30 -mat 0 +mat 1 refs 4 7 0.629302 0.0183234 6 0.520441 0.0183234 @@ -314,14 +334,14 @@ numvert 8 0 0.00378506 -0.0455873 numsurf 2 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.629302 0.44775 2 0.520441 0.44775 1 0.520441 0.0183234 0 0.629302 0.0183234 SURF 0x30 -mat 0 +mat 1 refs 4 4 0.629302 0.0183234 5 0.520441 0.0183234 @@ -340,7 +360,7 @@ numvert 4 0 -0.0361804 0.00381498 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.99826 0.988171 1 0.99826 0.0824336 @@ -359,7 +379,7 @@ numvert 4 0 0.00428777 -0.0357276 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.501561 0.112546 2 0.964105 0.112546 @@ -378,7 +398,7 @@ numvert 4 0 0.00547617 -0.00312652 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.239237 0.294683 1 0.442683 0.294683 @@ -397,7 +417,7 @@ numvert 4 0 0.00312651 -0.00547615 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.239237 0.294683 2 0.442683 0.294683 @@ -416,7 +436,7 @@ numvert 4 -1e-005 -0.0424935 -0.00136903 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 1 0.321832 1 0 0.321832 @@ -435,7 +455,7 @@ numvert 4 0 -0.0424935 -0.00136903 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.598403 0.321832 1 0.501577 0.321832 @@ -454,7 +474,7 @@ numvert 4 0 0.0424935 -0.00136903 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.66857 0.321965 2 0.605455 0.321965 @@ -462,25 +482,6 @@ refs 4 0 0.66857 0.0450599 kids 0 OBJECT poly -name "bank" -loc 0.00147448 0.0381779 0.00511426 -texture "symbols.png" -crease 45.000000 -numvert 4 -0 -0.00444023 -0.00535177 -0 -0.00444022 0.00535178 -0 0.00444023 0.00535178 -0 0.00444023 -0.00535177 -numsurf 1 -SURF 0x30 -mat 0 -refs 4 -3 0.348876 0.567016 -2 0.505593 0.567016 -1 0.505593 0.295057 -0 0.348876 0.295057 -kids 0 -OBJECT poly name "alt-tape-2" loc 0.00133137 0.000295199 -0.0595814 texture "alt-tape-2.png" @@ -492,7 +493,7 @@ numvert 4 0 0.00598263 -0.00278856 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.962665 0.356135 2 0.0568116 0.356135 @@ -511,7 +512,7 @@ numvert 4 0 -0.0428304 -0.00806341 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.990386 0.217208 1 0.022378 0.217208 @@ -530,7 +531,7 @@ numvert 4 0 -0.0428304 -0.00806341 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 0.990386 0.217208 1 0.022378 0.217208 @@ -549,7 +550,7 @@ numvert 4 -0.0639733 -0.0784821 -0.0784821 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 0 1 1 1 0 1 @@ -568,7 +569,7 @@ numvert 4 0 -0.0210118 0.00234548 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0 0.496308 2 1.03601 0.496308 @@ -587,10 +588,66 @@ numvert 4 0 0.0195466 0.000817249 numsurf 1 SURF 0x30 -mat 0 +mat 1 refs 4 3 0.510324 0.464321 2 0.762653 0.464321 1 0.762653 0.461267 0 0.510324 0.461267 kids 0 +OBJECT poly +name "rect" +loc 0.0153975 0.53761 0.00507878 +crease 45.000000 +numvert 4 +-0.5 -0.5 0.5 +-0.5 -0.5 -0.5 +0.5 -0.5 -0.5 +0.5 -0.5 0.5 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 +OBJECT poly +name "bank" +loc 0.00147448 0.0381779 0.00511426 +texture "symbols.png" +crease 45.000000 +numvert 4 +0 -0.000568084 -0.00535177 +0 -0.000568084 0.00535178 +0 0.00444023 -0.00535177 +0 0.00444023 0.00535178 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +0 0.348876 0.413639 +2 0.348876 0.567016 +3 0.505593 0.567016 +1 0.505593 0.413639 +kids 0 +OBJECT poly +name "slipskid" +loc 0.00147448 0.0381779 0.00511426 +texture "symbols.png" +crease 45.000000 +numvert 4 +0 -0.00444023 -0.00535177 +0 -0.00444022 0.00535178 +0 -0.000568084 0.00535178 +0 -0.000568084 -0.00535177 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +2 0.505593 0.413639 +1 0.505593 0.295057 +0 0.348876 0.295057 +3 0.348876 0.413639 +kids 0 diff --git a/Models/Instruments/PFD/res/rudder.ac b/Models/Instruments/PFD/res/rudder.ac new file mode 100644 index 00000000..27dd8665 --- /dev/null +++ b/Models/Instruments/PFD/res/rudder.ac @@ -0,0 +1,23 @@ +AC3Db +MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0 +OBJECT world +kids 1 +OBJECT poly +name "rudder_bar" +loc 0.00132974 -0.00872025 0.00491576 +texture "rudder-bar.png" +crease 45.000000 +numvert 4 +0 -0.0105466 -0.00420202 +0 -0.0105466 0.00420203 +0 0.0105466 0.00420202 +0 0.0105466 -0.00420203 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 diff --git a/Models/Instruments/PFD/res/symbols.png b/Models/Instruments/PFD/res/symbols.png index a859eadd..b263961b 100644 Binary files a/Models/Instruments/PFD/res/symbols.png and b/Models/Instruments/PFD/res/symbols.png differ