From fc58ebf2a04ca1e935ae46c6768638ea959b705a Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sat, 6 Jun 2020 23:39:05 +0100
Subject: [PATCH] Animations reworked and matte effect applied to wing

---
 A320-main.xml                      |  6 ++-
 Models/Effects/reflection-matt.eff | 25 ++++++++++++
 Models/Engines/XMLs/a320.cfm.xml   | 52 ++++++++++++------------
 Models/Engines/XMLs/a320.v2500.xml | 28 ++++++-------
 Models/Fuselages/A320/fuselage.xml | 65 ++++++++++++++++--------------
 5 files changed, 103 insertions(+), 73 deletions(-)
 create mode 100644 Models/Effects/reflection-matt.eff

diff --git a/A320-main.xml b/A320-main.xml
index 4e94eb21..8d7fd142 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -68,10 +68,12 @@
 				</iceable>
 			</icing>
 			<reflection>
-				<ambient-correction type="double">0.10</ambient-correction>
-				<reflection-correction type="double">0.10</reflection-correction>
+				<ambient-correction type="double">0.05</ambient-correction>
+				<reflection-correction type="double">0.05</reflection-correction>
 				<ambient-correction-chrome type="double">0.05</ambient-correction-chrome>
 				<reflection-correction-chrome type="double">0.20</reflection-correction-chrome>
+				<ambient-correction-wing type="double">0.05</ambient-correction-wing>
+				<reflection-correction-wing type="double">-0.25</reflection-correction-wing>
 			</reflection>
 		</model>
 		
diff --git a/Models/Effects/reflection-matt.eff b/Models/Effects/reflection-matt.eff
new file mode 100644
index 00000000..916b905c
--- /dev/null
+++ b/Models/Effects/reflection-matt.eff
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<PropertyList>
+	<name>reflection</name>
+	<inherits-from>Effects/model-combined-deferred</inherits-from>
+	<parameters>
+		<reflection-enabled type="int">1</reflection-enabled>
+		<reflection-dynamic type="int">1</reflection-dynamic>
+		<reflect_map-enabled type="int">0</reflect_map-enabled>
+		<reflection-correction type="float"><use>/sim/model/reflection/reflection-correction-wing</use></reflection-correction>
+		<reflection-type type="int">2</reflection-type>
+		<ambient-correction type="float"><use>/sim/model/reflection/ambient-correction-wing</use></ambient-correction>
+		<lightmap-enabled type="int">0</lightmap-enabled>
+		<lightmap-multi type="int">0</lightmap-multi>
+		<texture n="5">
+			<type>cubemap</type>
+			<images>
+				<positive-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png</positive-x>
+				<negative-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png</negative-x>
+				<positive-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png</positive-y>
+				<negative-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png</negative-y>
+				<positive-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png</positive-z>
+				<negative-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png</negative-z>
+			</images>
+		</texture></parameters>
+</PropertyList>
diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml
index 32a815fa..eb8083b9 100644
--- a/Models/Engines/XMLs/a320.cfm.xml
+++ b/Models/Engines/XMLs/a320.cfm.xml
@@ -23,7 +23,7 @@
 			</params>
 		</overlay>
 		<offsets>
-			<x-m> 4.64247</x-m>
+			<x-m> 4.51789</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -41,7 +41,7 @@
 			</params>
 		</overlay>
 		<offsets>
-			<x-m> 4.64247</x-m>
+			<x-m> 4.51789</x-m>
 			<y-m> 5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -71,9 +71,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-7.30742</x-m>
+			<x-m>-7.432</x-m>
 			<y-m>-5.63029</y-m>
-			<z-m>-1.75465</z-m>
+			<z-m>-2.16465</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
@@ -102,9 +102,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-7.30742</x-m>
+			<x-m>-7.432</x-m>
 			<y-m> 5.63029</y-m>
-			<z-m>-1.75465</z-m>
+			<z-m>-2.16465</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
@@ -137,7 +137,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>-0.62458</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -171,7 +171,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>-0.62458</x-m>
 			<y-m>5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -201,7 +201,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-6.5</x-m>
