fly/A320-family
1
0
Fork 0
Code Activity

Added engines moisture effect, engines spray effect, brake temp modulation according weight /compression-norm), removed brakes temp increase on thrust

Browse source
This commit is contained in:
vezza 2020-02-21 23:27:52 +01:00
parent 03584e4067
commit 9cc76bed07
16 changed files with 878 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

208
Models/A320-100-CFM.xml
View file

@ -305,86 +305,86 @@
</offsets>
</model>
<!-- Tire smoke and spray effects -->
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
<name>tyre-smoke-n</name>
<offsets>
<x-m>7.83</x-m>
<y-m>0</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
<name>tyre-smoke-p</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>-3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
<name>tyre-smoke-s</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-nose.xml</path>
<name>rain-splash-n</name>
<offsets>
<x-m>7.83</x-m>
<y-m>0</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-port.xml</path>
<name>rain-splash-p</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>-3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
<name>rain-splash-s</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
<name>tire-smoke-l</name>
<!-- Tire smoke and spray effects -->
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
<name>tyre-smoke-n</name>
<offsets>
<x-m>7.83</x-m>
<y-m>0</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
<name>tyre-smoke-p</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>-3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
<name>tire-smoke-r</name>
</model>
<model>
<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
<name>tyre-smoke-s</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-nose.xml</path>
<name>rain-splash-n</name>
<offsets>
<x-m>7.83</x-m>
<y-m>0</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-port.xml</path>
<name>rain-splash-p</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>-3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
<name>rain-splash-s</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
<name>tire-smoke-l</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>-3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
<name>tire-smoke-r</name>
<offsets>
<x-m>20.3180764</x-m>
<y-m>3.795</y-m>
<z-m>-3.9669424</z-m>
</offsets>
</model>
<!-- Other non-aircraft models -->
<model>
@ -399,40 +399,40 @@
<!--Firetruck-->
<model>
<name>Firetruck1</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>60.0</x-m>
<y-m>10.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<model>
<name>Firetruck2</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>80.0</x-m>
<y-m>-8.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<animation>
<type>select</type>
<object-name>Firetruck1</object-name>
<object-name>Firetruck2</object-name>
<condition>
<and>
<property>sim/animation/fire-services</property>
<less-than>
<property>velocities/groundspeed-kt</property>
<value>40</value>
</less-than>
</and>
</condition>
</animation>
<model>
<name>Firetruck1</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>60.0</x-m>
<y-m>10.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<model>
<name>Firetruck2</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>80.0</x-m>
<y-m>-8.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<animation>
<type>select</type>
<object-name>Firetruck1</object-name>
<object-name>Firetruck2</object-name>
<condition>
<and>
<property>sim/animation/fire-services</property>
<less-than>
<property>velocities/groundspeed-kt</property>
<value>40</value>
</less-than>
</and>
</condition>
</animation>
<!-- LIVERY SELECT -->
<!-- Animation -->

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

@ -429,40 +429,40 @@
<!--Firetruck-->
<model>
<name>Firetruck1</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>60.0</x-m>
<y-m>10.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<model>
<name>Firetruck2</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>80.0</x-m>
<y-m>-8.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<animation>
<type>select</type>
<object-name>Firetruck1</object-name>
<object-name>Firetruck2</object-name>
<condition>
<and>
<property>sim/animation/fire-services</property>
<less-than>
<property>velocities/groundspeed-kt</property>
<value>40</value>
</less-than>
</and>
</condition>
</animation>
<model>
<name>Firetruck1</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>60.0</x-m>
<y-m>10.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<model>
<name>Firetruck2</name>
<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
<offsets>
<x-m>80.0</x-m>
<y-m>-8.0</y-m>
<z-m>-4.4</z-m>
</offsets>
</model>
<animation>
<type>select</type>
<object-name>Firetruck1</object-name>
<object-name>Firetruck2</object-name>
<condition>
<and>
<property>sim/animation/fire-services</property>
<less-than>
<property>velocities/groundspeed-kt</property>
<value>40</value>
</less-than>
</and>
</condition>
</animation>
<!-- LIVERY SELECT -->
<!-- Animation -->

