From df86bbb8604ef2b954cc9dc0f4ab85335f8e8773 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Mon, 23 Oct 2017 16:05:09 -0400 Subject: [PATCH] A32X: New VC Various improvements and fixes --- Models/FlightDeck/a320.flightdeck.xml | 304 +++++-- Models/FlightDeck/res/fd_complete.ac | 914 +++++++++++---------- Models/Instruments/OHpanel.new/OHpanel.xml | 77 +- Models/Instruments/OHpanel/OHpanel.xml | 36 +- Models/Instruments/OHpanel/OHpanelEPR.xml | 36 +- Models/Instruments/OHpanel/SteepAppr.xml | 36 +- Nasal/efis.nas | 91 ++ 7 files changed, 789 insertions(+), 705 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index de9d3564..b91aa368 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -231,7 +231,7 @@ PFD1 Mismatch1 modes/cpt-du-xfr - 0.18845 + 0.20062 0 1 @@ -296,7 +296,7 @@ PFD2 Mismatch2 modes/fo-du-xfr - -0.19505 + -0.20062 0 1 @@ -340,7 +340,7 @@ translate ND1 modes/cpt-du-xfr - -0.18845 + -0.20062 0 1 @@ -383,7 +383,7 @@ translate ND2 modes/fo-du-xfr - 0.19505 + 0.20062 0 1 @@ -656,7 +656,7 @@ } else { systems.arm_autobrake(0); } - setprop("/sim/sounde/btn1", 1); + setprop("/sim/sounde/oh-btn", 1); @@ -689,7 +689,7 @@ } else { systems.arm_autobrake(0); } - setprop("/sim/sounde/btn1", 1); + setprop("/sim/sounde/oh-btn", 1); @@ -722,12 +722,62 @@ } else { systems.arm_autobrake(0); } - setprop("/sim/sounde/btn1", 1); + setprop("/sim/sounde/oh-btn", 1); + + + pick + pfd_nd_xfr_sw + + + + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + property-toggle + modes/cpt-du-xfr + + + + + + + pick + pfd_nd_xfr_sw2 + + + + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + property-toggle + modes/fo-du-xfr + + + + pick @@ -1314,18 +1364,6 @@ true - - - - systems/electrical/bus/dc1 - 25 - - - systems/electrical/bus/dc2 - 25 - - - property-cycle modes/altimeter/inhg 0 @@ -1376,7 +1414,7 @@ 1-3 - qnh_cpt_sw.axis + qnh_fo_sw.axis @@ -1831,8 +1869,15 @@ - property-toggle - instrumentation/efis/inputs/CSTR + nasal + @@ -1872,8 +1917,15 @@ - property-toggle - instrumentation/efis[1]/inputs/CSTR + nasal + @@ -1913,8 +1965,15 @@ - property-toggle - instrumentation/efis/inputs/wpt + nasal + @@ -1954,8 +2013,15 @@ - property-toggle - instrumentation/efis[1]/inputs/wpt + nasal + @@ -1995,24 +2061,15 @@ - property-toggle - instrumentation/efis/inputs/VORD - - - - - - systems/electrical/bus/dc1 - 25 - - - systems/electrical/bus/dc2 - 25 - - - - property-toggle - instrumentation/efis/inputs/DME + nasal + @@ -2052,24 +2109,15 @@ - property-toggle - instrumentation/efis[1]/inputs/VORD - - - - - - systems/electrical/bus/dc1 - 25 - - - systems/electrical/bus/dc2 - 25 - - - - property-toggle - instrumentation/efis[1]/inputs/DME + nasal + @@ -2109,8 +2157,15 @@ - property-toggle - instrumentation/efis/inputs/NDB + nasal + @@ -2150,8 +2205,15 @@ - property-toggle - instrumentation/efis[1]/inputs/NDB + nasal + @@ -2191,8 +2253,15 @@ - property-toggle - instrumentation/efis/inputs/arpt + nasal + @@ -2232,8 +2301,15 @@ - property-toggle - instrumentation/efis[1]/inputs/arpt + nasal + @@ -2429,6 +2505,24 @@ -1 + + + false + + property-cycle + instrumentation/efis/input/vor-adf-1 + 2 + 1 + 0 + + + property-cycle + instrumentation/efis/input/lh-vor-adf + -1 + 1 + 0 + + rotate @@ -2465,6 +2559,24 @@ -1 + + + false + + property-cycle + instrumentation/efis[1]/input/vor-adf-1 + 2 + 1 + 0 + + + property-cycle + instrumentation/efis[1]/input/lh-vor-adf + -1 + 1 + 0 + + rotate @@ -2501,6 +2613,24 @@ -1 + + + false + + property-cycle + instrumentation/efis/input/vor-adf-2 + 2 + 1 + 0 + + + property-cycle + instrumentation/efis/input/rh-vor-adf + -1 + 1 + 0 + + rotate @@ -2537,6 +2667,24 @@ -1 + + + false + + property-cycle + instrumentation/efis[1]/input/vor-adf-2 + 2 + 1 + 0 + + + property-cycle + instrumentation/efis[1]/input/rh-vor-adf + -1 + 1 + 0 + + rotate @@ -2922,7 +3070,7 @@ center-center xy-plane number-value - %1.2f + %0.3f it-autoflight/input/spd-mach false led.txf @@ -2948,7 +3096,7 @@ center-center xy-plane text-value - 888 + .888 autopilot/serviceable false led.txf @@ -4302,8 +4450,8 @@ eng_mode_mark 1 - 1 - 1 + 0.725 + 0.259 controls/lighting/main-panel-norm @@ -4319,8 +4467,8 @@ nd_range_fo_mark 1 - 1 - 1 + 0.725 + 0.259 controls/lighting/fcu-panel-norm diff --git a/Models/FlightDeck/res/fd_complete.ac b/Models/FlightDeck/res/fd_complete.ac index d6219166..5ddb352a 100644 --- a/Models/FlightDeck/res/fd_complete.ac +++ b/Models/FlightDeck/res/fd_complete.ac @@ -37,7 +37,7 @@ MATERIAL "trim" rgb 1 1 1 amb 1 1 1 emis 0.1 0.1 0.1 spec 0.2 0.2 0.2 shi 13 MATERIAL "visor_glass" rgb 0.029 0.029 0.029 amb 0.588 0.588 0.588 emis 0 0 0 spec 1 1 1 shi 12 trans 0.069 MATERIAL "ac3dmat1.015" rgb 1 1 1 amb 0.7464 0.7464 0.7464 emis 1 0.7765 0.6588 spec 1 1 0.9843 shi 5 trans 0 OBJECT world -kids 343 +kids 344 OBJECT poly name "abs_low" data 12 @@ -46944,6 +46944,7 @@ data 5 DoorC texture "doors.png" crease 40.000000 +hidden numvert 8 1.5459 1.57709 0.48612 1.5459 -0.50093 0.48612 @@ -212982,56 +212983,385 @@ data 13 pfd_nd_xfr_sw texture "glare_sw.png" crease 40.000000 -numvert 98 --0.57079 0.26598 0.7132 --0.56738 0.26698 0.7132 --0.5707 0.26566 0.71152 --0.56728 0.26666 0.71152 --0.57043 0.26475 0.7101 --0.56701 0.26575 0.7101 --0.57003 0.26338 0.70915 --0.56661 0.26439 0.70915 --0.56956 0.26178 0.70882 --0.56614 0.26278 0.70882 --0.56908 0.26017 0.70915 --0.56567 0.26117 0.70915 --0.56868 0.2588 0.7101 --0.56527 0.25981 0.7101 --0.56841 0.25789 0.71152 --0.565 0.2589 0.71152 --0.56832 0.25757 0.7132 --0.5649 0.25858 0.7132 --0.56841 0.25789 0.71487 --0.565 0.2589 0.71487 --0.56868 0.2588 0.7163 --0.56527 0.25981 0.7163 --0.56908 0.26017 0.71725 --0.56567 0.26117 0.71725 --0.56956 0.26178 0.71758 --0.56614 0.26278 0.71758 --0.57003 0.26338 0.71725 --0.56661 0.26439 0.71725 --0.57043 0.26475 0.7163 --0.56701 0.26575 0.7163 --0.5707 0.26566 0.71487 --0.56728 0.26666 0.71487 --0.56671 0.26668 0.7132 --0.56662 0.26639 0.71171 --0.56638 0.26558 0.71044 --0.56603 0.26437 0.7096 --0.56561 0.26294 0.7093 --0.56519 0.26151 0.7096 --0.56483 0.26029 0.71044 --0.56459 0.25948 0.71171 --0.56451 0.2592 0.7132 --0.56459 0.25948 0.71469 --0.56483 0.26029 0.71596 --0.56519 0.26151 0.7168 --0.56561 0.26294 0.7171 --0.56603 0.26437 0.7168 --0.56638 0.26558 0.71596 --0.56662 0.26639 0.71469 +numvert 49 -0.56561 0.26294 0.7132 +-0.56662 0.26639 0.71469 +-0.56638 0.26558 0.71596 +-0.56603 0.26437 0.7168 +-0.56561 0.26294 0.7171 +-0.56519 0.26151 0.7168 +-0.56483 0.26029 0.71596 +-0.56459 0.25948 0.71469 +-0.56451 0.2592 0.7132 +-0.56459 0.25948 0.71171 +-0.56483 0.26029 0.71044 +-0.56519 0.26151 0.7096 +-0.56561 0.26294 0.7093 +-0.56603 0.26437 0.7096 +-0.56638 0.26558 0.71044 +-0.56662 0.26639 0.71171 +-0.56671 0.26668 0.7132 +-0.56728 0.26666 0.71487 +-0.5707 0.26566 0.71487 +-0.56701 0.26575 0.7163 +-0.57043 0.26475 0.7163 +-0.56661 0.26439 0.71725 +-0.57003 0.26338 0.71725 +-0.56614 0.26278 0.71758 +-0.56956 0.26178 0.71758 +-0.56567 0.26117 0.71725 +-0.56908 0.26017 0.71725 +-0.56527 0.25981 0.7163 +-0.56868 0.2588 0.7163 +-0.565 0.2589 0.71487 +-0.56841 0.25789 0.71487 +-0.5649 0.25858 0.7132 +-0.56832 0.25757 0.7132 +-0.565 0.2589 0.71152 +-0.56841 0.25789 0.71152 +-0.56527 0.25981 0.7101 +-0.56868 0.2588 0.7101 +-0.56567 0.26117 0.70915 +-0.56908 0.26017 0.70915 +-0.56614 0.26278 0.70882 +-0.56956 0.26178 0.70882 +-0.56661 0.26439 0.70915 +-0.57003 0.26338 0.70915 +-0.56701 0.26575 0.7101 +-0.57043 0.26475 0.7101 +-0.56728 0.26666 0.71152 +-0.5707 0.26566 0.71152 +-0.56738 0.26698 0.7132 +-0.57079 0.26598 0.7132 +numsurf 48 +SURF 0x10 +mat 9 +refs 3 +1 0.964467 0.660229 +2 0.960884 0.658892 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +8 0.963427 0.641014 +9 0.967245 0.640701 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +15 0.97179 0.658371 +16 0.968292 0.659951 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +16 0.968292 0.659951 +1 0.964467 0.660229 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +7 0.959932 0.642581 +8 0.963427 0.641014 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +14 0.974318 0.65548 +15 0.97179 0.658371 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +6 0.957417 0.645486 +7 0.959932 0.642581 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +13 0.975646 0.65186 +14 0.974318 0.65548 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +5 0.956101 0.649078 +6 0.957417 0.645486 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +12 0.975387 0.648018 +13 0.975646 0.65186 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +4 0.956286 0.652924 +5 0.956101 0.649078 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +11 0.973718 0.644563 +12 0.975387 0.648018 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +3 0.958008 0.656367 +4 0.956286 0.652924 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +10 0.970847 0.642041 +11 0.973718 0.644563 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +2 0.960884 0.658892 +3 0.958008 0.656367 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 3 +9 0.967245 0.640701 +10 0.970847 0.642041 +0 0.96586 0.650473 +SURF 0x10 +mat 9 +refs 4 +23 0.954379 0.653426 +25 0.954108 0.648771 +5 0.956101 0.649078 +4 0.956286 0.652924 +SURF 0x10 +mat 9 +refs 4 +47 0.968771 0.661837 +17 0.964142 0.66221 +1 0.964467 0.660229 +16 0.968292 0.659951 +SURF 0x10 +mat 9 +refs 4 +37 0.975319 0.643345 +39 0.977259 0.647522 +12 0.975387 0.648018 +11 0.973718 0.644563 +SURF 0x10 +mat 9 +refs 4 +41 0.977638 0.652106 +43 0.976006 0.656434 +14 0.974318 0.65548 +13 0.975646 0.65186 +SURF 0x10 +mat 9 +refs 4 +29 0.958748 0.640987 +31 0.962947 0.639148 +8 0.963427 0.641014 +7 0.959932 0.642581 +SURF 0x10 +mat 9 +refs 4 +33 0.967516 0.638731 +35 0.971802 0.640364 +10 0.970847 0.642041 +9 0.967245 0.640701 +SURF 0x10 +mat 9 +refs 4 +21 0.956435 0.657537 +23 0.954379 0.653426 +4 0.956286 0.652924 +3 0.958008 0.656367 +SURF 0x10 +mat 9 +refs 4 +25 0.954108 0.648771 +27 0.955776 0.644473 +6 0.957417 0.645486 +5 0.956101 0.649078 +SURF 0x10 +mat 9 +refs 4 +17 0.964142 0.66221 +19 0.959862 0.660522 +2 0.960884 0.658892 +1 0.964467 0.660229 +SURF 0x10 +mat 9 +refs 4 +43 0.976006 0.656434 +45 0.97302 0.659961 +15 0.97179 0.658371 +14 0.974318 0.65548 +SURF 0x10 +mat 9 +refs 4 +35 0.971802 0.640364 +37 0.975319 0.643345 +11 0.973718 0.644563 +10 0.970847 0.642041 +SURF 0x10 +mat 9 +refs 4 +39 0.977259 0.647522 +41 0.977638 0.652106 +13 0.975646 0.65186 +12 0.975387 0.648018 +SURF 0x10 +mat 9 +refs 4 +27 0.955776 0.644473 +29 0.958748 0.640987 +7 0.959932 0.642581 +6 0.957417 0.645486 +SURF 0x10 +mat 9 +refs 4 +31 0.962947 0.639148 +33 0.967516 0.638731 +9 0.967245 0.640701 +8 0.963427 0.641014 +SURF 0x10 +mat 9 +refs 4 +19 0.959862 0.660522 +21 0.956435 0.657537 +3 0.958008 0.656367 +2 0.960884 0.658892 +SURF 0x10 +mat 9 +refs 4 +20 0.956028 0.666873 +19 0.959862 0.660522 +17 0.964142 0.66221 +18 0.963245 0.668866 +SURF 0x10 +mat 9 +refs 4 +18 0.963245 0.668866 +17 0.964142 0.66221 +47 0.968771 0.661837 +48 0.970625 0.668898 +SURF 0x10 +mat 9 +refs 4 +45 0.97302 0.659961 +47 0.968771 0.661837 +16 0.968292 0.659951 +15 0.97179 0.658371 +SURF 0x10 +mat 9 +refs 4 +22 0.950809 0.661428 +21 0.956435 0.657537 +19 0.959862 0.660522 +20 0.956028 0.666873 +SURF 0x10 +mat 9 +refs 4 +24 0.948219 0.654731 +23 0.954379 0.653426 +21 0.956435 0.657537 +22 0.950809 0.661428 +SURF 0x10 +mat 9 +refs 4 +26 0.948325 0.647878 +25 0.954108 0.648771 +23 0.954379 0.653426 +24 0.948219 0.654731 +SURF 0x10 +mat 9 +refs 4 +28 0.950205 0.641153 +27 0.955776 0.644473 +25 0.954108 0.648771 +26 0.948325 0.647878 +SURF 0x10 +mat 9 +refs 4 +30 0.955182 0.636208 +29 0.958748 0.640987 +27 0.955776 0.644473 +28 0.950205 0.641153 +SURF 0x10 +mat 9 +refs 4 +32 0.961335 0.632688 +31 0.962947 0.639148 +29 0.958748 0.640987 +30 0.955182 0.636208 +SURF 0x10 +mat 9 +refs 4 +34 0.968443 0.632688 +33 0.967516 0.638731 +31 0.962947 0.639148 +32 0.961335 0.632688 +SURF 0x10 +mat 9 +refs 4 +36 0.975351 0.63455 +35 0.971802 0.640364 +33 0.967516 0.638731 +34 0.968443 0.632688 +SURF 0x10 +mat 9 +refs 4 +38 0.980421 0.639613 +37 0.975319 0.643345 +35 0.971802 0.640364 +36 0.975351 0.63455 +SURF 0x10 +mat 9 +refs 4 +40 0.984029 0.64585 +39 0.977259 0.647522 +37 0.975319 0.643345 +38 0.980421 0.639613 +SURF 0x10 +mat 9 +refs 4 +42 0.984037 0.65307 +41 0.977638 0.652106 +39 0.977259 0.647522 +40 0.984029 0.64585 +SURF 0x10 +mat 9 +refs 4 +44 0.982154 0.660089 +43 0.976006 0.656434 +41 0.977638 0.652106 +42 0.984037 0.65307 +SURF 0x10 +mat 9 +refs 4 +46 0.977001 0.665237 +45 0.97302 0.659961 +43 0.976006 0.656434 +44 0.982154 0.660089 +SURF 0x10 +mat 9 +refs 4 +48 0.970625 0.668898 +47 0.968771 0.661837 +45 0.97302 0.659961 +46 0.977001 0.665237 +kids 0 +OBJECT poly +name "pfd_nd_xfr_sw2" +data 13 +pfd_nd_xfr_sw +texture "glare_sw.png" +crease 40.000000 +numvert 49 -0.57079 0.26598 -0.7132 -0.56738 0.26698 -0.7132 -0.5707 0.26566 -0.71152 @@ -213081,647 +213411,327 @@ numvert 98 -0.56638 0.26558 -0.71596 -0.56662 0.26639 -0.71469 -0.56561 0.26294 -0.7132 -numsurf 96 +numsurf 48 SURF 0x10 mat 9 refs 4 0 0.970625 0.668898 +2 0.977001 0.665237 +3 0.97302 0.659961 1 0.968771 0.661837 -3 0.97302 0.659961 -2 0.977001 0.665237 SURF 0x10 mat 9 refs 4 2 0.977001 0.665237 +4 0.982154 0.660089 +5 0.976006 0.656434 3 0.97302 0.659961 -5 0.976006 0.656434 -4 0.982154 0.660089 SURF 0x10 mat 9 refs 4 4 0.982154 0.660089 +6 0.984037 0.65307 +7 0.977638 0.652106 5 0.976006 0.656434 -7 0.977638 0.652106 -6 0.984037 0.65307 SURF 0x10 mat 9 refs 4 6 0.984037 0.65307 +8 0.984029 0.64585 +9 0.977259 0.647522 7 0.977638 0.652106 -9 0.977259 0.647522 -8 0.984029 0.64585 SURF 0x10 mat 9 refs 4 8 0.984029 0.64585 +10 0.980421 0.639613 +11 0.975319 0.643345 9 0.977259 0.647522 -11 0.975319 0.643345 -10 0.980421 0.639613 SURF 0x10 mat 9 refs 4 10 0.980421 0.639613 +12 0.975351 0.63455 +13 0.971802 0.640364 11 0.975319 0.643345 -13 0.971802 0.640364 -12 0.975351 0.63455 SURF 0x10 mat 9 refs 4 12 0.975351 0.63455 +14 0.968443 0.632688 +15 0.967516 0.638731 13 0.971802 0.640364 -15 0.967516 0.638731 -14 0.968443 0.632688 SURF 0x10 mat 9 refs 4 14 0.968443 0.632688 +16 0.961335 0.632688 +17 0.962947 0.639148 15 0.967516 0.638731 -17 0.962947 0.639148 -16 0.961335 0.632688 SURF 0x10 mat 9 refs 4 16 0.961335 0.632688 +18 0.955182 0.636208 +19 0.958748 0.640987 17 0.962947 0.639148 -19 0.958748 0.640987 -18 0.955182 0.636208 SURF 0x10 mat 9 refs 4 18 0.955182 0.636208 +20 0.950205 0.641153 +21 0.955776 0.644473 19 0.958748 0.640987 -21 0.955776 0.644473 -20 0.950205 0.641153 SURF 0x10 mat 9 refs 4 20 0.950205 0.641153 +22 0.948325 0.647878 +23 0.954108 0.648771 21 0.955776 0.644473 -23 0.954108 0.648771 -22 0.948325 0.647878 SURF 0x10 mat 9 refs 4 22 0.948325 0.647878 +24 0.948219 0.654731 +25 0.954379 0.653426 23 0.954108 0.648771 -25 0.954379 0.653426 -24 0.948219 0.654731 SURF 0x10 mat 9 refs 4 24 0.948219 0.654731 -25 0.954379 0.653426 -27 0.956435 0.657537 26 0.950809 0.661428 +27 0.956435 0.657537 +25 0.954379 0.653426 SURF 0x10 mat 9 refs 4 26 0.950809 0.661428 -27 0.956435 0.657537 -29 0.959862 0.660522 28 0.956028 0.666873 +29 0.959862 0.660522 +27 0.956435 0.657537 SURF 0x10 mat 9 refs 4 3 0.97302 0.659961 -1 0.968771 0.661837 -32 0.968292 0.659951 33 0.97179 0.658371 +32 0.968292 0.659951 +1 0.968771 0.661837 SURF 0x10 mat 9 refs 4 30 0.963245 0.668866 -31 0.964142 0.66221 -1 0.968771 0.661837 0 0.970625 0.668898 +1 0.968771 0.661837 +31 0.964142 0.66221 SURF 0x10 mat 9 refs 4 28 0.956028 0.666873 -29 0.959862 0.660522 -31 0.964142 0.66221 30 0.963245 0.668866 +31 0.964142 0.66221 +29 0.959862 0.660522 SURF 0x10 mat 9 refs 4 29 0.959862 0.660522 -27 0.956435 0.657537 -45 0.958008 0.656367 46 0.960884 0.658892 +45 0.958008 0.656367 +27 0.956435 0.657537 SURF 0x10 mat 9 refs 4 17 0.962947 0.639148 -15 0.967516 0.638731 -39 0.967245 0.640701 40 0.963427 0.641014 +39 0.967245 0.640701 +15 0.967516 0.638731 SURF 0x10 mat 9 refs 4 21 0.955776 0.644473 -19 0.958748 0.640987 -41 0.959932 0.642581 42 0.957417 0.645486 +41 0.959932 0.642581 +19 0.958748 0.640987 SURF 0x10 mat 9 refs 4 9 0.977259 0.647522 -7 0.977638 0.652106 -35 0.975646 0.65186 36 0.975387 0.648018 +35 0.975646 0.65186 +7 0.977638 0.652106 SURF 0x10 mat 9 refs 4 13 0.971802 0.640364 -11 0.975319 0.643345 -37 0.973718 0.644563 38 0.970847 0.642041 +37 0.973718 0.644563 +11 0.975319 0.643345 SURF 0x10 mat 9 refs 4 5 0.976006 0.656434 -3 0.97302 0.659961 -33 0.97179 0.658371 34 0.974318 0.65548 +33 0.97179 0.658371 +3 0.97302 0.659961 SURF 0x10 mat 9 refs 4 31 0.964142 0.66221 -29 0.959862 0.660522 -46 0.960884 0.658892 47 0.964467 0.660229 +46 0.960884 0.658892 +29 0.959862 0.660522 SURF 0x10 mat 9 refs 4 23 0.954108 0.648771 -21 0.955776 0.644473 -42 0.957417 0.645486 43 0.956101 0.649078 +42 0.957417 0.645486 +21 0.955776 0.644473 SURF 0x10 mat 9 refs 4 27 0.956435 0.657537 -25 0.954379 0.653426 -44 0.956286 0.652924 45 0.958008 0.656367 +44 0.956286 0.652924 +25 0.954379 0.653426 SURF 0x10 mat 9 refs 4 15 0.967516 0.638731 -13 0.971802 0.640364 -38 0.970847 0.642041 39 0.967245 0.640701 +38 0.970847 0.642041 +13 0.971802 0.640364 SURF 0x10 mat 9 refs 4 19 0.958748 0.640987 -17 0.962947 0.639148 -40 0.963427 0.641014 41 0.959932 0.642581 +40 0.963427 0.641014 +17 0.962947 0.639148 SURF 0x10 mat 9 refs 4 7 0.977638 0.652106 -5 0.976006 0.656434 -34 0.974318 0.65548 35 0.975646 0.65186 +34 0.974318 0.65548 +5 0.976006 0.656434 SURF 0x10 mat 9 refs 4 11 0.975319 0.643345 -9 0.977259 0.647522 -36 0.975387 0.648018 37 0.973718 0.644563 +36 0.975387 0.648018 +9 0.977259 0.647522 SURF 0x10 mat 9 refs 4 1 0.968771 0.661837 -31 0.964142 0.66221 -47 0.964467 0.660229 32 0.968292 0.659951 +47 0.964467 0.660229 +31 0.964142 0.66221 SURF 0x10 mat 9 refs 4 25 0.954379 0.653426 +44 0.956286 0.652924 +43 0.956101 0.649078 23 0.954108 0.648771 -43 0.956101 0.649078 -44 0.956286 0.652924 SURF 0x10 mat 9 refs 3 39 0.967245 0.640701 -38 0.970847 0.642041 48 0.96586 0.650473 +38 0.970847 0.642041 SURF 0x10 mat 9 refs 3 46 0.960884 0.658892 -45 0.958008 0.656367 48 0.96586 0.650473 +45 0.958008 0.656367 SURF 0x10 mat 9 refs 3 38 0.970847 0.642041 -37 0.973718 0.644563 48 0.96586 0.650473 +37 0.973718 0.644563 SURF 0x10 mat 9 refs 3 45 0.958008 0.656367 -44 0.956286 0.652924 48 0.96586 0.650473 +44 0.956286 0.652924 SURF 0x10 mat 9 refs 3 37 0.973718 0.644563 -36 0.975387 0.648018 48 0.96586 0.650473 +36 0.975387 0.648018 SURF 0x10 mat 9 refs 3 44 0.956286 0.652924 -43 0.956101 0.649078 48 0.96586 0.650473 +43 0.956101 0.649078 SURF 0x10 mat 9 refs 3 36 0.975387 0.648018 -35 0.975646 0.65186 48 0.96586 0.650473 +35 0.975646 0.65186 SURF 0x10 mat 9 refs 3 43 0.956101 0.649078 -42 0.957417 0.645486 48 0.96586 0.650473 +42 0.957417 0.645486 SURF 0x10 mat 9 refs 3 35 0.975646 0.65186 -34 0.974318 0.65548 48 0.96586 0.650473 +34 0.974318 0.65548 SURF 0x10 mat 9 refs 3 42 0.957417 0.645486 -41 0.959932 0.642581 48 0.96586 0.650473 +41 0.959932 0.642581 SURF 0x10 mat 9 refs 3 34 0.974318 0.65548 -33 0.97179 0.658371 48 0.96586 0.650473 +33 0.97179 0.658371 SURF 0x10 mat 9 refs 3 41 0.959932 0.642581 -40 0.963427 0.641014 48 0.96586 0.650473 +40 0.963427 0.641014 SURF 0x10 mat 9 refs 3 32 0.968292 0.659951 -47 0.964467 0.660229 48 0.96586 0.650473 +47 0.964467 0.660229 SURF 0x10 mat 9 refs 3 33 0.97179 0.658371 -32 0.968292 0.659951 48 0.96586 0.650473 +32 0.968292 0.659951 SURF 0x10 mat 9 refs 3 40 0.963427 0.641014 +48 0.96586 0.650473 39 0.967245 0.640701 -48 0.96586 0.650473 SURF 0x10 mat 9 refs 3 47 0.964467 0.660229 -46 0.960884 0.658892 48 0.96586 0.650473 -SURF 0x10 -mat 9 -refs 4 -49 0.970625 0.668898 -51 0.977001 0.665237 -52 0.97302 0.659961 -50 0.968771 0.661837 -SURF 0x10 -mat 9 -refs 4 -51 0.977001 0.665237 -53 0.982154 0.660089 -54 0.976006 0.656434 -52 0.97302 0.659961 -SURF 0x10 -mat 9 -refs 4 -53 0.982154 0.660089 -55 0.984037 0.65307 -56 0.977638 0.652106 -54 0.976006 0.656434 -SURF 0x10 -mat 9 -refs 4 -55 0.984037 0.65307 -57 0.984029 0.64585 -58 0.977259 0.647522 -56 0.977638 0.652106 -SURF 0x10 -mat 9 -refs 4 -57 0.984029 0.64585 -59 0.980421 0.639613 -60 0.975319 0.643345 -58 0.977259 0.647522 -SURF 0x10 -mat 9 -refs 4 -59 0.980421 0.639613 -61 0.975351 0.63455 -62 0.971802 0.640364 -60 0.975319 0.643345 -SURF 0x10 -mat 9 -refs 4 -61 0.975351 0.63455 -63 0.968443 0.632688 -64 0.967516 0.638731 -62 0.971802 0.640364 -SURF 0x10 -mat 9 -refs 4 -63 0.968443 0.632688 -65 0.961335 0.632688 -66 0.962947 0.639148 -64 0.967516 0.638731 -SURF 0x10 -mat 9 -refs 4 -65 0.961335 0.632688 -67 0.955182 0.636208 -68 0.958748 0.640987 -66 0.962947 0.639148 -SURF 0x10 -mat 9 -refs 4 -67 0.955182 0.636208 -69 0.950205 0.641153 -70 0.955776 0.644473 -68 0.958748 0.640987 -SURF 0x10 -mat 9 -refs 4 -69 0.950205 0.641153 -71 0.948325 0.647878 -72 0.954108 0.648771 -70 0.955776 0.644473 -SURF 0x10 -mat 9 -refs 4 -71 0.948325 0.647878 -73 0.948219 0.654731 -74 0.954379 0.653426 -72 0.954108 0.648771 -SURF 0x10 -mat 9 -refs 4 -73 0.948219 0.654731 -75 0.950809 0.661428 -76 0.956435 0.657537 -74 0.954379 0.653426 -SURF 0x10 -mat 9 -refs 4 -75 0.950809 0.661428 -77 0.956028 0.666873 -78 0.959862 0.660522 -76 0.956435 0.657537 -SURF 0x10 -mat 9 -refs 4 -52 0.97302 0.659961 -82 0.97179 0.658371 -81 0.968292 0.659951 -50 0.968771 0.661837 -SURF 0x10 -mat 9 -refs 4 -79 0.963245 0.668866 -49 0.970625 0.668898 -50 0.968771 0.661837 -80 0.964142 0.66221 -SURF 0x10 -mat 9 -refs 4 -77 0.956028 0.666873 -79 0.963245 0.668866 -80 0.964142 0.66221 -78 0.959862 0.660522 -SURF 0x10 -mat 9 -refs 4 -78 0.959862 0.660522 -95 0.960884 0.658892 -94 0.958008 0.656367 -76 0.956435 0.657537 -SURF 0x10 -mat 9 -refs 4 -66 0.962947 0.639148 -89 0.963427 0.641014 -88 0.967245 0.640701 -64 0.967516 0.638731 -SURF 0x10 -mat 9 -refs 4 -70 0.955776 0.644473 -91 0.957417 0.645486 -90 0.959932 0.642581 -68 0.958748 0.640987 -SURF 0x10 -mat 9 -refs 4 -58 0.977259 0.647522 -85 0.975387 0.648018 -84 0.975646 0.65186 -56 0.977638 0.652106 -SURF 0x10 -mat 9 -refs 4 -62 0.971802 0.640364 -87 0.970847 0.642041 -86 0.973718 0.644563 -60 0.975319 0.643345 -SURF 0x10 -mat 9 -refs 4 -54 0.976006 0.656434 -83 0.974318 0.65548 -82 0.97179 0.658371 -52 0.97302 0.659961 -SURF 0x10 -mat 9 -refs 4 -80 0.964142 0.66221 -96 0.964467 0.660229 -95 0.960884 0.658892 -78 0.959862 0.660522 -SURF 0x10 -mat 9 -refs 4 -72 0.954108 0.648771 -92 0.956101 0.649078 -91 0.957417 0.645486 -70 0.955776 0.644473 -SURF 0x10 -mat 9 -refs 4 -76 0.956435 0.657537 -94 0.958008 0.656367 -93 0.956286 0.652924 -74 0.954379 0.653426 -SURF 0x10 -mat 9 -refs 4 -64 0.967516 0.638731 -88 0.967245 0.640701 -87 0.970847 0.642041 -62 0.971802 0.640364 -SURF 0x10 -mat 9 -refs 4 -68 0.958748 0.640987 -90 0.959932 0.642581 -89 0.963427 0.641014 -66 0.962947 0.639148 -SURF 0x10 -mat 9 -refs 4 -56 0.977638 0.652106 -84 0.975646 0.65186 -83 0.974318 0.65548 -54 0.976006 0.656434 -SURF 0x10 -mat 9 -refs 4 -60 0.975319 0.643345 -86 0.973718 0.644563 -85 0.975387 0.648018 -58 0.977259 0.647522 -SURF 0x10 -mat 9 -refs 4 -50 0.968771 0.661837 -81 0.968292 0.659951 -96 0.964467 0.660229 -80 0.964142 0.66221 -SURF 0x10 -mat 9 -refs 4 -74 0.954379 0.653426 -93 0.956286 0.652924 -92 0.956101 0.649078 -72 0.954108 0.648771 -SURF 0x10 -mat 9 -refs 3 -88 0.967245 0.640701 -97 0.96586 0.650473 -87 0.970847 0.642041 -SURF 0x10 -mat 9 -refs 3 -95 0.960884 0.658892 -97 0.96586 0.650473 -94 0.958008 0.656367 -SURF 0x10 -mat 9 -refs 3 -87 0.970847 0.642041 -97 0.96586 0.650473 -86 0.973718 0.644563 -SURF 0x10 -mat 9 -refs 3 -94 0.958008 0.656367 -97 0.96586 0.650473 -93 0.956286 0.652924 -SURF 0x10 -mat 9 -refs 3 -86 0.973718 0.644563 -97 0.96586 0.650473 -85 0.975387 0.648018 -SURF 0x10 -mat 9 -refs 3 -93 0.956286 0.652924 -97 0.96586 0.650473 -92 0.956101 0.649078 -SURF 0x10 -mat 9 -refs 3 -85 0.975387 0.648018 -97 0.96586 0.650473 -84 0.975646 0.65186 -SURF 0x10 -mat 9 -refs 3 -92 0.956101 0.649078 -97 0.96586 0.650473 -91 0.957417 0.645486 -SURF 0x10 -mat 9 -refs 3 -84 0.975646 0.65186 -97 0.96586 0.650473 -83 0.974318 0.65548 -SURF 0x10 -mat 9 -refs 3 -91 0.957417 0.645486 -97 0.96586 0.650473 -90 0.959932 0.642581 -SURF 0x10 -mat 9 -refs 3 -83 0.974318 0.65548 -97 0.96586 0.650473 -82 0.97179 0.658371 -SURF 0x10 -mat 9 -refs 3 -90 0.959932 0.642581 -97 0.96586 0.650473 -89 0.963427 0.641014 -SURF 0x10 -mat 9 -refs 3 -81 0.968292 0.659951 -97 0.96586 0.650473 -96 0.964467 0.660229 -SURF 0x10 -mat 9 -refs 3 -82 0.97179 0.658371 -97 0.96586 0.650473 -81 0.968292 0.659951 -SURF 0x10 -mat 9 -refs 3 -89 0.963427 0.641014 -97 0.96586 0.650473 -88 0.967245 0.640701 -SURF 0x10 -mat 9 -refs 3 -96 0.964467 0.660229 -97 0.96586 0.650473 -95 0.960884 0.658892 +46 0.960884 0.658892 kids 0 OBJECT poly name "phone" @@ -482711,6 +482721,7 @@ data 11 wall_1.mesh texture "doors.png" crease 40.000000 +hidden numvert 38 1.23556 -0.50093 1.57332 1.23556 1.49885 0.48612 @@ -482876,6 +482887,7 @@ data 11 wall_2.mesh texture "front_gallery_r.png" crease 40.000000 +hidden numvert 27 2.2024 1.74374 -0.08383 2.2024 -0.50093 -0.08383 diff --git a/Models/Instruments/OHpanel.new/OHpanel.xml b/Models/Instruments/OHpanel.new/OHpanel.xml index f1cc44bd..585c8729 100644 --- a/Models/Instruments/OHpanel.new/OHpanel.xml +++ b/Models/Instruments/OHpanel.new/OHpanel.xml @@ -107,73 +107,8 @@ - - - - Marking lighting + Panel lighting material Markings StrobeLtSwtch.mark @@ -185,16 +120,10 @@ LandingLtRSwtch.mark NoseLtSwtch.mark OHPMarkLtKnb.mark - - - /systems/electrical/outputs/efis - 9 - - 1 - 0.6 - 0.24 + 0.824 + 0.518 controls/lighting/overhead-panel-norm diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 8043257f..7528d734 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -1004,46 +1004,14 @@ - - 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 + 0.824 + 0.518 controls/lighting/overhead-panel-norm diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml index 613b3719..96dd8fbc 100644 --- a/Models/Instruments/OHpanel/OHpanelEPR.xml +++ b/Models/Instruments/OHpanel/OHpanelEPR.xml @@ -233,46 +233,14 @@ - - 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 + 0.824 + 0.518 controls/lighting/overhead-panel-norm diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml index e272d314..50f5c7a8 100644 --- a/Models/Instruments/OHpanel/SteepAppr.xml +++ b/Models/Instruments/OHpanel/SteepAppr.xml @@ -80,46 +80,14 @@ - - 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 + 0.824 + 0.518 controls/lighting/overhead-panel-norm diff --git a/Nasal/efis.nas b/Nasal/efis.nas index b1a0b135..30e6d4f5 100644 --- a/Nasal/efis.nas +++ b/Nasal/efis.nas @@ -71,6 +71,52 @@ var mode_dec = func { } } +var cpt_efis_btns = func(i) { + if (i == "cstr") { + setprop("/instrumentation/efis/inputs/CSTR", 1); + setprop("/instrumentation/efis/inputs/wpt", 0); + setprop("/instrumentation/efis/inputs/VORD", 0); + setprop("/instrumentation/efis/inputs/DME", 0); + setprop("/instrumentation/efis/inputs/NDB", 0); + setprop("/instrumentation/efis/inputs/arpt", 0); + } else if (i == "wpt") { + setprop("/instrumentation/efis/inputs/CSTR", 0); + setprop("/instrumentation/efis/inputs/wpt", 1); + setprop("/instrumentation/efis/inputs/VORD", 0); + setprop("/instrumentation/efis/inputs/DME", 0); + setprop("/instrumentation/efis/inputs/NDB", 0); + setprop("/instrumentation/efis/inputs/arpt", 0); + } else if (i == "vord") { + setprop("/instrumentation/efis/inputs/CSTR", 0); + setprop("/instrumentation/efis/inputs/wpt", 0); + setprop("/instrumentation/efis/inputs/VORD", 1); + setprop("/instrumentation/efis/inputs/DME", 1); + setprop("/instrumentation/efis/inputs/NDB", 0); + setprop("/instrumentation/efis/inputs/arpt", 0); + } else if (i == "ndb") { + setprop("/instrumentation/efis/inputs/CSTR", 0); + setprop("/instrumentation/efis/inputs/wpt", 0); + setprop("/instrumentation/efis/inputs/VORD", 0); + setprop("/instrumentation/efis/inputs/DME", 0); + setprop("/instrumentation/efis/inputs/NDB", 1); + setprop("/instrumentation/efis/inputs/arpt", 0); + } else if (i == "arpt") { + setprop("/instrumentation/efis/inputs/CSTR", 0); + setprop("/instrumentation/efis/inputs/wpt", 0); + setprop("/instrumentation/efis/inputs/VORD", 0); + setprop("/instrumentation/efis/inputs/DME", 0); + setprop("/instrumentation/efis/inputs/NDB", 0); + setprop("/instrumentation/efis/inputs/arpt", 1); + } else if (i == "off") { + setprop("/instrumentation/efis/inputs/CSTR", 0); + setprop("/instrumentation/efis/inputs/wpt", 0); + setprop("/instrumentation/efis/inputs/VORD", 0); + setprop("/instrumentation/efis/inputs/DME", 0); + setprop("/instrumentation/efis/inputs/NDB", 0); + setprop("/instrumentation/efis/inputs/arpt", 0); + } +} + # First Officer var ctl2_func = func(md,val) { @@ -125,3 +171,48 @@ var mode2_dec = func { } } +var fo_efis_btns = func(i) { + if (i == "cstr") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 1); + setprop("/instrumentation/efis[1]/inputs/wpt", 0); + setprop("/instrumentation/efis[1]/inputs/VORD", 0); + setprop("/instrumentation/efis[1]/inputs/DME", 0); + setprop("/instrumentation/efis[1]/inputs/NDB", 0); + setprop("/instrumentation/efis[1]/inputs/arpt", 0); + } else if (i == "wpt") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 0); + setprop("/instrumentation/efis[1]/inputs/wpt", 1); + setprop("/instrumentation/efis[1]/inputs/VORD", 0); + setprop("/instrumentation/efis[1]/inputs/DME", 0); + setprop("/instrumentation/efis[1]/inputs/NDB", 0); + setprop("/instrumentation/efis[1]/inputs/arpt", 0); + } else if (i == "vord") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 0); + setprop("/instrumentation/efis[1]/inputs/wpt", 0); + setprop("/instrumentation/efis[1]/inputs/VORD", 1); + setprop("/instrumentation/efis[1]/inputs/DME", 1); + setprop("/instrumentation/efis[1]/inputs/NDB", 0); + setprop("/instrumentation/efis[1]/inputs/arpt", 0); + } else if (i == "ndb") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 0); + setprop("/instrumentation/efis[1]/inputs/wpt", 0); + setprop("/instrumentation/efis[1]/inputs/VORD", 0); + setprop("/instrumentation/efis[1]/inputs/DME", 0); + setprop("/instrumentation/efis[1]/inputs/NDB", 1); + setprop("/instrumentation/efis[1]/inputs/arpt", 0); + } else if (i == "arpt") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 0); + setprop("/instrumentation/efis[1]/inputs/wpt", 0); + setprop("/instrumentation/efis[1]/inputs/VORD", 0); + setprop("/instrumentation/efis[1]/inputs/DME", 0); + setprop("/instrumentation/efis[1]/inputs/NDB", 0); + setprop("/instrumentation/efis[1]/inputs/arpt", 1); + } else if (i == "off") { + setprop("/instrumentation/efis[1]/inputs/CSTR", 0); + setprop("/instrumentation/efis[1]/inputs/wpt", 0); + setprop("/instrumentation/efis[1]/inputs/VORD", 0); + setprop("/instrumentation/efis[1]/inputs/DME", 0); + setprop("/instrumentation/efis[1]/inputs/NDB", 0); + setprop("/instrumentation/efis[1]/inputs/arpt", 0); + } +}