From 2b6cec6d25a5e9c59abd7b9a26c800085d87d601 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 13 Jun 2017 15:48:28 -0400
Subject: [PATCH] A3XX: Add Managed Altitude Target to PFD

---
 Models/Instruments/PFD/PFD1.xml      | 189 ++++++++++++++++++++++++---
 Models/Instruments/PFD/PFD2.xml      | 189 ++++++++++++++++++++++++---
 Models/Instruments/PFD/res/pfd-3d.ac |  21 ++-
 Systems/pfd.xml                      |  14 ++
 4 files changed, 376 insertions(+), 37 deletions(-)

diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 62c96092..c43a77eb 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -2733,19 +2733,73 @@
         </font-resolution>
     </text>
 	
+	<text>
+		<name>mng-alt</name>
+		<offsets>
+			<x-m>0.0010</x-m>
+			<y-m>0.0553</y-m>
+			<z-m>0.0462</z-m>
+		</offsets>
+		<alignment>right-center</alignment>
+		<axis-alignment>yz-plane</axis-alignment>
+		<type type="string">text-value</type>
+		<format type="string">%s</format>
+		<property>/it-autoflight/internal/alt</property>
+		<truncate type="bool">false</truncate>
+		<font type="string">helvetica_bold.txf</font>
+		<draw-text type="bool">true</draw-text>
+		<draw-alignment type="bool">false</draw-alignment>
+		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<character-size>0.006</character-size>
+		<font-resolution>
+			<width type="int">32</width>
+			<height type="int">32</height>
+		</font-resolution>
+	</text>
+    
+    <text>
+        <name>mng-alt-lower</name>
+        <offsets>
+            <x-m>0.0010</x-m>
+            <y-m>0.0553</y-m>
+            <z-m>-0.0462</z-m>
+        </offsets>
+        <alignment>right-center</alignment>
+        <axis-alignment>yz-plane</axis-alignment>
+        <type type="string">text-value</type>
+        <format type="string">%s</format>
+        <property>/it-autoflight/internal/alt</property>
+        <truncate type="bool">false</truncate>
+        <font type="string">helvetica_bold.txf</font>
+        <draw-text type="bool">true</draw-text>
+        <draw-alignment type="bool">false</draw-alignment>
+        <draw-boundingbox type="bool">false</draw-boundingbox>
+        <character-size>0.006</character-size>
+        <font-resolution>
+            <width type="int">32</width>
+            <height type="int">32</height>
+        </font-resolution>
+    </text>
+	
     <animation>
         <type>select</type>
         <object-name>man-alt</object-name>
         <condition>
-			<greater-than-equals>
-				<expression>
-					<dif>
-						<property>/it-autoflight/internal/alt</property>
-						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					</dif>
-				</expression>
-				<value>4300</value>
-			</greater-than-equals>
+			<and>
+				<greater-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>4300</value>
+				</greater-than-equals>
+				<not-equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</not-equals>
+			</and>
         </condition>
     </animation>
 	
@@ -2753,15 +2807,65 @@
         <type>select</type>
         <object-name>man-alt-lower</object-name>
         <condition>
-			<less-than-equals>
-				<expression>
-					<dif>
-						<property>/it-autoflight/internal/alt</property>
-						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					</dif>
-				</expression>
-				<value>-4300</value>
-			</less-than-equals>
+			<and>
+				<less-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>-4300</value>
+				</less-than-equals>
+				<not-equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</not-equals>
+			</and>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>mng-alt</object-name>
+        <condition>
+			<and>
+				<greater-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>4300</value>
+				</greater-than-equals>
+				<equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</equals>
+			</and>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>mng-alt-lower</object-name>
+        <condition>
+			<and>
+				<less-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>-4300</value>
+				</less-than-equals>
+				<equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</equals>
+			</and>
         </condition>
     </animation>
 	
@@ -2790,6 +2894,53 @@
         </transform>
     </animation>
 	