+			<x-m>-6.62458</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -231,7 +231,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-6.5</x-m>
+			<x-m>-6.62458</x-m>
 			<y-m>5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -241,7 +241,7 @@
 		<name>Engine fire left</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
 		<offsets>
-			<x-m>-3.84247</x-m>
+			<x-m>-3.96705</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -254,7 +254,7 @@
 		<name>Engine fire right</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
 		<offsets>
-			<x-m>-3.84247</x-m>
+			<x-m>-3.96705</x-m>
 			<y-m> 5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -276,7 +276,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.54315</x-m>
+			<x-m>-6.66773</x-m>
 			<y-m>-5.63082</y-m>
 			<z-m>-2.26943</z-m>
 		</center>
@@ -294,7 +294,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.54315</x-m>
+			<x-m>-6.66773</x-m>
 			<y-m> 5.62871</y-m>
 			<z-m>-2.26943</z-m>
 		</center>
@@ -312,7 +312,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.54315</x-m>
+			<x-m>-6.66773</x-m>
 			<y-m>-5.63082</y-m>
 			<z-m>-2.26943</z-m>
 		</center>
@@ -330,7 +330,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.54315</x-m>
+			<x-m>-6.66773</x-m>
 			<y-m> 5.62871</y-m>
 			<z-m>-2.26943</z-m>
 		</center>
@@ -388,10 +388,10 @@
 		<factor>-70</factor>
 		<property>engines/engine[0]/reverser-pos-norm</property>
 		<axis>
-			<x1-m>-4.64922</x1-m>
+			<x1-m>-4.7738</x1-m>
 			<y1-m>-6.25156</y1-m>
 			<z1-m>-1.65547</z1-m>
-			<x2-m>-4.65017</x2-m>
+			<x2-m>-4.77475</x2-m>
 			<y2-m>-6.29771</y2-m>
 			<z2-m>-1.71849</z2-m>
 		</axis>
@@ -405,12 +405,12 @@
 		<factor>-70</factor>
 		<property>engines/engine[0]/reverser-pos-norm</property>
 		<axis>
-			<x1-m>-4.65327</x1-m>
+			<x1-m>-4.77785</x1-m>
 			<y1-m>-6.29253</y1-m>
 			<z1-m>-2.82287</z1-m>
-			<x2-m>-4.65265</x2-m>
-			<y2-m>-6.24312</y2-m>
-			<z2-m>-2.89296</z2-m>
+			<x2-m>-4.77731</x2-m>
+			<y2-m>-6.2496</y2-m>
+			<z2-m>-2.88363</z2-m>
 		</axis>
 	</animation>
 	
@@ -422,10 +422,10 @@
 		<factor>70</factor>
 		<property>engines/engine[0]/reverser-pos-norm</property>
 		<axis>
-			<x1-m>-4.64922</x1-m>
+			<x1-m>-4.7738</x1-m>
 			<y1-m>-5.01022</y1-m>
 			<z1-m>-1.6555</z1-m>
-			<x2-m>-4.65017</x2-m>
+			<x2-m>-4.77475</x2-m>
 			<y2-m>-4.96408</y2-m>
 			<z2-m>-1.71852</z2-m>
 		</axis>
@@ -439,10 +439,10 @@
 		<factor>70</factor>
 		<property>engines/engine[0]/reverser-pos-norm</property>
 		<axis>
-			<x1-m>-4.65342</x1-m>
+			<x1-m>-4.778</x1-m>
 			<y1-m>-4.96919</y1-m>
 			<z1-m>-2.82264</z1-m>
-			<x2-m>-4.65288</x2-m>
+			<x2-m>-4.77746</x2-m>
 			<y2-m>-5.01209</y2-m>
 			<z2-m>-2.8834</z2-m>
 		</axis>
diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml
index 5fd843ee..58f4567a 100644
--- a/Models/Engines/XMLs/a320.v2500.xml
+++ b/Models/Engines/XMLs/a320.v2500.xml
@@ -23,7 +23,7 @@
 			</params>
 		</overlay>
 		<offsets>
-			<x-m> 4.64247</x-m>
+			<x-m> 4.51789</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -41,7 +41,7 @@
 			</params>
 		</overlay>
 		<offsets>