34
Models/Effects/Moisture.xml
View file

@ -15,7 +15,7 @@ Original code author Maggse.
<!-- <type>trail</type>-->
<name>flare</name>
<texture>res/smoke.png</texture>
<emissive>true</emissive>
<emissive>false</emissive>
<lighting>false</lighting>
<offsets>
<x-m>0</x-m>
@ -40,12 +40,12 @@ Original code author Maggse.
<spread>1</spread>
</speed>
<rotation-speed>
<x-min-deg-sec>0</x-min-deg-sec>
<y-min-deg-sec>0</y-min-deg-sec>
<z-min-deg-sec>10</z-min-deg-sec>
<x-max-deg-sec>0</x-max-deg-sec>
<y-max-deg-sec>10</y-max-deg-sec>
<z-max-deg-sec>20</z-max-deg-sec>
<x-min-deg-sec>15</x-min-deg-sec>
<y-min-deg-sec>-15</y-min-deg-sec>
<z-min-deg-sec>15</z-min-deg-sec>
<x-max-deg-sec>-15</x-max-deg-sec>
<y-max-deg-sec>15</y-max-deg-sec>
<z-max-deg-sec>-15</z-max-deg-sec>
</rotation-speed>
</shooter>
@ -61,10 +61,10 @@ Original code author Maggse.
<particle>
<start>
<color>
<red><value>0.3</value></red>
<green><value>0.3</value></green>
<blue><value>0.3</value></blue>
<alpha><value>0.40</value></alpha>
<red><value>0.95</value></red>
<green><value>0.95</value></green>
<blue><value>0.95</value></blue>
<alpha><value>0.05</value></alpha>
</color>
<size>
<value>1.3</value>
@ -72,24 +72,24 @@ Original code author Maggse.
</start>
<end>
<color>
<red><value>0.65</value></red>
<green><value>0.45</value></green>
<blue><value>0.35</value></blue>
<alpha><value>0.2</value></alpha>
<red><value>1</value></red>
<green><value>1</value></green>
<blue><value>1</value></blue>
<alpha><value>0.02</value></alpha>
</color>
<size>
<value>0.4</value>
</size>
</end>
<life-sec><value>0.1</value></life-sec>
<life-sec><value>1</value></life-sec>
<mass-kg>0.4</mass-kg>
<radius-m>0.1</radius-m>
</particle>
<program>
<fluid>air</fluid>
<gravity type="bool">false</gravity>
<gravity type="bool">true</gravity>
<wind type="bool">false</wind>
</program>

85
Models/Effects/engine-spray-left-reverse.xml Normal file
View file

@ -0,0 +1,85 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<PropertyList>
<particlesystem>
<name>engine-spray-l-reverse</name>
<texture>res/smoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>
<attach>local</attach>
<placer>
<type>point</type>
</placer>
<shooter>
<theta-min-deg>45</theta-min-deg>
<theta-max-deg>80</theta-max-deg>
<phi-min-deg>-5</phi-min-deg>
<phi-max-deg>5</phi-max-deg>
<speed-mps>
<value>engines/engine[0]/thrust_lb</value>
<spread>10</spread>
</speed-mps>
<rotation-speed>
<x-max-deg-sec>15</x-max-deg-sec>
<x-min-deg-sec>-15</x-min-deg-sec>
<y-max-deg-sec>15</y-max-deg-sec>
<y-min-deg-sec>-15</y-min-deg-sec>
<z-max-deg-sec>15</z-max-deg-sec>
<z-min-deg-sec>-15</z-min-deg-sec>
</rotation-speed>
</shooter>
<counter>
<particles-per-sec>
<property>engines/engine[0]/n2-actual</property>
<spread>20</spread>
</particles-per-sec>
</counter>
<align>billboard</align>
<particle>
<start>
<color>
<red><value>0.95</value></red>
<green><value>0.95</value></green>
<blue><value>0.95</value></blue>
<alpha><value>0.05</value></alpha>
</color>
<size>
<value>0.5</value>
</size>
</start>
<end>
<color>
<red><value>1</value></red>
<green><value>1</value></green>
<blue><value>1</value></blue>
<alpha><value>0.02</value></alpha>
</color>
<size>
<value>5</value>
</size>
</end>
<life-sec>
<value>1.5</value>
</life-sec>
<mass-kg>0.025</mass-kg>
<radius-m>0.175</radius-m>
</particle>
<program>
<fluid>air</fluid>
<gravity>true</gravity>
<wind>true</wind>
</program>
</particlesystem>
</PropertyList>

