From 023beab196274466536b2318c8447a734097fb35 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Mon, 23 Oct 2017 20:48:56 -0400
Subject: [PATCH] A32X: Animate tray tables

---
 Models/FlightDeck/a320.flightdeck.xml         | 233 +++++++++++++-----
 Models/FlightDeck/res/fd_complete.ac          |   1 +
 .../Instruments/Lower-ECAM/res/Lower-ECAM.ac  |   2 +-
 revision.txt                                  |   2 +-
 4 files changed, 181 insertions(+), 57 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 760bbd70..828750d2 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -5236,6 +5236,67 @@
 		</axis>
 	</animation-->
 	
+	<!-- Tiller -->
+	<animation>
+		<type>pick</type>
+		<object-name>tiller</object-name>
+		<object-name>tillerFo</object-name>
+		<action>
+			<button>3</button>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var a = getprop("/controls/flight/rudder");
+					a += 0.1;
+					if (a > 1) a = 1;
+					setprop("/controls/flight/rudder", a);
+				</script>
+			</binding>
+		</action>
+		<action>
+			<button>4</button>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var a = getprop("/controls/flight/rudder");
+					a -= 0.1;
+					if (abs(a) > 1) a = -1;
+					setprop("/controls/flight/rudder", a);
+				</script>
+			</binding>
+		</action>
+		<action>
+			<button>0</button>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>
+					setprop("/controls/flight/rudder", 0);
+				</script>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>tiller</object-name>
+		<property>controls/flight/rudder</property>
+		<factor>-70</factor>
+		<axis>
+			<object-name>tiller.axis</object-name>
+		</axis>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>tillerFo</object-name>
+		<property>controls/flight/rudder</property>
+		<factor>-70</factor>
+		<axis>
+			<object-name>tillerFo.axis</object-name>
+		</axis>
+	</animation>
+	
 	<!-- Throttles -->
 	<animation>
 		<name>Engine 1 throttle lever pick</name>
@@ -5431,7 +5492,7 @@
 	</animation>
 	
 	<animation>
-	<name>Reverse Thrust left lever</name>
+		<name>Reverse Thrust left lever</name>
 		<type>rotate</type>
 		<object-name>rev_l</object-name>
 		<property>controls/engines/engine[0]/reverser</property>
@@ -5449,7 +5510,7 @@
 	</animation>
 
 	<animation>
-	<name>Reverse Thrust right lever</name>
+		<name>Reverse Thrust right lever</name>
 		<type>rotate</type>
 		<object-name>rev_r</object-name>
 		<property>controls/engines/engine[1]/reverser</property>
@@ -5466,66 +5527,128 @@
 		</center>
 	</animation>
 	
-	<!-- Tiller -->
+	<!-- Tray Tables -->
 	<animation>