-			<x-m> 4.64247</x-m>
+			<x-m> 4.51789</x-m>
 			<y-m> 5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -71,7 +71,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-7.30742</x-m>
+			<x-m>-7.432</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-2.16465</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -102,7 +102,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-7.30742</x-m>
+			<x-m>-7.432</x-m>
 			<y-m> 5.63029</y-m>
 			<z-m>-2.16465</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -137,7 +137,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>-0.62458</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -171,7 +171,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>-0.62458</x-m>
 			<y-m>5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -201,7 +201,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-6.5</x-m>
+			<x-m>-6.62458</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -231,7 +231,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-6.5</x-m>
+			<x-m>-6.62458</x-m>
 			<y-m>5.63029</y-m>
 			<z-m>-5</z-m>
 		</offsets>
@@ -241,7 +241,7 @@
 		<name>Engine fire left</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
 		<offsets>
-			<x-m>-2.64247</x-m>
+			<x-m>-2.76705</x-m>
 			<y-m>-5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -254,7 +254,7 @@
 		<name>Engine fire right</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
 		<offsets>
-			<x-m>-2.64247</x-m>
+			<x-m>-2.76705</x-m>
 			<y-m> 5.63029</y-m>
 			<z-m>-2.22295</z-m>
 		</offsets>
@@ -276,7 +276,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.91135</x-m>
+			<x-m>-7.03593</x-m>
 			<y-m>-5.62875</y-m>
 			<z-m>-2.28545</z-m>
 		</center>
@@ -294,7 +294,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.91135</x-m>
+			<x-m>-7.03593</x-m>
 			<y-m> 5.62659</y-m>
 			<z-m>-2.28542</z-m>
 		</center>
@@ -312,7 +312,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.91135</x-m>
+			<x-m>-7.03593</x-m>
 			<y-m>-5.62875</y-m>
 			<z-m>-2.28545</z-m>
 		</center>
@@ -330,7 +330,7 @@
 			<z>0</z>
 		</axis>
 		<center>
-			<x-m>-6.91135</x-m>
+			<x-m>-7.03593</x-m>
 			<y-m> 5.62659</y-m>
 			<z-m>-2.28542</z-m>
 		</center>
diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml
index c675b5f9..d39dee3a 100644
--- a/Models/Fuselages/A320/fuselage.xml
+++ b/Models/Fuselages/A320/fuselage.xml
@@ -19,20 +19,27 @@
 		<object-name>Cargo3</object-name>
 		<object-name>Antenna1</object-name>
 		<object-name>Antenna2</object-name>
-		<object-name>WingtipFence</object-name>
-		<object-name>Sharklet</object-name>
 		<object-name>MLGGearDoorL</object-name>
 		<object-name>MLGGearDoorR</object-name>
 		<object-name>NLGAftDoorL</object-name>
 		<object-name>NLGAftDoorR</object-name>
 		<object-name>NLGForewardDoorL</object-name>
 		<object-name>NLGForewardDoorR</object-name>
+	</effect>
+	
+	<effect>
+		<inherits-from>Aircraft/A320-family/Models/Effects/reflection-matt</inherits-from>
+		<object-name>Wings</object-name>
+		<object-name>RatDoorL</object-name>
+		<object-name>RatDoorR</object-name>
 		<object-name>FlapL1</object-name>
 		<object-name>FlapL2</object-name>
 		<object-name>FlapR1</object-name>
 		<object-name>FlapR2</object-name>
 		<object-name>SLatL1</object-name>
 		<object-name>SlatL2</object-name>
+		<object-name>WingtipFence</object-name>
+		<object-name>Sharklet</object-name>
 		<object-name>LightWingL</object-name>
 		<object-name>AileronL</object-name>
 		<object-name>AileronR</object-name>
@@ -46,8 +53,6 @@
 		<object-name>SpoilerL3</object-name>
 		<object-name>SpoilerL4</object-name>
 		<object-name>SpoilerL5</object-name>
-		<object-name>RatDoorL</object-name>
-		<object-name>RatDoorR</object-name>
 	</effect>
 	
 	<effect>
@@ -69,10 +74,10 @@
 		<property>systems/hydraulic/sources/rat/door-position</property>
 		<factor>-105</factor>
 		<axis>