98
Models/Effects/engine-spray-left.xml
View file

@ -6,47 +6,34 @@
<particlesystem>
<name>engine-spray-l</name>
<texture>tiresmoke.png</texture>
<texture>res/smoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>
<offsets>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</offsets>
<condition>
<and>
<greater-than>
<property>engines/engine[0]/n2-actual</property>
<value>50</value>
</greater-than>
<less-than>
<property>position/altitude-ft</property>
<value>10</value>
</less-than>
<equals>
<property>engines/engine[0]/state</property>
<value>3</value>
</equals>
</and>
</condition>
<attach>world</attach>
<placer>
<type>point</type>
</placer>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>20</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>45</theta-min-deg>
<theta-max-deg>85</theta-max-deg>
<phi-min-deg>-60</phi-min-deg>
<phi-max-deg>60</phi-max-deg>
<theta-min-deg>15</theta-min-deg>
<theta-max-deg>60</theta-max-deg>
<phi-min-deg>-5</phi-min-deg>
<phi-max-deg>5</phi-max-deg>
<speed-mps>
<value>engines/engine[0]/thrust_lbs</value>
<spread>5</spread>
<value>250</value>
<spread>15</spread>
</speed-mps>
<rotation-speed>
<x-max-deg-sec>15</x-max-deg-sec>
@ -60,9 +47,8 @@
<counter>
<particles-per-sec>
<property>engines/engine[0]/n2-actual</property>
<factor>20</factor>
<spread>70</spread>
<value>100</value>
<spread>10</spread>
</particles-per-sec>
</counter>
@ -71,55 +57,39 @@
<particle>
<start>
<color>
<red>
<value>0.8</value>
</red>
<green>
<value>0.8</value>
</green>
<blue>
<value>0.8</value>
</blue>
<alpha>
<value>0.5</value>
</alpha>
<red><value>0.9</value></red>
<green><value>0.9</value></green>
<blue><value>0.9</value></blue>
<alpha><value>0.04</value></alpha>
</color>
<size>
<value>1.5</value>
<value>0.5</value>
</size>
</start>
<end>
<color>
<red>
<value>0.7</value>
</red>
<green>
<value>0.7</value>
</green>
<blue>
<value>0.7</value>
</blue>
<alpha>
<value>0.005</value>
</alpha>
<red><value>1</value></red>
<green><value>1</value></green>
<blue><value>1</value></blue>
<alpha><value>0.02</value></alpha>
</color>
<size>
<value>10</value>
</size>
</end>
<life-sec>
<value>2</value>
<value>1.5</value>
</life-sec>
<mass-kg>0.025</mass-kg>
<radius-m>0.175</radius-m>
</particle>
<program>
<fluid>water</fluid>
<fluid>air</fluid>
<gravity>true</gravity>
<wind>true</wind>
</program>
</particlesystem>
</particlesystem>
</PropertyList>

85
Models/Effects/engine-spray-right-reverse.xml Normal file
View file