-		<type>pick</type>
-		<object-name>tiller</object-name>
-		<object-name>tillerFo</object-name>
-		<action>
-			<button>3</button>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var a = getprop("/controls/flight/rudder");
-					a += 0.1;
-					if (a > 1) a = 1;
-					setprop("/controls/flight/rudder", a);
-				</script>
-			</binding>
-		</action>
-		<action>
-			<button>4</button>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var a = getprop("/controls/flight/rudder");
-					a -= 0.1;
-					if (abs(a) > 1) a = -1;
-					setprop("/controls/flight/rudder", a);
-				</script>
-			</binding>
-		</action>
-		<action>
+		<type>translate</type>
+		<object-name>tray0-cpt</object-name>
+		<object-name>tray1-cpt</object-name>
+		<object-name>tray2-cpt</object-name>
+		<property>controls/tray/lefttrayext</property>
+		<interpolation>
+			<entry><ind>0.00</ind><dep> 0.000</dep></entry>
+			<entry><ind>0.48</ind><dep>-0.280</dep></entry>
+		</interpolation>
+		<axis>
+			<x1-m>-0.49367</x1-m>
+			<y1-m>-0.52934</y1-m>
+			<z1-m>0.06222</z1-m>
+			<x2-m>-0.85483</x2-m>
+			<y2-m>-0.52934</y2-m>
+			<z2-m>-0.04488</z2-m>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>rotate</type>
+		<object-name>tray1-cpt</object-name>
+		<object-name>tray2-cpt</object-name>
+		<property>controls/tray/lefttrayext</property>
+		<interpolation>
+			<entry><ind>0.47</ind><dep> 0</dep></entry>
+			<entry><ind>0.50</ind><dep>18</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>tray1-cpt.axis</object-name>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>rotate</type>
+		<object-name>tray2-cpt</object-name>
+		<property>controls/tray/lefttrayext</property>
+		<interpolation>
+			<entry><ind>0.50</ind><dep>  0</dep></entry>
+			<entry><ind>1.00</ind><dep>180</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>tray2-cpt.axis</object-name>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>translate</type>
+		<object-name>tray0-fo</object-name>
+		<object-name>tray1-fo</object-name>
+		<object-name>tray2-fo</object-name>
+		<property>controls/tray/righttrayext</property>
+		<interpolation>
+			<entry><ind>0.00</ind><dep> 0.000</dep></entry>
+			<entry><ind>0.48</ind><dep>-0.280</dep></entry>
+		</interpolation>
+		<axis>
+			<x1-m>-0.49367</x1-m>
+			<y1-m>-0.52934</y1-m>
+			<z1-m>0.06222</z1-m>
+			<x2-m>-0.85483</x2-m>
+			<y2-m>-0.52934</y2-m>
+			<z2-m>-0.04488</z2-m>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>rotate</type>
+		<object-name>tray1-fo</object-name>
+		<object-name>tray2-fo</object-name>
+		<property>controls/tray/righttrayext</property>
+		<interpolation>
+			<entry><ind>0.47</ind><dep> 0</dep></entry>
+			<entry><ind>0.50</ind><dep>18</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>tray1-fo.axis</object-name>
+		</axis>
+	</animation>
+	
+	<animation>
+		<type>rotate</type>
+		<object-name>tray2-fo</object-name>
+		<property>controls/tray/righttrayext</property>
+		<interpolation>
+			<entry><ind>0.50</ind><dep>   0</dep></entry>
+			<entry><ind>1.00</ind><dep>-180</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>tray2-fo.axis</object-name>
+		</axis>
+	</animation>
+	
+	 <animation>
+        <type>pick</type>
+		<object-name>tray0-cpt</object-name>
+		<object-name>tray1-cpt</object-name>
+		<object-name>tray2-cpt</object-name>
+        <action>
 			<button>0</button>
-			<repeatable type="bool">true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>
-					setprop("/controls/flight/rudder", 0);
-				</script>
+				<script>libraries.lTray();</script>
 			</binding>
 		</action>
-	</animation>
+    </animation>
+	
 	<animation>
-		<type>rotate</type>
-		<object-name>tiller</object-name>
-		<property>controls/flight/rudder</property>
-		<factor>-70</factor>
-		<axis>
-			<object-name>tiller.axis</object-name>
-		</axis>
-	</animation>
-	<animation>
-		<type>rotate</type>
-		<object-name>tillerFo</object-name>
-		<property>controls/flight/rudder</property>
-		<factor>-70</factor>
-		<axis>
-			<object-name>tillerFo.axis</object-name>
-		</axis>
-	</animation>
+        <type>pick</type>
+		<object-name>tray0-fo</object-name>
+		<object-name>tray1-fo</object-name>
+		<object-name>tray2-fo</object-name>
+        <action>
+			<button>0</button>
+			<binding>
+				<command>nasal</command>
+				<script>libraries.rTray();</script>
+			</binding>
+		</action>
+    </animation>
 	
 	<!-- Z Colors -->
 	<animation>
diff --git a/Models/FlightDeck/res/fd_complete.ac b/Models/FlightDeck/res/fd_complete.ac
index 01b33bf2..f30dbac7 100644
--- a/Models/FlightDeck/res/fd_complete.ac
+++ b/Models/FlightDeck/res/fd_complete.ac
@@ -394129,6 +394129,7 @@ refs 4
 kids 0
 OBJECT poly
 name "stby_att_ind_screen"
+loc -0.000394046 0 0
 data 24
 stby_att_ind_screen.mesh
 texture "horizon.png"
diff --git a/Models/Instruments/Lower-ECAM/res/Lower-ECAM.ac b/Models/Instruments/Lower-ECAM/res/Lower-ECAM.ac
index 43365739..f2feadc5 100644
--- a/Models/Instruments/Lower-ECAM/res/Lower-ECAM.ac
+++ b/Models/Instruments/Lower-ECAM/res/Lower-ECAM.ac
@@ -4,7 +4,7 @@ OBJECT world
 kids 1
 OBJECT poly
 name "lecam.screen"
-loc 0.00180348 0.00206637 0.000124912
+loc -0.00227174 0.00206637 0.000124912
 texture "screen.png"
 crease 30.000000
 numvert 4
diff --git a/revision.txt b/revision.txt
index 6fc99cfb..bcce32e8 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-3001
\ No newline at end of file
+3002
\ No newline at end of file