+    <animation>
+        <type>texmultiple</type>
+        <object-name>target-alt-mng</object-name>
+        <transform>
+            <subtype>textranslate</subtype>
+            <property>/it-autoflight/internal/mng-alt</property>
+            <factor>0.000019141</factor>
+            <axis>
+                <y>-1</y>
+                <x>0</x>
+                <z>0</z>
+            </axis>
+        </transform>
+        <transform>
+            <subtype>textranslate</subtype>
+            <property>/instrumentation/altimeter/indicated-altitude-ft</property>
+            <factor>0.000019141</factor>
+            <axis>
+                <y>1</y>
+                <x>0</x>
+                <z>0</z>
+            </axis>
+        </transform>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>target-alt-sel</object-name>
+        <condition>
+			<not-equals>
+				<property>/it-autoflight/output/vert</property>
+				<value>8</value>
+			</not-equals>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>target-alt-mng</object-name>
+        <condition>
+			<equals>
+				<property>/it-autoflight/output/vert</property>
+				<value>8</value>
+			</equals>
+        </condition>
+    </animation>
+	
 	<!-- VS Numbers -->
 	
 	<text>
@@ -3135,6 +3286,8 @@
 		<object-name>mng-spd-lower</object-name>
 		<object-name>mng-mach</object-name>
 		<object-name>mng-mach-lower</object-name>
+		<object-name>mng-alt</object-name>
+		<object-name>mng-alt-lower</object-name>
 		<diffuse>
 			<red>1</red>
 			<green>0</green>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 1280612a..895b3c73 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -2733,19 +2733,73 @@
         </font-resolution>
     </text>
 	
+	<text>
+		<name>mng-alt</name>
+		<offsets>
+			<x-m>0.0010</x-m>
+			<y-m>0.0553</y-m>
+			<z-m>0.0462</z-m>
+		</offsets>
+		<alignment>right-center</alignment>
+		<axis-alignment>yz-plane</axis-alignment>
+		<type type="string">text-value</type>
+		<format type="string">%s</format>
+		<property>/it-autoflight/internal/alt</property>
+		<truncate type="bool">false</truncate>
+		<font type="string">helvetica_bold.txf</font>
+		<draw-text type="bool">true</draw-text>
+		<draw-alignment type="bool">false</draw-alignment>
+		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<character-size>0.006</character-size>
+		<font-resolution>
+			<width type="int">32</width>
+			<height type="int">32</height>
+		</font-resolution>
+	</text>
+    
+    <text>
+        <name>mng-alt-lower</name>
+        <offsets>
+            <x-m>0.0010</x-m>
+            <y-m>0.0553</y-m>
+            <z-m>-0.0462</z-m>
+        </offsets>
+        <alignment>right-center</alignment>
+        <axis-alignment>yz-plane</axis-alignment>
+        <type type="string">text-value</type>
+        <format type="string">%s</format>
+        <property>/it-autoflight/internal/alt</property>
+        <truncate type="bool">false</truncate>
+        <font type="string">helvetica_bold.txf</font>
+        <draw-text type="bool">true</draw-text>
+        <draw-alignment type="bool">false</draw-alignment>
+        <draw-boundingbox type="bool">false</draw-boundingbox>
+        <character-size>0.006</character-size>
+        <font-resolution>
+            <width type="int">32</width>
+            <height type="int">32</height>
+        </font-resolution>
+    </text>
+	
     <animation>
         <type>select</type>
         <object-name>man-alt</object-name>
         <condition>
-			<greater-than-equals>
-				<expression>
-					<dif>
-						<property>/it-autoflight/internal/alt</property>
-						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					</dif>
-				</expression>
-				<value>4300</value>
-			</greater-than-equals>
+			<and>
+				<greater-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>4300</value>
+				</greater-than-equals>
+				<not-equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</not-equals>
+			</and>
         </condition>
     </animation>
 	
@@ -2753,15 +2807,65 @@
         <type>select</type>
         <object-name>man-alt-lower</object-name>
         <condition>