@ -0,0 +1,85 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<PropertyList>
<particlesystem>
<name>engine-spray-r-reverse</name>
<texture>res/smoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>
<attach>local</attach>
<placer>
<type>point</type>
</placer>
<shooter>
<theta-min-deg>45</theta-min-deg>
<theta-max-deg>80</theta-max-deg>
<phi-min-deg>-5</phi-min-deg>
<phi-max-deg>5</phi-max-deg>
<speed-mps>
<value>engines/engine[0]/thrust_lb</value>
<spread>10</spread>
</speed-mps>
<rotation-speed>
<x-max-deg-sec>15</x-max-deg-sec>
<x-min-deg-sec>-15</x-min-deg-sec>
<y-max-deg-sec>15</y-max-deg-sec>
<y-min-deg-sec>-15</y-min-deg-sec>
<z-max-deg-sec>15</z-max-deg-sec>
<z-min-deg-sec>-15</z-min-deg-sec>
</rotation-speed>
</shooter>
<counter>
<particles-per-sec>
<property>engines/engine[0]/n2-actual</property>
<spread>20</spread>
</particles-per-sec>
</counter>
<align>billboard</align>
<particle>
<start>
<color>
<red><value>0.95</value></red>
<green><value>0.95</value></green>
<blue><value>0.95</value></blue>
<alpha><value>0.05</value></alpha>
</color>
<size>
<value>0.5</value>
</size>
</start>
<end>
<color>
<red><value>1</value></red>
<green><value>1</value></green>
<blue><value>1</value></blue>
<alpha><value>0.02</value></alpha>
</color>
<size>
<value>5</value>
</size>
</end>
<life-sec>
<value>1.5</value>
</life-sec>
<mass-kg>0.025</mass-kg>
<radius-m>0.175</radius-m>
</particle>
<program>
<fluid>air</fluid>
<gravity>true</gravity>
<wind>true</wind>
</program>
</particlesystem>
</PropertyList>

89
Models/Effects/engine-spray-right.xml
View file

@ -5,35 +5,37 @@
<PropertyList>
<particlesystem>
<name>tyre-smoke-r</name>
<texture>tiresmoke.png</texture>
<name>engine-spray-r</name>
<texture>res/smoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>
<offsets>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</offsets>
<condition>
<equals>
<property>gear/gear[2]/Rbrake-smoke</property>
<value>1</value>
</equals>
</condition>
<attach>world</attach>
<placer>
<type>point</type>
</placer>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>10</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>30</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>45</theta-min-deg>
<theta-max-deg>85</theta-max-deg>
<phi-min-deg>-60</phi-min-deg>
<phi-max-deg>60</phi-max-deg>
<theta-min-deg>15</theta-min-deg>
<theta-max-deg>60</theta-max-deg>
<phi-min-deg>-5</phi-min-deg>
<phi-max-deg>5</phi-max-deg>
<speed-mps>
<value>50</value>
<spread>5</spread>
@ -50,9 +52,8 @@
<counter>
<particles-per-sec>
<property>gear/gear[2]/Rbrake-thermal-energy</property>
<factor>20</factor>
<spread>70</spread>
<value>250</value>
<spread>100</spread>
</particles-per-sec>
</counter>
@ -61,37 +62,21 @@
<particle>
<start>
<color>
<red>
<value>0.8</value>
</red>
<green>
<value>0.8</value>
</green>
<blue>
<value>0.8</value>
</blue>
<alpha>
<value>0.5</value>
</alpha>
<red><value>0.95</value></red>
<green><value>0.95</value></green>
<blue><value>0.95</value></blue>
<alpha><value>0.05</value></alpha>
</color>
<size>
<value>1.5</value>
<value>0.5</value>
</size>
</start>
<end>
<color>
<red>
<value>0.7</value>
</red>
<green>
<value>0.7</value>
</green>
<blue>
<value>0.7</value>
</blue>
<alpha>
<value>0.005</value>
</alpha>
<red><value>1</value></red>
<green><value>1</value></green>
<blue><value>1</value></blue>
<alpha><value>0.02</value></alpha>
</color>
<size>
<value>10</value>
@ -106,10 +91,10 @@
<program>
<fluid>air</fluid>
<gravity>false</gravity>
<gravity>true</gravity>
<wind>true</wind>
</program>
</particlesystem>
</particlesystem>
</PropertyList>

2
Models/Effects/tire-smoke-left.xml
View file

@ -5,7 +5,7 @@
<PropertyList>
<particlesystem>
<name>tyre-smoke-l</name>
<name>tire-smoke-l</name>
<texture>tiresmoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>

2
Models/Effects/tire-smoke-right.xml
View file

@ -5,7 +5,7 @@
<PropertyList>
<particlesystem>
<name>tyre-smoke-r</name>
<name>tire-smoke-r</name>
<texture>tiresmoke.png</texture>
<emissive>false</emissive>
<lighting>false</lighting>

