fly/A320-family
1
0
Fork 0
Code Activity

Merge branch '3D' into 3D-flightdeck

Browse source
This commit is contained in:
Jonathan Redpath 2022-04-09 11:55:46 +01:00
commit e8ae551d9a
26 changed files with 233 additions and 602 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/A320-200-CFM.xml
View file

@ -29,7 +29,7 @@
<nasal>
<load><![CDATA[
var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//CFM", _module_id);
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence","AOASensorL1","AOASensorL2","AOASensorR"];
livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries//CFM/4k/SWR-fuselage.png", resolution=8192);
elements = ["EngineCFM56L","EngineCFM56R","ReverserLDoor1","ReverserLDoor2","ReverserLDoor3","ReverserLDoor4","ReverserRDoor1","ReverserRDoor2","ReverserRDoor3","ReverserRDoor4","PylonCFM56L","PylonCFM56R","IntakeCFM56L","IntakeCFM56R"];

2
Models/A320-200-IAE.xml
View file

@ -28,7 +28,7 @@
<nasal>
<load><![CDATA[
var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//IAE", _module_id);
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence","AOASensorL1","AOASensorL2","AOASensorR"];
livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", "Aircraft/A320-family/Models/Liveries//IAE/4k/QTR-fuselage.png", resolution=8192);
elements = ["EngineIAEV2500L","EngineIAEV2500R","ReverserLDoor","ReverserRDoor","PylonIAEV2500L","PylonIAEV2500R","IntakeIAEV2500L","IntakeIAEV2500R"];

6
Models/A320-common.xml
View file

@ -317,11 +317,11 @@
<model>
<name>Left strobe light ALS sharklet</name>
<path>Aircraft/A320-family/Models/Lights/right-strobe.xml</path>
<path>Aircraft/A320-family/Models/Lights/left-strobe.xml</path>
<offsets>
<x-m>2.31</x-m>
<y-m>-17.1</y-m>
<z-m>0.66</z-m>
<z-m>0.69</z-m>
</offsets>
</model>
@ -357,7 +357,7 @@
<offsets>
<x-m>2.31</x-m>
<y-m>17.1</y-m>
<z-m>0.66</z-m>
<z-m>0.69</z-m>
</offsets>
</model>

2
Models/A320neo-CFM.xml
View file

@ -20,7 +20,7 @@
<nasal>
<load><![CDATA[
var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//CFM-NEO", _module_id);
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence","AOASensorL1","AOASensorL2","AOASensorR"];
livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
elements = ["EngineLEAPL", "EngineLEAPL.007", "EngineLEAPL.Inner", "EngineLEAPR", "EngineLEAPR.Inner", "Exhaust2LEAPL", "Exhaust2LEAPR", "Exhaust3LEAPL", "Exhaust3LEAPR", "IntakeLEAPL", "IntakeLEAPR", "PylonLEAPL", "PylonLEAPR", "ReverserLDoorLEAP", "ReverserRDoorLEAP"];

2
Models/A320neo-PW.xml
View file

@ -20,7 +20,7 @@
<nasal>
<load><![CDATA[
var livery_update = aircraft.canvas_livery_update.init("Models/Liveries//PW-NEO", _module_id);
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence"];
var elements = ["AileronL","AileronR","Antenna1","Antenna2","ApuFlap","AvionicsVentDoor","Cargo1","Cargo2","Cargo3","DoorL1","DoorL4","DoorR1","DoorR4","ElevatorL","ElevatorR","EngineFairingL","EngineFairingR","FairingL1","FairingL2","FairingL3","FairingR1","FairingR2","FairingR3","FlapL1","FlapL2","FlapR1","FlapR2","Fuselage","GPUServiceDoor","Hstabs","MLGGearDoorL","MLGGearDoorR","MLGWingDoorL1","MLGWingDoorL2","MLGWingDoorR1","MLGWingDoorR2","NLGAftDoorL","NLGAftDoorR","NLGFittingPanel","NLGForewardDoorL","NLGForewardDoorR","OutflowValveDoor1","OutflowValveDoor2","RatDoorL","RatDoorR","Rudder","Sharklet","SlatL1","SlatL2","SlatR1","SlatR2","SpoilerL1","SpoilerL2","SpoilerL3","SpoilerL4","SpoilerL5","SpoilerR1","SpoilerR2","SpoilerR3","SpoilerR4","SpoilerR5","Wings","WingtipFence","AOASensorL1","AOASensorL2","AOASensorR"];
livery_update.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=8192);
elements = ["EnginePWPP", "EnginePWPPL.Inner", "EnginePWPPR", "EnginePWPPR.Inner", "Exhaust3PWPPL", "Exhaust3PWPPR", "Exxhaust2PWPPL", "Exxhaust2PWPPR", "IntakePWPPL", "IntakePWPPR", "PylonPWPPL", "PylonPWPPR", "ReverserLDoorLPWPP", "ReverserLDoorRPWPP"];

24
Models/Lights/green-navlight.ac
View file

@ -1,24 +0,0 @@
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

35
Models/Lights/green-navlight.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/green-navlight</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0</light_color_base_r>
<light_color_base_g type="float">0.5</light_color_base_g>
<light_color_base_b type="float">0</light_color_base_b>
<light_color_center_r type="float">0.7</light_color_center_r>
<light_color_center_g type="float">1.0</light_color_center_g>
<light_color_center_b type="float">0.7</light_color_center_b>
<intensity_scale type="float"><use>/sim/model/lights/nav-lights</use></intensity_scale>
<pointing_x type="float">1.0</pointing_x>
<pointing_y type="float">-0.97629600712</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.707106781187</inner_angle>
<outer_angle type="float">0.939692620786</outer_angle>
<zero_angle type="float">0.017452406437</zero_angle>
<outer_gain type="float">0.1</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

71
Models/Lights/greennav.xml
View file

@ -4,44 +4,39 @@
<PropertyList>
<path>green-navlight.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>green-navlightals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/green-navlight</inherits-from>
<object-name>green-navlightals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.5</x-offset>
<y-offset>0.5</y-offset>
<z-offset>0.5</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>green-navlightals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>green-navlight</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>GreenLight</name>
<power-source>/sim/model/lights/nav-lights</power-source>
<direction>
<x>1.0</x>
<y>-0.97629600712</y>
<z>0</z>
</direction>
<ambient>
<r>0</r>
<g>1</g>
<b>0</b>
</ambient>
<specular>
<r>0.7</r>
<g>1.0</g>
<b>0.7</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.22</l>
<q>0.20</q>
</attenuation>
<spot-exponent>1</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

24
Models/Lights/left-strobe.ac
View file

@ -1,24 +0,0 @@
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

35
Models/Lights/left-strobe.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/left-strobe</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.46</light_color_base_r>
<light_color_base_g type="float">0.46</light_color_base_g>
<light_color_base_b type="float">0.63</light_color_base_b>
<light_color_center_r type="float">1.00</light_color_center_r> <!-- aviation white converted from 5500 K temp -->
<light_color_center_g type="float">0.93</light_color_center_g>
<light_color_center_b type="float">0.87</light_color_center_b>
<intensity_scale type="float"><use>sim/model/lights/strobe/state</use></intensity_scale>
<pointing_x type="float">-1</pointing_x>
<pointing_y type="float">0.70710678</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">false</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.5</inner_angle>
<outer_angle type="float">0.34202014</outer_angle>
<zero_angle type="float">0.017452406437</zero_angle>
<outer_gain type="float">1.0</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

72
Models/Lights/left-strobe.xml
View file

@ -4,43 +4,39 @@
<PropertyList>
<path>left-strobe.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>left-strobeals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/left-strobe</inherits-from>
<object-name>left-strobeals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.75</x-offset>
<y-offset>0.75</y-offset>
<z-offset>0.75</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>left-strobeals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>left-strobe</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>leftstrobe</name>
<power-source>/sim/model/lights/strobe/state</power-source>
<direction>
<x>-0.1</x>
<y>1.0</y>
<z>0</z>
</direction>
<ambient>
<r>1</r>
<g>1</g>
<b>1</b>
</ambient>
<specular>
<r>1.0</r>
<g>1.0</g>
<b>1.0</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.010</l>
<q>0.007</q>
</attenuation>
<spot-cutoff>75</spot-cutoff>
<spot-exponent>5.08</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

24
Models/Lights/red-navlight.ac
View file

@ -1,24 +0,0 @@
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

35
Models/Lights/red-navlight.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/red-navlight</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.5</light_color_base_r>
<light_color_base_g type="float">0.0</light_color_base_g>
<light_color_base_b type="float">0.0</light_color_base_b>
<light_color_center_r type="float">1.0</light_color_center_r>
<light_color_center_g type="float">0.7</light_color_center_g>
<light_color_center_b type="float">0.7</light_color_center_b>
<intensity_scale type="float"><use>/sim/model/lights/nav-lights</use></intensity_scale>
<pointing_x type="float">1.0</pointing_x>
<pointing_y type="float">0.97629600712</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.707106781187</inner_angle>
<outer_angle type="float">0.939692620786</outer_angle>
<zero_angle type="float">0.017452406437</zero_angle>
<outer_gain type="float">0.1</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

71
Models/Lights/rednav.xml
View file

@ -4,43 +4,38 @@
<PropertyList>
<path>red-navlight.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>red-navlightals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/red-navlight</inherits-from>
<object-name>red-navlightals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.5</x-offset>
<y-offset>0.5</y-offset>
<z-offset>0.5</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>red-navlightals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>red-navlight</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>RedLight</name>
<power-source>/sim/model/lights/nav-lights</power-source>
<direction>
<x>1.0</x>
<y>0.97629600712</y>
<z>0</z>
</direction>
<ambient>
<r>1</r>
<g>0</g>
<b>0</b>
</ambient>
<specular>
<r>1.0</r>
<g>0.7</g>
<b>0.7</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.22</l>
<q>0.20</q>
</attenuation>
<spot-exponent>1</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

24
Models/Lights/right-strobe.ac
View file

@ -1,24 +0,0 @@
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

35
Models/Lights/right-strobe.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/right-strobe</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.46</light_color_base_r>
<light_color_base_g type="float">0.46</light_color_base_g>
<light_color_base_b type="float">0.63</light_color_base_b>
<light_color_center_r type="float">1.00</light_color_center_r> <!-- aviation white converted from 5500 K temp -->
<light_color_center_g type="float">0.93</light_color_center_g>
<light_color_center_b type="float">0.87</light_color_center_b>
<intensity_scale type="float"><use>sim/model/lights/strobe/state</use></intensity_scale>
<pointing_x type="float">-1</pointing_x>
<pointing_y type="float">-0.70710678</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">false</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.5</inner_angle>
<outer_angle type="float">0.34202014</outer_angle>
<zero_angle type="float">0.017452406437</zero_angle>
<outer_gain type="float">1.0</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

72
Models/Lights/right-strobe.xml
View file

@ -4,43 +4,39 @@
<PropertyList>
<path>right-strobe.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>right-strobeals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/right-strobe</inherits-from>
<object-name>right-strobeals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.75</x-offset>
<y-offset>0.75</y-offset>
<z-offset>0.75</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>right-strobeals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>right-strobe</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>rightstrobe</name>
<power-source>/sim/model/lights/strobe/state</power-source>
<direction>
<x>-0.1</x>
<y>-1.0</y>
<z>0</z>
</direction>
<ambient>
<r>1</r>
<g>1</g>
<b>1</b>
</ambient>
<specular>
<r>1.0</r>
<g>1.0</g>
<b>1.0</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.010</l>
<q>0.007</q>
</attenuation>
<spot-cutoff>75</spot-cutoff>
<spot-exponent>5.08</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

24
Models/Lights/tail-strobe.ac
View file

@ -1,24 +0,0 @@
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 "tailstrobeals"
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

35
Models/Lights/tail-strobe.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/tail-strobe</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.46</light_color_base_r>
<light_color_base_g type="float">0.46</light_color_base_g>
<light_color_base_b type="float">0.63</light_color_base_b>
<light_color_center_r type="float">1.00</light_color_center_r> <!-- aviation white converted from 5500 K temp -->
<light_color_center_g type="float">0.93</light_color_center_g>
<light_color_center_b type="float">0.87</light_color_center_b>
<intensity_scale type="float"><use>sim/model/lights/tailstrobe/state</use></intensity_scale>
<pointing_x type="float">-1.0</pointing_x>
<pointing_y type="float">0.0</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.5</inner_angle>
<outer_angle type="float">0.766</outer_angle>
<zero_angle type="float">0.939</zero_angle>
<outer_gain type="float">0.9</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

71
Models/Lights/tail-strobe.xml
View file

@ -4,43 +4,38 @@
<PropertyList>
<path>tail-strobe.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>tailstrobeals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/tail-strobe</inherits-from>
<object-name>tailstrobeals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.75</x-offset>
<y-offset>0.75</y-offset>
<z-offset>0.75</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>tailstrobeals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>tail-strobe</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>tailstrobe</name>
<power-source>/sim/model/lights/tailstrobe/state</power-source>
<direction>
<x>-1.0</x>
<y>0</y>
<z>0</z>
</direction>
<ambient>
<r>1</r>
<g>1</g>
<b>1</b>
</ambient>
<specular>
<r>1.0</r>
<g>1.0</g>
<b>1.0</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.030</l>
<q>0.025</q>
</attenuation>
<spot-exponent>5.08</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

24
Models/Lights/tailnav.ac
View file

@ -1,24 +0,0 @@
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 "tailnavlightals"
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

35
Models/Lights/tailnav.eff
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/tail-navlight</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.85</light_color_base_r>
<light_color_base_g type="float">0.85</light_color_base_g>
<light_color_base_b type="float">0.99</light_color_base_b>
<light_color_center_r type="float">1.00</light_color_center_r> <!-- aviation white converted from 5500 K temp -->
<light_color_center_g type="float">0.93</light_color_center_g>
<light_color_center_b type="float">0.87</light_color_center_b>
<intensity_scale type="float"><use>/sim/model/lights/nav-lights</use></intensity_scale>
<pointing_x type="float">-1.0</pointing_x>
<pointing_y type="float">0</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.5</inner_angle>
<outer_angle type="float">0.766</outer_angle>
<zero_angle type="float">0.939</zero_angle>
<outer_gain type="float">0.9</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

71
Models/Lights/tailnav.xml
View file

@ -4,43 +4,38 @@
<PropertyList>
<path>tailnav.ac</path>
<nopreview/>
<animation>
<type>noshadow</type>
<object-name>tailnavlightals</object-name>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/lights/ALS/tailnav</inherits-from>
<object-name>tailnavlightals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.5</x-offset>
<y-offset>0.5</y-offset>
<z-offset>0.5</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>tailnavlightals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<!-- https://wiki.flightgear.org/Howto:Add_aircraft_lights#Combined_ALS_procedural_lights_and_Compositor_lights -->
<!-- Thanks to erik -->
<model>
<name>tail-navlight</name>
<path>Aircraft/Generic/spotlight.xml</path>
<overlay>
<params>
<name>TailLight</name>
<power-source>/sim/model/lights/nav-lights</power-source>
<direction>
<x>-1.0</x>
<y>0.0</y>
<z>0</z>
</direction>
<ambient>
<r>0.85</r>
<g>0.85</g>
<b>0.99</b>
</ambient>
<specular>
<r>1</r>
<g>0.93</g>
<b>0.87</b>
</specular>
<attenuation>
<c>1.0</c>
<l>0.22</l>
<q>0.20</q>
</attenuation>
<spot-exponent>1.3</spot-exponent>
</params>
</overlay>
</model>
</PropertyList>

8
Nasal/Effects/light-manager.nas
View file

@ -85,6 +85,14 @@ var lightManager = {
},
init: func() {
var fgVersion = split(".", getprop("/sim/version/flightgear"));
var fgVersionMajor = fgVersion[0];
var fgVersionMinor = fgVersion[1];
if (fgVersionMajor >= 2020 and fgVersionMinor >= 4) {
# Using compositor lights
return;
}
setprop("/sim/rendering/als-secondary-lights/flash-radius", 13);
setprop("/sim/rendering/als-secondary-lights/num-lightspots", 5);

14
Nasal/FMGC/FMGC-b.nas
View file

@ -116,8 +116,7 @@ var Internal = {
altDiff: 0,
altTemp: 0,
altPredicted: props.globals.initNode("/it-autoflight/internal/altitude-predicted", 0, "DOUBLE"),
bankLimit: props.globals.initNode("/it-autoflight/internal/bank-limit", 30, "INT"),
bankLimitAuto: 30,
bankLimit: props.globals.initNode("/it-autoflight/internal/bank-limit", 0, "DOUBLE"),
captVs: 0,
driftAngle: props.globals.initNode("/it-autoflight/internal/drift-angle-deg", 0, "DOUBLE"),
driftAngleTemp: 0,
@ -228,7 +227,6 @@ var ITAF = {
Internal.minVs.setValue(-500);
Internal.maxVs.setValue(500);
Internal.bankLimit.setValue(30);
Internal.bankLimitAuto = 30;
Internal.alt.setValue(10000);
Internal.altCaptureActive = 0;
Input.kts.setValue(100);
@ -371,16 +369,6 @@ var ITAF = {
FPLN.activeTemp = FPLN.active.getValue();
FPLN.currentWpTemp = FPLN.currentWp.getValue();
# Bank Limit
if (Velocities.trueAirspeedKtTemp >= 420) {
Internal.bankLimitAuto = 15;
} else if (Velocities.trueAirspeedKtTemp >= 340) {
Internal.bankLimitAuto = 20;
} else {
Internal.bankLimitAuto = 30;
}
Internal.bankLimit.setValue(Internal.bankLimitAuto);
# If in LNAV mode and route is not longer active, switch to HDG HLD
if (Output.lat.getValue() == 1) { # Only evaulate the rest of the condition if we are in LNAV mode
if (flightPlanController.num[2].getValue() == 0 or !FPLN.active.getBoolValue()) {

17
Systems/fmgc-drivers.xml
View file

@ -80,6 +80,23 @@
</predict-simple>
<!-- Autopilot Helpers/Calculators -->
<filter>
<name>Auto Bank Limit</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/velocities/mach</property>
<entry><ind>0.55</ind><dep>25</dep></entry>
<entry><ind>0.80</ind><dep>20</dep></entry>
<entry><ind>0.90</ind><dep>10</dep></entry>
</table>
</expression>
</input>
<output>/it-autoflight/internal/bank-limit</output>
</filter>
<filter>
<name>FMGC Managed Knots</name>
<type>gain</type>