-			<x1-m>-3.4349</x1-m>
+			<x1-m>-3.55938</x1-m>
 			<y1-m>-1.75372</y1-m>
 			<z1-m>-2.21517</z1-m>
-			<x2-m>-2.43981</x2-m>
+			<x2-m>-2.56435</x2-m>
 			<y2-m>-1.75542</y2-m>
 			<z2-m>-2.20495</z2-m>
 		</axis>
@@ -86,10 +91,10 @@
 		<property>systems/hydraulic/sources/rat/door-position</property>
 		<factor>135</factor>
 		<axis>
-			<x1-m>-3.4348</x1-m>
+			<x1-m>-3.55938</x1-m>
 			<y1-m>-1.53239</y1-m>
 			<z1-m>-2.3598</z1-m>
-			<x2-m>-2.43977</x2-m>
+			<x2-m>-2.56435</x2-m>
 			<y2-m>-1.53327</y2-m>
 			<z2-m>-2.35378</z2-m>
 		</axis>
@@ -103,15 +108,13 @@
 		<property>systems/hydraulic/sources/rat/arm-position</property>
 		<factor>-90</factor>
 		<offset-deg>90</offset-deg>
-		<center>
-			<x-m>-2.46547</x-m>
-			<y-m>-1.64941</y-m>
-			<z-m>-2.20802</z-m>
-		</center>
 		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
+			<x1-m>-2.58751</x1-m>
+			<y1-m>-1.68915</y1-m>
+			<z1-m>-2.20464</z1-m>
+			<x2-m>-2.58751</x2-m>
+			<y2-m>-1.59255</y2-m>
+			<z2-m>-2.23052</z2-m>
 		</axis>
 	</animation>
 	
@@ -127,9 +130,9 @@
 			</greater-than>
 		</condition>
 		<center>
-			<x-m>-2.66533</x-m>
-			<y-m>-1.64941</y-m>
-			<z-m>-2.79509</z-m>
+			<x-m>-2.78737</x-m>
+			<y-m>-1.7928</y-m>
+			<z-m>-2.78465</z-m>
 		</center>
 		<axis>
 			<x>1</x>
@@ -148,10 +151,10 @@
 		<property>sim/multiplay/generic/float[8]</property>
 		<factor>1</factor>
 		<axis>
-			<x1-m>14.9152</x1-m>
+			<x1-m>14.7906</x1-m>
 			<y1-m>0.00216</y1-m>
 			<z1-m>1.96737</z1-m>
-			<x2-m>17.4201</x2-m>
+			<x2-m>17.29552</x2-m>
 			<y2-m>0.000904</y2-m>
 			<z2-m>7.71235</z2-m>
 		</axis>
@@ -165,12 +168,12 @@
 		<property>sim/multiplay/generic/float[4]</property>
 		<factor>-1</factor>
 		<axis>
-			<x1-m>15.6955</x1-m>
+			<x1-m>15.586</x1-m>
 			<y1-m>-0.92572</y1-m>
-			<z1-m>0.649405</z1-m>
-			<x2-m>17.553</x2-m>
-			<y2-m>-6.08356</y2-m>
-			<z2-m>1.45399</z2-m>
+			<z1-m>0.659407</z1-m>
+			<x2-m>17.4453</x2-m>
+			<y2-m>-6.12819</y2-m>
+			<z2-m>1.4795</z2-m>
 		</axis>
 	</animation>
 	
@@ -181,12 +184,12 @@
 		<property>sim/multiplay/generic/float[5]</property>
 		<factor>-1</factor>
 		<axis>
-			<x1-m>17.553</x1-m>
-			<y1-m>6.0879</y1-m>
-			<z1-m>1.454</z1-m>
-			<x2-m>15.6955</x2-m>
+			<x1-m>17.4453</x1-m>
+			<y1-m>6.13253</y1-m>
+			<z1-m>1.4795</z1-m>
+			<x2-m>15.586</x2-m>
 			<y2-m>0.93006</y2-m>
-			<z2-m>0.649405</z2-m>
+			<z2-m>0.659407</z2-m>
 		</axis>
 	</animation>