-			<less-than-equals>
-				<expression>
-					<dif>
-						<property>/it-autoflight/internal/alt</property>
-						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-					</dif>
-				</expression>
-				<value>-4300</value>
-			</less-than-equals>
+			<and>
+				<less-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>-4300</value>
+				</less-than-equals>
+				<not-equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</not-equals>
+			</and>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>mng-alt</object-name>
+        <condition>
+			<and>
+				<greater-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>4300</value>
+				</greater-than-equals>
+				<equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</equals>
+			</and>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>mng-alt-lower</object-name>
+        <condition>
+			<and>
+				<less-than-equals>
+					<expression>
+						<dif>
+							<property>/it-autoflight/internal/alt</property>
+							<property>/instrumentation/altimeter/indicated-altitude-ft</property>
+						</dif>
+					</expression>
+					<value>-4300</value>
+				</less-than-equals>
+				<equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>8</value>
+				</equals>
+			</and>
         </condition>
     </animation>
 	
@@ -2790,6 +2894,53 @@
         </transform>
     </animation>
 	
+    <animation>
+        <type>texmultiple</type>
+        <object-name>target-alt-mng</object-name>
+        <transform>
+            <subtype>textranslate</subtype>
+            <property>/it-autoflight/internal/mng-alt</property>
+            <factor>0.000019141</factor>
+            <axis>
+                <y>-1</y>
+                <x>0</x>
+                <z>0</z>
+            </axis>
+        </transform>
+        <transform>
+            <subtype>textranslate</subtype>
+            <property>/instrumentation/altimeter/indicated-altitude-ft</property>
+            <factor>0.000019141</factor>
+            <axis>
+                <y>1</y>
+                <x>0</x>
+                <z>0</z>
+            </axis>
+        </transform>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>target-alt-sel</object-name>
+        <condition>
+			<not-equals>
+				<property>/it-autoflight/output/vert</property>
+				<value>8</value>
+			</not-equals>
+        </condition>
+    </animation>
+	
+    <animation>
+        <type>select</type>
+        <object-name>target-alt-mng</object-name>
+        <condition>
+			<equals>
+				<property>/it-autoflight/output/vert</property>
+				<value>8</value>
+			</equals>
+        </condition>
+    </animation>
+	
 	<!-- VS Numbers -->
 	
 	<text>
@@ -3135,6 +3286,8 @@
 		<object-name>mng-spd-lower</object-name>
 		<object-name>mng-mach</object-name>
 		<object-name>mng-mach-lower</object-name>
+		<object-name>mng-alt</object-name>
+		<object-name>mng-alt-lower</object-name>
 		<diffuse>
 			<red>1</red>
 			<green>0</green>
diff --git a/Models/Instruments/PFD/res/pfd-3d.ac b/Models/Instruments/PFD/res/pfd-3d.ac
index 3f95da9f..9d986582 100644
--- a/Models/Instruments/PFD/res/pfd-3d.ac
+++ b/Models/Instruments/PFD/res/pfd-3d.ac
@@ -2,7 +2,26 @@ AC3Db
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 0 0 0  emis 0.658824 0.670588 0.67451  spec 0 0 0  shi 128  trans 0
 MATERIAL "white" rgb 1 1 1  amb 1 1 1  emis 0.798 0.798 0.798  spec 0 0 0  shi 0  trans 0
 OBJECT world
-kids 43
+kids 44
+OBJECT poly
+name "target-alt-mng"
+loc 0.000960576 -0.000264099 -0.0431903
+texture "trgt-alt-mng.png"
+crease 45.000000
+numvert 4
+0 0.0428304 -0.00623311
+0 0.0428304 0.00772078
+0 -0.0428304 0.00772078
+0 -0.0428304 -0.00623311
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.990386 0.217208
+1 0.022378 0.217208
+2 0.0223766 0.0507198
+3 0.990386 0.0507198
+kids 0
 OBJECT poly
 name "ap-mode-box"
 loc 0.000380651 0.0723146 -0.0618702
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index eab139c3..5b429c98 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -28,6 +28,20 @@
         </reference>
         <output>instrumentation/pfd/sel-alt-diff</output>
     </filter>
+	
+    <filter>
+        <name>Target alt diff (managed)</name>
+        <type>gain</type>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <gain>1.0</gain>
+        <input>
+            <property>/it-autoflight/internal/mng-alt</property>
+        </input>
+        <reference>
+            <property>instrumentation/altimeter/indicated-altitude-ft</property>
+        </reference>
+        <output>instrumentation/pfd/mng-alt-diff</output>
+    </filter>
     
     <filter>
         <name>Heading Deg</name>