80
Models/Engines/NEO/LeapXLeft.xml
View file

@ -100,6 +100,86 @@
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- ############### -->
<!-- Tubofan Exhaust -->

80
Models/Engines/NEO/LeapXRight.xml
View file

@ -101,6 +101,86 @@
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- ############### -->
<!-- Tubofan Exhaust -->

80
Models/Engines/NEO/PW1100GLeft.xml
View file

@ -88,6 +88,86 @@
</offsets>
</model>
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Engine fire</name>
<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>

81
Models/Engines/NEO/PW1100GRight.xml
View file

@ -88,6 +88,87 @@
</offsets>
</model>
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Engine fire</name>
<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>

85
Models/Engines/XMLs/a320.engine.cfm.left.xml
View file

@ -67,7 +67,7 @@
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>75</value>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
@ -92,13 +92,82 @@
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<offsets>
<x-m>4.875</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</offsets>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>

80
Models/Engines/XMLs/a320.engine.cfm.right.xml
View file

@ -90,6 +90,86 @@
</offsets>
</model>
<!-- Takeoff/Landing Engine spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left.xml</path>
<name>engine-spray-l</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>position/altitude-agl-ft</property>
<value>15</value>
</less-than-equals>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<greater-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</greater-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>10.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<!-- Takeoff/Landing Engine Reverse spray -->
<model>
<path>Aircraft/A320-family/Models/Effects/engine-spray-left-reverse.xml</path>
<name>engine-spray-l-reverse</name>
<condition>
<and>
<greater-than>
<property>position/altitude-agl-ft</property>
<value>1</value>
</greater-than>
<greater-than>
<property>environment/relative-humidity</property>
<value>60</value>
</greater-than>
<less-than-equals>
<property>sim/time/sun-angle-rad</property>
<value>1.63</value>
</less-than-equals>
<greater-than>
<property>engines/engine[0]/n1</property>
<value>60</value>
</greater-than>
<less-than>
<property>engines/engine[0]/thrust_lb</property>
<value>0</value>
</less-than>
<!-- <not>
<property>sim/crashed</property>
</not> -->
</and>
</condition>
<offsets>
<x-m>0.875</x-m>
<y-m>0</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Engine fire</name>
<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>

10
Nasal/Systems/brakesystem.nas
View file

@ -75,15 +75,12 @@ var BrakeSystem =
setprop("gear/gear[2]/R3error-temp-degc", math.round(rand()*(5)) - 2.5);
setprop("gear/gear[2]/R4error-temp-degc", math.round(rand()*(5)) - 2.5);
<<<<<<< HEAD
#var atemp = getprop("environment/temperature-degc") or 0;
#var vmach = getprop("velocities/mach") or 0;
var tatdegc = getprop("/systems/navigation/probes/tat-1/compute-tat") or 0;
=======
var atemp = getprop("environment/temperature-degc") or 0;
var vmach = getprop("velocities/mach") or 0;
var tatdegc = getprop("systems/navigation/probes/tat-1/compute-tat");
>>>>>>> d47b3431d233eb890aa9e256c21f148e6dce5a21
setprop("gear/gear[1]/L1brake-temp-degc",tatdegc+getprop("gear/gear[1]/L1error-temp-degc"));
setprop("gear/gear[1]/L2brake-temp-degc",tatdegc+getprop("gear/gear[1]/L2error-temp-degc"));
@ -180,10 +177,7 @@ var BrakeSystem =
var V2_L = V1 - me.BrakeDecel * dt * LBrakeLevel;
var V2_R = V1 - me.BrakeDecel * dt * RBrakeLevel;
#TODO - Adjust ThermalEnergy according to differential braking
#LBrakeLevel-RBrakeLevel
LThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
LThermalEnergy += (Mass * getprop("gear/gear[1]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
if (getprop("services/chocks/left"))
{
if (!getprop("controls/gear/brake-parking"))
@ -221,7 +215,7 @@ var BrakeSystem =
}
}
RThermalEnergy += (Mass * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
RThermalEnergy += (Mass * getprop("gear/gear[2]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
if (getprop("services/chocks/right"))
{
if (!getprop("controls/gear/brake-parking"))