diff --git a/Models/A319-100-CFM.xml b/Models/A319-100-CFM.xml index aa058c5b..d5c38c22 100644 --- a/Models/A319-100-CFM.xml +++ b/Models/A319-100-CFM.xml @@ -123,6 +123,16 @@ 0.299 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 23.474 + -16.91 + 0.299 + + Right nav light @@ -133,6 +143,16 @@ 0.299 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 23.474 + 16.91 + 0.299 + + Left strobe light @@ -143,6 +163,16 @@ 0.299 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.474 + -16.91 + 0.299 + + Right strobe light @@ -153,6 +183,17 @@ 0.299 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.474 + 16.91 + 0.299 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -172,10 +213,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - + @@ -438,6 +499,52 @@ /services/stairs/l4 + + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/A319-100-IAE.xml b/Models/A319-100-IAE.xml index f8d0f3fb..e2699043 100644 --- a/Models/A319-100-IAE.xml +++ b/Models/A319-100-IAE.xml @@ -113,7 +113,9 @@ 30.1235728 + + Left nav light Aircraft/A320Family/Models/Lights/rednav.xml @@ -123,6 +125,16 @@ 0.299 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 23.474 + -16.91 + 0.299 + + Right nav light @@ -133,6 +145,16 @@ 0.299 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 23.474 + 16.91 + 0.299 + + Left strobe light @@ -143,6 +165,16 @@ 0.299 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.474 + -16.91 + 0.299 + + Right strobe light @@ -153,6 +185,17 @@ 0.299 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.474 + 16.91 + 0.299 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -172,10 +215,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - - + Pushback @@ -438,6 +500,52 @@ /services/stairs/l4 + + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 92945b2f..dc4a0b8b 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -115,6 +115,7 @@ + Left nav light Aircraft/A320Family/Models/Lights/rednav.xml @@ -124,6 +125,16 @@ 0.25 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 22.93 + -16.5 + 0.25 + + Right nav light @@ -134,6 +145,16 @@ 0.25 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 22.93 + 16.5 + 0.25 + + Left strobe light @@ -144,6 +165,16 @@ 0.47 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.92 + -17.3 + 0.47 + + Right strobe light @@ -154,6 +185,17 @@ 0.47 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.92 + 17.23 + 0.47 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -173,10 +215,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - + @@ -444,5 +506,50 @@ + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index c819cc52..147af6b0 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -115,7 +115,8 @@ - + + Left nav light Aircraft/A320Family/Models/Lights/rednav.xml @@ -124,6 +125,16 @@ 0.25 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 22.93 + -16.5 + 0.25 + + Right nav light @@ -134,6 +145,16 @@ 0.25 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 22.93 + 16.5 + 0.25 + + Left strobe light @@ -144,6 +165,16 @@ 0.47 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.92 + -17.3 + 0.47 + + Right strobe light @@ -154,6 +185,17 @@ 0.47 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.92 + 17.23 + 0.47 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -173,10 +215,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - - + Pushback @@ -444,5 +505,50 @@ + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/A321-200-CFM.xml b/Models/A321-200-CFM.xml index 935dd12f..9f475d5f 100644 --- a/Models/A321-200-CFM.xml +++ b/Models/A321-200-CFM.xml @@ -114,7 +114,8 @@ - + + Left nav light Aircraft/A320Family/Models/Lights/rednav.xml @@ -123,6 +124,16 @@ 0.299 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 23.474 + -16.91 + 0.299 + + Right nav light @@ -133,6 +144,16 @@ 0.299 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 23.474 + 16.91 + 0.299 + + Left strobe light @@ -143,6 +164,16 @@ 0.299 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.474 + -16.91 + 0.299 + + Right strobe light @@ -153,6 +184,17 @@ 0.299 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.474 + 16.91 + 0.299 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -172,10 +214,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - - + Pushback @@ -425,5 +486,50 @@ + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/A321-200-IAE.xml b/Models/A321-200-IAE.xml index 8772e2e9..dfb8555b 100644 --- a/Models/A321-200-IAE.xml +++ b/Models/A321-200-IAE.xml @@ -114,7 +114,8 @@ - + + Left nav light Aircraft/A320Family/Models/Lights/rednav.xml @@ -123,6 +124,16 @@ 0.299 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 23.474 + -16.91 + 0.299 + + Right nav light @@ -133,6 +144,16 @@ 0.299 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 23.474 + 16.91 + 0.299 + + Left strobe light @@ -143,6 +164,16 @@ 0.299 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.474 + -16.91 + 0.299 + + Right strobe light @@ -153,6 +184,17 @@ 0.299 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.474 + 16.91 + 0.299 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -172,10 +214,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - + @@ -425,5 +487,50 @@ + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/ACJ-IAE.xml b/Models/ACJ-IAE.xml index 3b6c268c..943867fd 100644 --- a/Models/ACJ-IAE.xml +++ b/Models/ACJ-IAE.xml @@ -123,6 +123,16 @@ 0.299 + + + Left nav light ALS + Aircraft/A320Family/Models/Lights/ALS/rednav.xml + + 23.474 + -16.91 + 0.299 + + Right nav light @@ -133,6 +143,16 @@ 0.299 + + + Right nav light ALS + Aircraft/A320Family/Models/Lights/ALS/greennav.xml + + 23.474 + 16.91 + 0.299 + + Left strobe light @@ -143,6 +163,16 @@ 0.299 + + + Left strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/left-strobe.xml + + 23.474 + -16.91 + 0.299 + + Right strobe light @@ -153,6 +183,17 @@ 0.299 + + + Right strobe light ALS + Aircraft/A320Family/Models/Lights/ALS/right-strobe.xml + + 23.474 + 16.91 + 0.299 + + + Top beacon light Aircraft/A320Family/Models/Lights/beacon.xml @@ -172,10 +213,30 @@ -2.5 + + + Top beacon light ALS + Aircraft/A320Family/Models/Lights/ALS/beacon.xml + + 16.7 + 0 + 1.977 + + - + @@ -439,5 +500,50 @@ + + select + Top beacon light + Bottom beacon light + Left nav light + Right nav light + Left strobe light + Right strobe light + + + /sim/rendering/shaders/skydome + + + + + select + Top beacon light ALS + Bottom beacon light ALS + Left nav light ALS + Right nav light ALS + Left strobe light ALS + Right strobe light ALS + Port landing light ALS + Nosegear landing light ALS + Starboard landing light ALS + + /sim/rendering/shaders/skydome + + + + select + Nosegear landing light ALS + + + + /sim/model/lights/nose-ldglight + 0 + + + gear/gear/position-norm + 0.1 + + + + diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 8b336d81..d644d55c 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -2382,6 +2382,27 @@ landing light pick pick LandingLtLSwtch + + + false + + property-toggle + controls/lighting/landing-lights[1] + + + + + false + + property-toggle + controls/lighting/landing-lights[2] + + + + + + landing light pick + pick LandingLtRSwtch @@ -2400,6 +2421,25 @@ landing light rotate rotate LandingLtLSwtch + controls/lighting/landing-lights[1] + + 035 + 1-35 + + + 0 + 1 + 0 + +
+ -0.01 + 0 + -0.3037 +
+
+ + landing light rotate + rotate LandingLtRSwtch controls/lighting/landing-lights[2] @@ -2426,8 +2466,11 @@ false - property-toggle - controls/lighting/landing-lights[1] + property-cycle + controls/lighting/taxi-light-switch + 0 + 0.5 + 1 nasal @@ -2439,9 +2482,10 @@ Nose landing light rotate rotate NoseLtSwtch - controls/lighting/landing-lights[1] + controls/lighting/taxi-light-switch 035 + 0.50 1-35 diff --git a/Models/Lights/ALS/beacon.ac b/Models/Lights/ALS/beacon.ac new file mode 100644 index 00000000..d83eb849 --- /dev/null +++ b/Models/Lights/ALS/beacon.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.001" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "beaconals" +data 8 +Mesh.005 +crease 30.000000 +numvert 4 +-0.090665 -0.991468 -0.999611 +-0.090663 1.008532 -0.999611 +-0.090662 -0.991468 1.000389 +-0.090661 1.008532 1.000389 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/beacon.eff b/Models/Lights/ALS/beacon.eff new file mode 100644 index 00000000..7d5f2a34 --- /dev/null +++ b/Models/Lights/ALS/beacon.eff @@ -0,0 +1,29 @@ + + + + Effects/beacon + Effects/procedural-light + + + + white + + + 0.98 + 0.2 + 0.2 + 0.98 + 0.8 + 0.4 + sim/model/lights/beacon/state + 1.0 + 0.0 + 0.0 + false + false + 0 + 0 + 0 + 0.0 + + diff --git a/Models/Lights/ALS/beacon.xml b/Models/Lights/ALS/beacon.xml new file mode 100644 index 00000000..6bb86a96 --- /dev/null +++ b/Models/Lights/ALS/beacon.xml @@ -0,0 +1,44 @@ + + + + beacon.ac + + + + + scale + 0.5 + 0.5 + 0.5 + + + + + + dist-scale + beaconals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + + + Aircraft/A320Family/Models/lights/ALS/beacon + beaconals + + + + diff --git a/Models/Lights/ALS/green-navlight.ac b/Models/Lights/ALS/green-navlight.ac new file mode 100644 index 00000000..6b9f683d --- /dev/null +++ b/Models/Lights/ALS/green-navlight.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.001" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "green-navlightals" +data 8 +Mesh.001 +crease 30.000000 +numvert 4 +-2e-06 -1 -1 +0 1 -1 +0 -1 1 +2e-06 1 1 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/green-navlight.eff b/Models/Lights/ALS/green-navlight.eff new file mode 100644 index 00000000..fc4ae39e --- /dev/null +++ b/Models/Lights/ALS/green-navlight.eff @@ -0,0 +1,35 @@ + + + + Effects/green-navlight + Effects/procedural-light + + + + white + + + 0 + 0.5 + 0 + 0.7 + 1.0 + 0.7 + controls/lighting/nav-lights + 1.0 + -0.97629600712 + 0.0 + true + false + 0.707106781187 + 0.939692620786 + 0.017452406437 + 0.1 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/greennav.xml b/Models/Lights/ALS/greennav.xml new file mode 100644 index 00000000..4661112a --- /dev/null +++ b/Models/Lights/ALS/greennav.xml @@ -0,0 +1,41 @@ + + + + green-navlight.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/green-navlight + green-navlightals + + + + scale + 0.15 + 0.15 + 0.15 + + + + dist-scale + green-navlightals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + diff --git a/Models/Lights/ALS/landinglight.ac b/Models/Lights/ALS/landinglight.ac new file mode 100644 index 00000000..c2374f28 --- /dev/null +++ b/Models/Lights/ALS/landinglight.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.005" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "landinglightals" +data 8 +Mesh.001 +crease 30.000000 +numvert 4 +-0.048971 -0.991468 -0.999611 +-0.04897 1.008532 -0.999611 +-0.048969 -0.991468 1.000389 +-0.048967 1.008532 1.000389 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/landinglightL.eff b/Models/Lights/ALS/landinglightL.eff new file mode 100644 index 00000000..09ad710b --- /dev/null +++ b/Models/Lights/ALS/landinglightL.eff @@ -0,0 +1,35 @@ + + + + Effects/left-strobe + Effects/procedural-light + + + + white + + + 0.46 + 0.46 + 0.63 + 0.98 + 0.98 + 0.98 + controls/lighting/landing-lights[1] + 1 + 0.0 + 0.0 + true + false + 0.3 + 1 + 0.9 + 1.1 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/landinglightL.xml b/Models/Lights/ALS/landinglightL.xml new file mode 100644 index 00000000..ddff2b83 --- /dev/null +++ b/Models/Lights/ALS/landinglightL.xml @@ -0,0 +1,66 @@ + + + + landinglight.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/landinglightL + landinglightals + + + + + + scale + 0.75 + 0.75 + 0.75 + + + + + + dist-scale + landinglightals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + flash + landinglightals +
+ 0.0 + 0.0 + 0.0 +
+ + -1 + 0 + 0 + + 8 + 6 + 0 + false + 0.5 + 80 +
+ + +
diff --git a/Models/Lights/ALS/landinglightR.eff b/Models/Lights/ALS/landinglightR.eff new file mode 100644 index 00000000..72cce2c7 --- /dev/null +++ b/Models/Lights/ALS/landinglightR.eff @@ -0,0 +1,35 @@ + + + + Effects/left-strobe + Effects/procedural-light + + + + white + + + 0.46 + 0.46 + 0.63 + 0.98 + 0.98 + 0.98 + controls/lighting/landing-lights[2] + 1 + 0.0 + 0.0 + true + false + 0.3 + 1 + 0.9 + 1.1 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/landinglightR.xml b/Models/Lights/ALS/landinglightR.xml new file mode 100644 index 00000000..e66ed33f --- /dev/null +++ b/Models/Lights/ALS/landinglightR.xml @@ -0,0 +1,66 @@ + + + + landinglight.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/landinglightR + landinglightals + + + + + + scale + 0.75 + 0.75 + 0.75 + + + + + + dist-scale + landinglightals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + flash + landinglightals +
+ 0.0 + 0.0 + 0.0 +
+ + -1 + 0 + 0 + + 8 + 6 + 0 + false + 0.5 + 80 +
+ + +
diff --git a/Models/Lights/ALS/left-strobe.ac b/Models/Lights/ALS/left-strobe.ac new file mode 100644 index 00000000..2ab845d0 --- /dev/null +++ b/Models/Lights/ALS/left-strobe.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.005" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "left-strobeals" +data 8 +Mesh.001 +crease 30.000000 +numvert 4 +-0.048971 -0.991468 -0.999611 +-0.04897 1.008532 -0.999611 +-0.048969 -0.991468 1.000389 +-0.048967 1.008532 1.000389 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/left-strobe.eff b/Models/Lights/ALS/left-strobe.eff new file mode 100644 index 00000000..0d5d318a --- /dev/null +++ b/Models/Lights/ALS/left-strobe.eff @@ -0,0 +1,35 @@ + + + + Effects/left-strobe + Effects/procedural-light + + + + white + + + 0.46 + 0.46 + 0.63 + 0.98 + 0.98 + 0.98 + sim/model/lights/strobe/state + -1 + 0.70710678 + 0.0 + false + false + 0.5 + 0.34202014 + 0.017452406437 + 1.0 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/left-strobe.xml b/Models/Lights/ALS/left-strobe.xml new file mode 100644 index 00000000..35f638ba --- /dev/null +++ b/Models/Lights/ALS/left-strobe.xml @@ -0,0 +1,46 @@ + + + + left-strobe.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/left-strobe + left-strobeals + + + + + + scale + 0.75 + 0.75 + 0.75 + + + + + + dist-scale + left-strobeals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + + diff --git a/Models/Lights/ALS/red-navlight.ac b/Models/Lights/ALS/red-navlight.ac new file mode 100644 index 00000000..6d061971 --- /dev/null +++ b/Models/Lights/ALS/red-navlight.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.001" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "red-navlightals" +data 4 +Mesh +crease 30.000000 +numvert 4 +-2e-06 -1 -1 +0 1 -1 +0 -1 1 +2e-06 1 1 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/red-navlight.eff b/Models/Lights/ALS/red-navlight.eff new file mode 100644 index 00000000..7e4d3794 --- /dev/null +++ b/Models/Lights/ALS/red-navlight.eff @@ -0,0 +1,35 @@ + + + + Effects/red-navlight + Effects/procedural-light + + + + white + + + 0.5 + 0.0 + 0.0 + 1.0 + 0.7 + 0.7 + controls/lighting/nav-lights + 1.0 + 0.97629600712 + 0.0 + true + false + 0.707106781187 + 0.939692620786 + 0.017452406437 + 0.1 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/rednav.xml b/Models/Lights/ALS/rednav.xml new file mode 100644 index 00000000..792a8641 --- /dev/null +++ b/Models/Lights/ALS/rednav.xml @@ -0,0 +1,41 @@ + + + + red-navlight.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/red-navlight + red-navlightals + + + + scale + 0.175 + 0.175 + 0.175 + + + + dist-scale + red-navlightals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + diff --git a/Models/Lights/ALS/right-strobe.ac b/Models/Lights/ALS/right-strobe.ac new file mode 100644 index 00000000..c1340b5b --- /dev/null +++ b/Models/Lights/ALS/right-strobe.ac @@ -0,0 +1,24 @@ +AC3Db +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 +MATERIAL "DefaultWhite.007" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1 +OBJECT world +kids 1 +OBJECT poly +name "right-strobeals" +data 8 +Mesh.003 +crease 30.000000 +numvert 4 +-0.050333 -1 -0.999806 +-0.050331 1 -0.999806 +-0.05033 -1 1.000194 +-0.050329 1 1.000194 +numsurf 1 +SURF 0x20 +mat 1 +refs 4 +1 0.0 0.0 +0 0.0 0.0 +2 0.0 0.0 +3 0.0 0.0 +kids 0 diff --git a/Models/Lights/ALS/right-strobe.eff b/Models/Lights/ALS/right-strobe.eff new file mode 100644 index 00000000..b01d02fa --- /dev/null +++ b/Models/Lights/ALS/right-strobe.eff @@ -0,0 +1,34 @@ + + + + Effects/right-strobe + Effects/procedural-light + + + + white + + + 0.46 + 0.46 + 0.63 + 0.98 + 0.98 + 0.98 sim/model/lights/strobe/state + -1 + -0.70710678 + 0.0 + false + false + 0.5 + 0.34202014 + 0.017452406437 + 1.0 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/right-strobe.xml b/Models/Lights/ALS/right-strobe.xml new file mode 100644 index 00000000..a97973d2 --- /dev/null +++ b/Models/Lights/ALS/right-strobe.xml @@ -0,0 +1,45 @@ + + + + right-strobe.ac + + + + + + Aircraft/A320Family/Models/lights/ALS/right-strobe + right-strobeals + + + + + scale + 0.75 + 0.75 + 0.75 + + + + + + dist-scale + right-strobeals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + + diff --git a/Models/Lights/ALS/taxilight.eff b/Models/Lights/ALS/taxilight.eff new file mode 100644 index 00000000..2c98950a --- /dev/null +++ b/Models/Lights/ALS/taxilight.eff @@ -0,0 +1,35 @@ + + + + Effects/taxilight + Effects/procedural-light + + + + white + + + 0.46 + 0.46 + 0.63 + 0.98 + 0.98 + 0.98 + controls/lighting/taxi-light-switch + 1 + 0.0 + 0.0 + true + false + 0.3 + 1 + 0.9 + 1.1 + /environment/ground-visibility-m + /environment/visibility-m + /environment/ground-haze-thickness-m + /environment/mean-terrain-elevation-m + /sim/rendering/eye-altitude-m + /environment/terminator-relative-position-m + + diff --git a/Models/Lights/ALS/taxilight.xml b/Models/Lights/ALS/taxilight.xml new file mode 100644 index 00000000..5793f681 --- /dev/null +++ b/Models/Lights/ALS/taxilight.xml @@ -0,0 +1,66 @@ + + + + landinglight.ac + + + + + + Aircraft/737-800/Models/lights/ALS/taxilight + landinglightals + + + + + + scale + 0.75 + 0.75 + 0.75 + + + + + + dist-scale + landinglightals + + + 0 + 1 + + + 300 + 4 + + + 1500 + 8 + + + + + + flash + landinglightals +
+ 0.0 + 0.0 + 0.0 +
+ + -1 + 0 + 0 + + 8 + 3 + 0 + false + 0.5 + 80 +
+ + +
diff --git a/Models/Wings/res/wings_white.png b/Models/Wings/res/wings_white.png new file mode 100644 index 00000000..981bec88 Binary files /dev/null and b/Models/Wings/res/wings_white.png differ diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index ac9bbd14..e03fe859 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -37,13 +37,11 @@ var elec_init = func { setprop("/systems/electrical/bus/dc-ess", 0); setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac2", 0); - setprop("/systems/electrical/bus/emergen-hz", 0); setprop("/systems/electrical/bus/gen1-hz", 0); setprop("/systems/electrical/bus/gen2-hz", 0); setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/extra/ext-volts", 0); setprop("/systems/electrical/extra/apu-volts", 0); - setprop("/systems/electrical/extra/emergen-volts", 0); setprop("/systems/electrical/extra/gen1-volts", 0); setprop("/systems/electrical/extra/gen2-volts", 0); setprop("/systems/electrical/extra/ext-hz", 0); @@ -128,8 +126,6 @@ var master_elec = func { var bat1_con = getprop("/systems/electrical/extra/battery/bat1-contact"); var bat2_con = getprop("/systems/electrical/extra/battery/bat2-contact"); var emergen = getprop("/controls/electrical/switches/emer-gen"); - var emergenvolts = getprop("/systems/electrical/extra/emergen-volts"); - var emergenhz = getprop("/systems/electrical/bus/emergen-hz"); var ias = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt"); var rat = getprop("/controls/hydraulic/rat"); var manrat = getprop("/controls/hydraulic/rat-man"); diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index ccfa3af8..601ad645 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -29,18 +29,23 @@ var pneu_init = func { setprop("/systems/pneumatic/eng1-starter", 0); setprop("/systems/pneumatic/eng2-starter", 0); pneu_timer.start(); - press_timer.start(); } var press_init = func { setprop("/FMGC/internal/dep-arpt", ""); setprop("/systems/pressurization/mode", "GN"); setprop("/systems/pressurization/vs", "0"); + setprop("/systems/pressurization/targetvs", "0"); + setprop("/systems/pressurization/vs-norm", "0"); setprop("/systems/pressurization/auto", 1); setprop("/systems/pressurization/deltap", "0"); setprop("/systems/pressurization/outflowpos", "0"); + setprop("/systems/pressurization/deltap-norm", "0"); + setprop("/systems/pressurization/outflowpos-norm", "0"); var altitude = getprop("/position/altitude-ft"); - setprop("/systems/pressurization/cabinalt", altitude); # initially set altitude + setprop("/systems/pressurization/cabinalt", altitude); + setprop("/systems/pressurization/targetalt", altitude); + setprop("/systems/pressurization/diff-to-target", "0"); } ############## @@ -61,58 +66,32 @@ var master_press = func { var airport_dep_elev_ft = getprop("autopilot/route-manager/departure/field-elevation-ft"); var altitude = getprop("/position/altitude-ft"); var airport_arr_elev_ft = getprop("autopilot/route-manager/destination/field-elevation-ft"); - var vs = getprop("/systems/pressurization/vs"); + var vs = getprop("/systems/pressurization/vs-norm"); var outflowpos = getprop("/systems/pressurization/outflowpos"); var cabinalt = getprop("/systems/pressurization/cabinalt"); + var targetalt = getprop("/systems/pressurization/targetalt"); + var targetvs = getprop("/systems/pressurization/targetvs"); + var ambient = getprop("/systems/pressurization/ambientpsi"); + var cabinpsi = getprop("/systems/pressurization/cabinpsi"); + setprop("/systems/pressurization/diff-to-target", targetalt - cabinalt); + setprop("/systems/pressurization/deltap", cabinpsi - ambient); # switch mode to TO if ((pressmode == "GN") and (pressmode != "CL") and (wowl and wowr) and ((state1 == "MCT") or (state1 == "TOGA")) and ((state2 == "MCT") or (state2 == "TOGA"))) { setprop("/systems/pressurization/mode", "TO"); } - # prepressurization - var pressmode = getprop("/systems/pressurization/mode"); - if (pressmode == "TO") { - if (outflowpos == "0") { - interpolate("/systems/pressurization/outflowpos", 1, 1); - } - if (vs > -500 and (outflowpos != 0.5)) { - interpolate("/systems/pressurization/vs", vs - 50, 0.1); - } - if (dep_apt != "") { - if ((cabinalt > (airport_dep_elev_ft - 1)) and (cabinalt < (airport_dep_elev_ft + 1))) { - interpolate("/systems/pressurization/cabinalt", airport_dep_elev_ft - 187, 10); - } - } else { - if ((cabinalt > (altitude - 1)) and (cabinalt < (altitude + 1))) { - interpolate("/systems/pressurization/cabinalt", altitude - 187, 10); - } - } - if (dep_apt != "") { - if (cabinalt < (airport_dep_elev_ft - 183)) { - if (vs < 0) { - interpolate("/systems/pressurization/vs", 0, 1); - } - if (outflowpos == "1") { - interpolate("/systems/pressurization/outflowpos", 0.5, 1); - } - } - } else { - if (cabinalt < (altitude - 183)) { - if (vs < 0) { - interpolate("/systems/pressurization/vs", vs + 50, 0.1); - } - if (outflowpos == "1") { - interpolate("/systems/pressurization/outflowpos", 0.5, 1); - } - } - } - } - # switch mode to CLB if (((!wowl) or (!wowr)) and (speed > 100) and (pressmode == "TO")) { - setprop("/systems/pressurization/mode", "CL"); - + setprop("/systems/pressurization/mode", "CL"); + } + + if (vs != targetvs and !wowl and !wowr) { + setprop("/systems/pressurization/vs", targetvs); + } + + if (cabinalt != targetalt and !wowl and !wowr) { + setprop("/systems/pressurization/cabinalt", cabinalt + vs); } } @@ -219,12 +198,8 @@ var master_pneu = func { var update_pneumatic = func { master_pneu(); + master_press(); } var pneu_timer = maketimer(0.2, update_pneumatic); -var update_press = func { - master_press(); -} - -var press_timer = maketimer(0.1, update_press); diff --git a/Systems/libraries.xml b/Systems/libraries.xml index b59dd216..da8c1509 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -202,4 +202,159 @@ /controls/engines/engine[1]/throttle-pos + + Target Pressurize Altitude + gain + 1 + 0.1 + + + + /instrumentation/altimeter/indicated-altitude-ft + 0 0 + 1000 500 + 5000 1100 + 20000 5200 + 30000 6700 + 30000 7900 + 40500 8000 +
+
+ + /systems/pressurization/targetalt +
+ + + Cabin PSI + gain + 1 + 0.1 + + + + /systems/pressurization/cabinalt-norm + -1000 16.5 + 0 14.7 + 1000 14.6 + 5000 14.4 + 20000 12.1 + 30000 11.4 + 30000 11.0 + 40500 10.9 +
+
+ + /systems/pressurization/cabinpsi +
+ + + Ambient PSI (ICAO std) + gain + 1 + 0.1 + + + + /instrumentation/altimeter/indicated-altitude-ft + -1000 16.5 + 0 14.7 + 1000 14.2 + 2000 13.6 + 3000 13.2 + 4000 12.7 + 5000 12.2 + 6000 11.7 + 7000 11.3 + 8000 10.9 + 9000 10.5 + 10000 10.1 + 11000 9.7 + 12000 9.3 + 13000 9 + 14000 8.6 + 15000 8.3 + 16000 8.0 + 17000 7.6 + 18000 7.3 + 19000 7.0 + 20000 6.8 + 22000 6.2 + 24000 5.7 + 26000 5.2 + 28000 4.7 + 30000 4.4 + 32000 4.0 + 34000 3.6 + 36000 3.3 + 38000 3.0 + 39000 2.9 + 40000 2.7 + 41000 2.6 +
+
+ + /systems/pressurization/ambientpsi +
+ + + Outflow Valve + noise-spike + + /systems/pressurization/outflowpos + + /systems/pressurization/outflowpos-norm + 1 + + + + Cabin VS + noise-spike + + /systems/pressurization/vs + + /systems/pressurization/vs-norm + 100 + + + + Cabin Differential + noise-spike + + /systems/pressurization/deltap + + /systems/pressurization/deltap-norm + 1 + + + + Cabin Alt + noise-spike + + /systems/pressurization/cabinalt + + /systems/pressurization/cabinalt-norm + 40500 + + + + VS-target + gain + 1 + 0.05 + + + + /it-autoflight/internal/vert-speed-fpm + -1000-410 + 0 0 + 1000 205 + 2000 410 + 3000 615 + 4000 820 + 50001025 +
+
+ + /systems/pressurization/targetvs +
diff --git a/tools.txt b/tools.txt new file mode 100644 index 00000000..ee7c1373 --- /dev/null +++ b/tools.txt @@ -0,0 +1,19 @@ +Tools and Utilities: + +Trim Calculator (for FSLabs, but will work for us) + https://forums.flightsimlabs.com/index.php?/files/file/675-a320x-trim-calculation-tool/ + +Take off performance calculator (excel) + https://forums.flightsimlabs.com/index.php?/files/file/763-a320-takeoff-and-landing-performance-calculator/ + +Take off performance calculator (.exe -- different to above) + http://www.avsimrus.com/f/for-pilots-19/popular-calculator-to-calculate-takeoff-parameters-in-from-airbus-type-36340.html + +Air Berlin Norm. Checklist + https://forums.flightsimlabs.com/index.php?/files/file/778-airberlin-normal-procedures-checklist/ + +Airbus Checklist + https://forums.flightsimlabs.com/index.php?/files/file/481-airliners-checklist-a320-normal-checklist/ + +Lufthansa Checklist + https://forums.flightsimlabs.com/index.php?/files/file/480-lufthansa-checklist-a320-20/ \ No newline at end of file