diff --git a/A318-100-CFM-set.xml b/A318-100-CFM-set.xml index 6787cfcf..5ef0ae44 100644 --- a/A318-100-CFM-set.xml +++ b/A318-100-CFM-set.xml @@ -18,7 +18,7 @@ - + Pilot View diff --git a/A320-main.xml b/A320-main.xml index 8c52dc47..751ce760 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -583,6 +583,7 @@ 0 0 + 0 diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 0b6179f4..13dd5d00 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -42,6 +42,44 @@ + + Aircraft/A320Family/Models/Instruments/OHpanel/OHpanelEPR.xml + + + /options/eng + IAE + + + + -0.006166 + 0 + 0.752541 + 62 + + + + + Aircraft/A320Family/Models/Instruments/OHpanel/SteepAppr.xml + + + + /options/eng + CFM + + + /options/steep-ils-avail + 1 + + + + + -0.006166 + 0 + 0.752541 + 62 + + + diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml new file mode 100644 index 00000000..e2feabf4 --- /dev/null +++ b/Models/Instruments/OHpanel/OHpanelEPR.xml @@ -0,0 +1,52 @@ + + + + + res/ohpanelEPR.ac + + + + Panel lighting select + select + MarkingLts + + + + controls/lighting/dome-norm + + + + controls/lighting/dome-norm + 0.5 + + + controls/lighting/overhead-panel-norm + 0.25 + + + + + controls/lighting/dome-norm + 1 + + + controls/lighting/overhead-panel-norm + 0.5 + + + + + + + Panel lighting + material + MarkingLts + + 1 + 1 + 1 + controls/lighting/overhead-panel-norm + + + + \ No newline at end of file diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml new file mode 100644 index 00000000..b82fe373 --- /dev/null +++ b/Models/Instruments/OHpanel/SteepAppr.xml @@ -0,0 +1,121 @@ + + + + + res/SteepAppr.ac + + + + + select + SteepApprBtn2O + + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + + + + + + pick + SteepApprBtn1 + SteepApprBtn2 + SteepApprBtn2O + + + false + + + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + property-toggle + /options/steep-ils + + + nasal + + + + + + + select + SteepApprBtn2O + + + + /options/steep-ils + 1 + + + /controls/switches/annun-test + 1 + + + + + + + + Panel lighting select + select + MarkingLts + + + + controls/lighting/dome-norm + + + + controls/lighting/dome-norm + 0.5 + + + controls/lighting/overhead-panel-norm + 0.25 + + + + + controls/lighting/dome-norm + 1 + + + controls/lighting/overhead-panel-norm + 0.5 + + + + + + + Panel lighting + material + MarkingLts + + 1 + 1 + 1 + controls/lighting/overhead-panel-norm + + + + \ No newline at end of file diff --git a/Models/Instruments/OHpanel/res/SteepAppr.ac b/Models/Instruments/OHpanel/res/SteepAppr.ac new file mode 100644 index 00000000..0b5231d0 --- /dev/null +++ b/Models/Instruments/OHpanel/res/SteepAppr.ac @@ -0,0 +1,164 @@ +AC3Db +MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0 +MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 +OBJECT world +kids 4 +OBJECT poly +name "SteepApprBtn2O" +loc 0.0102001 -0.168758 -0.244878 +data 8 +Cube.063 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.00349075 -0.0464 -0.0536251 +-0.00592814 -0.0464 -0.0337741 +-0.00295051 -0.0464 -0.0334085 +-0.00051312 -0.0464 -0.0532595 +-0.00349075 -0.0564 -0.0536251 +-0.00592814 -0.0564 -0.0337741 +-0.00295051 -0.0564 -0.0334085 +-0.00051312 -0.0564 -0.0532595 +numsurf 4 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 0 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +kids 0 +OBJECT poly +name "SteepApprBtn1" +loc 0.0152448 0.00304149 -0.286474 +data 8 +Cube.031 +texture "buttons.png" +crease 30.000000 +numvert 8 +-0.00561947 -0.2182 -0.0116719 +-0.00805682 -0.2182 0.00817901 +-0.0110345 -0.2182 0.00781345 +-0.0085971 -0.2182 -0.0120375 +-0.00561947 -0.2082 -0.0116719 +-0.00805682 -0.2082 0.00817901 +-0.0110345 -0.2082 0.00781345 +-0.0085971 -0.2082 -0.0120375 +numsurf 4 +SURF 0x0 +mat 0 +refs 4 +4 0.5 1 +7 0.5 1 +6 9.31321e-008 1 +5 9.31321e-008 1 +SURF 0x0 +mat 0 +refs 4 +0 0.5 0.75 +4 0.5 1 +5 9.31321e-008 1 +1 0 0.75 +SURF 0x0 +mat 0 +refs 4 +1 0 0.75 +5 9.31321e-008 1 +6 9.31321e-008 1 +2 0 0.75 +SURF 0x0 +mat 0 +refs 4 +4 0.5 1 +0 0.5 0.75 +3 0.5 0.75 +7 0.5 1 +kids 0 +OBJECT poly +name "SteepApprBtn2" +loc 0.0152448 0.00304149 -0.286474 +data 8 +Cube.032 +texture "buttons.png" +crease 30.000000 +numvert 8 +-0.0085971 -0.2182 -0.0120375 +-0.0110345 -0.2182 0.00781345 +-0.00805682 -0.2182 0.00817901 +-0.00561947 -0.2182 -0.0116719 +-0.0085971 -0.2282 -0.0120375 +-0.0110345 -0.2282 0.00781345 +-0.00805682 -0.2282 0.00817901 +-0.00561947 -0.2282 -0.0116719 +numsurf 4 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 0 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +kids 0 +OBJECT poly +name "MarkingLts" +loc 0.00126776 -5.00064e-005 -5.00083e-005 +data 9 +Plane.007 +texture "markingsSteepAppr.png" +crease 30.000000 +numvert 4 +0.00329813 -0.232617 -0.270463 +0.00329813 -0.1956 -0.270463 +0.00775683 -0.232617 -0.306132 +0.00775683 -0.1956 -0.306132 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +3 0.942185 0.199076 +1 0.888916 0.199076 +0 0.888916 0.142127 +2 0.942185 0.142127 +kids 0 diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png index d7a96bcb..81a48229 100644 Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ diff --git a/Models/Instruments/OHpanel/res/markings.png b/Models/Instruments/OHpanel/res/markings.png index 77aaccf2..b98c5a51 100644 Binary files a/Models/Instruments/OHpanel/res/markings.png and b/Models/Instruments/OHpanel/res/markings.png differ diff --git a/Models/Instruments/OHpanel/res/markingsEPR.png b/Models/Instruments/OHpanel/res/markingsEPR.png new file mode 100644 index 00000000..e8e38740 Binary files /dev/null and b/Models/Instruments/OHpanel/res/markingsEPR.png differ diff --git a/Models/Instruments/OHpanel/res/markingsSteepAppr.png b/Models/Instruments/OHpanel/res/markingsSteepAppr.png new file mode 100644 index 00000000..a63f14e9 Binary files /dev/null and b/Models/Instruments/OHpanel/res/markingsSteepAppr.png differ diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index 9c1b81b7..489adc20 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -8,7 +8,7 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004 MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 OBJECT world -kids 273 +kids 271 OBJECT poly name "PrbWinHeatBtn2O" loc 0.000175806 -0.17185 0.0418501 @@ -15975,84 +15975,6 @@ refs 4 4 0.5 0.5 kids 0 OBJECT poly -name "Eng1N1Btn" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.092 -texture "buttons.png" -crease 30.000000 -numvert 12 -0.003771 -0.2157 -0.275044 -0.00129 -0.2157 -0.255198 -0.004267 -0.2157 -0.254826 -0.006747 -0.2157 -0.274672 -0.003771 -0.2257 -0.275044 -0.00129 -0.2257 -0.255198 -0.004267 -0.2257 -0.254826 -0.006747 -0.2257 -0.274672 -0.003771 -0.2057 -0.275044 -0.00129 -0.2057 -0.255198 -0.004267 -0.2057 -0.254826 -0.006747 -0.2057 -0.274672 -numsurf 8 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.75 -7 0.5 0.5 -4 0.5 0.5 -0 0.5 0.75 -SURF 0x0 -mat 4 -refs 4 -6 0 0.5 -2 9.31321e-008 0.75 -1 9.31321e-008 0.75 -5 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -3 0.5 0.75 -2 9.31321e-008 0.75 -6 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -6 0 0.5 -5 0 0.5 -4 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -11 0.5 1 -3 0.5 0.75 -0 0.5 0.75 -8 0.5 1 -SURF 0x0 -mat 4 -refs 4 -2 0 0.75 -10 9.31321e-008 1 -9 9.31321e-008 1 -1 0 0.75 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.75 -11 0.5 1 -10 9.31321e-008 1 -2 0 0.75 -SURF 0x0 -mat 4 -refs 4 -11 0.5 1 -8 0.5 1 -9 9.31321e-008 1 -10 9.31321e-008 1 -kids 0 -OBJECT poly name "GreenEngPump2" loc 0.000113685 -5.00064e-005 -4.99785e-005 data 8 @@ -16589,84 +16511,6 @@ refs 4 4 0.5 0.5 kids 0 OBJECT poly -name "Eng2N1Btn" -loc 0.000113685 -5.00064e-005 -4.99785e-005 -data 8 -Cube.093 -texture "buttons.png" -crease 30.000000 -numvert 12 -0.007727 -0.2157 -0.306697 -0.005247 -0.2157 -0.286852 -0.008223 -0.2157 -0.28648 -0.010704 -0.2157 -0.306325 -0.007727 -0.2257 -0.306697 -0.005247 -0.2257 -0.286852 -0.008223 -0.2257 -0.28648 -0.010704 -0.2257 -0.306325 -0.007727 -0.2057 -0.306697 -0.005247 -0.2057 -0.286852 -0.008223 -0.2057 -0.28648 -0.010704 -0.2057 -0.306325 -numsurf 8 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.75 -7 0.5 0.5 -4 0.5 0.5 -0 0.5 0.75 -SURF 0x0 -mat 4 -refs 4 -6 0 0.5 -2 9.31321e-008 0.75 -1 9.31321e-008 0.75 -5 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -3 0.5 0.75 -2 9.31321e-008 0.75 -6 0 0.5 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -6 0 0.5 -5 0 0.5 -4 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -11 0.5 1 -3 0.5 0.75 -0 0.5 0.75 -8 0.5 1 -SURF 0x0 -mat 4 -refs 4 -2 0 0.75 -10 9.31321e-008 1 -9 9.31321e-008 1 -1 0 0.75 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.75 -11 0.5 1 -10 9.31321e-008 1 -2 0 0.75 -SURF 0x0 -mat 4 -refs 4 -11 0.5 1 -8 0.5 1 -9 9.31321e-008 1 -10 9.31321e-008 1 -kids 0 -OBJECT poly name "YellowEngPump1" loc 0.000113685 -5.00064e-005 -4.99785e-005 data 8 diff --git a/Models/Instruments/OHpanel/res/ohpanelEPR.ac b/Models/Instruments/OHpanel/res/ohpanelEPR.ac new file mode 100644 index 00000000..89e71042 --- /dev/null +++ b/Models/Instruments/OHpanel/res/ohpanelEPR.ac @@ -0,0 +1,182 @@ +AC3Db +MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0 +MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 +OBJECT world +kids 3 +OBJECT poly +name "Eng1N1Btn" +loc 0.000113685 -5.00064e-005 -4.99785e-005 +data 8 +Cube.092 +texture "buttons.png" +crease 30.000000 +numvert 12 +0.003771 -0.2157 -0.275044 +0.00129 -0.2157 -0.255198 +0.004267 -0.2157 -0.254826 +0.006747 -0.2157 -0.274672 +0.003771 -0.2257 -0.275044 +0.00129 -0.2257 -0.255198 +0.004267 -0.2257 -0.254826 +0.006747 -0.2257 -0.274672 +0.003771 -0.2057 -0.275044 +0.00129 -0.2057 -0.255198 +0.004267 -0.2057 -0.254826 +0.006747 -0.2057 -0.274672 +numsurf 8 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 0 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +SURF 0x0 +mat 0 +refs 4 +11 0.5 1 +3 0.5 0.75 +0 0.5 0.75 +8 0.5 1 +SURF 0x0 +mat 0 +refs 4 +2 0 0.75 +10 9.31321e-008 1 +9 9.31321e-008 1 +1 0 0.75 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +11 0.5 1 +10 9.31321e-008 1 +2 0 0.75 +SURF 0x0 +mat 0 +refs 4 +11 0.5 1 +8 0.5 1 +9 9.31321e-008 1 +10 9.31321e-008 1 +kids 0 +OBJECT poly +name "Eng2N1Btn" +loc 0.000113685 -5.00064e-005 -4.99785e-005 +data 8 +Cube.093 +texture "buttons.png" +crease 30.000000 +numvert 12 +0.007727 -0.2157 -0.306697 +0.005247 -0.2157 -0.286852 +0.008223 -0.2157 -0.28648 +0.010704 -0.2157 -0.306325 +0.007727 -0.2257 -0.306697 +0.005247 -0.2257 -0.286852 +0.008223 -0.2257 -0.28648 +0.010704 -0.2257 -0.306325 +0.007727 -0.2057 -0.306697 +0.005247 -0.2057 -0.286852 +0.008223 -0.2057 -0.28648 +0.010704 -0.2057 -0.306325 +numsurf 8 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 0 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 0 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +SURF 0x0 +mat 0 +refs 4 +11 0.5 1 +3 0.5 0.75 +0 0.5 0.75 +8 0.5 1 +SURF 0x0 +mat 0 +refs 4 +2 0 0.75 +10 9.31321e-008 1 +9 9.31321e-008 1 +1 0 0.75 +SURF 0x0 +mat 0 +refs 4 +3 0.5 0.75 +11 0.5 1 +10 9.31321e-008 1 +2 0 0.75 +SURF 0x0 +mat 0 +refs 4 +11 0.5 1 +8 0.5 1 +9 9.31321e-008 1 +10 9.31321e-008 1 +kids 0 +OBJECT poly +name "MarkingLts" +loc 0.00126776 -5.00064e-005 -5.00083e-005 +data 9 +Plane.007 +texture "markingsEPR.png" +crease 30.000000 +numvert 4 +0.000105106 -0.233886 -0.244919 +0.00844791 -0.233886 -0.311661 +0.000105106 -0.18353 -0.244919 +0.00844791 -0.18353 -0.311661 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +1 0.950441 0.140174 +3 0.950441 0.217645 +2 0.850769 0.217645 +0 0.850769 0.140175 +kids 0 diff --git a/Models/Liveries/A318/CFM/Suprise.xml b/Models/Liveries/A318/CFM/Suprise.xml index 1f5db6d2..0321cc40 100644 --- a/Models/Liveries/A318/CFM/Suprise.xml +++ b/Models/Liveries/A318/CFM/Suprise.xml @@ -12,4 +12,10 @@ + + + 0 + 0 + + diff --git a/Models/Liveries/A318/CFM/White.xml b/Models/Liveries/A318/CFM/White.xml index a15e1931..1ed0a367 100644 --- a/Models/Liveries/A318/CFM/White.xml +++ b/Models/Liveries/A318/CFM/White.xml @@ -12,4 +12,10 @@ + + + 0 + 0 + + diff --git a/Splash/a318-1.png b/Splash/a318-1.png new file mode 100644 index 00000000..49092c9b Binary files /dev/null and b/Splash/a318-1.png differ diff --git a/Splash/a318-2.png b/Splash/a318-2.png new file mode 100644 index 00000000..2ccb3803 Binary files /dev/null and b/Splash/a318-2.png differ diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml index 5a02ed55..8637d48f 100644 --- a/Systems/it-fbw-b.xml +++ b/Systems/it-fbw-b.xml @@ -398,8 +398,8 @@ 0 5 0.002 - -0.5 - 0.5 + -1 + 1