From f6da3a38821115367c4bee12c014a9e279a804e7 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sun, 24 Jun 2007 19:38:38 +0000
Subject: [PATCH] New panel that consists of a radar screen only (activate with
 Shift-p). At the moment only the range can be changed via panel click action
 (click on the range numbers). Weather radar can be turned on in
 /instrumentation/radar/display-controls/WX. ai/mp display to come.

For those who miss the old 2D panel, just use an aircraft with a decent
panel and add --fdm=ufo for the same effect.
---
 Aircraft/ufo/Instruments/ehsi.xml            | 189 +++++++++++++++++++
 Aircraft/ufo/Instruments/empty.rgb           | Bin 0 -> 640 bytes
 Aircraft/ufo/Instruments/instrumentation.xml | 114 +++++++++++
 Aircraft/ufo/Instruments/panel.xml           |  21 +++
 Aircraft/ufo/ufo-set.xml                     |  20 +-
 5 files changed, 343 insertions(+), 1 deletion(-)
 create mode 100644 Aircraft/ufo/Instruments/ehsi.xml
 create mode 100644 Aircraft/ufo/Instruments/empty.rgb
 create mode 100644 Aircraft/ufo/Instruments/instrumentation.xml
 create mode 100644 Aircraft/ufo/Instruments/panel.xml

diff --git a/Aircraft/ufo/Instruments/ehsi.xml b/Aircraft/ufo/Instruments/ehsi.xml
new file mode 100644
index 000000000..e123f8478
--- /dev/null
+++ b/Aircraft/ufo/Instruments/ehsi.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<!-- Electronic Horizontal Situational Indicator  EHSI -->
+
+<PropertyList>
+	<name>EHSI</name>
+	<w-base>270</w-base>
+	<h-base>270</h-base>
+
+	<layers>
+		<layer>
+			<name>background</name>
+			<w>256</w>
+			<h>256</h>
+			<texture>
+				<path>Aircraft/Instruments/Textures/radar_background.rgb</path>
+				<x1>0</x1>
+				<y1>0</y1>
+				<x2>1</x2>
+				<y2>1</y2>
+			</texture>
+			<emissive>true</emissive>
+		</layer>
+
+		<layer>
+			<name>weather data</name>
+			<emissive>true</emissive>
+			<w>256</w>
+			<h>256</h>
+			<texture>
+				<path>Aircraft/Instruments/Textures/od_wxradar.rgb</path>
+				<x1>0</x1>
+				<y1>0</y1>
+				<x2>1</x2>
+				<y2>1</y2>
+			</texture>
+		</layer>
+
+		<layer>
+			<name>TACAN ID</name>
+			<type>text</type>
+			<font>helvetica_bold</font>
+			<point-size>10</point-size>
+			<color>
+				<red>0.5</red>
+				<green>1.0</green>
+				<blue>0.5</blue>
+			</color>
+			<emissive>true</emissive>
+			<condition>
+				<and>
+					<equals>
+						<property>instrumentation/tacan/in-range</property>
+						<value>true</value>
+					</equals>
+					<equals>
+						<property>instrumentation/radar/mode-control</property>
+						<value>1</value>
+					</equals>
+					<less-than-equals>
+						<property>instrumentation/tacan/indicated-distance-nm</property>
+						<property>instrumentation/radar/range</property>
+					</less-than-equals>
+					<equals>
+						<property>instrumentation/radar/display-controls/data</property>
+						<value>true</value>
+					</equals>
+				</and>
+			</condition>
+			<chunks>
+				<chunk>
+					<type>text-value</type>
+					<property>instrumentation/tacan/ident</property>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>x-shift</type>
+					<property>instrumentation/tacan/display/x-shift-scaled</property>
+				</transformation>
+				<transformation>
+					<type>y-shift</type>
+					<property>instrumentation/tacan/display/y-shift-scaled</property>
+					<offset>-15</offset>
+				</transformation>
+				<transformation>
+					<type>rotation</type>
+					<property>instrumentation/tacan/display/rotation</property>
+				</transformation>
+			</transformations>
+		</layer>
+
+		<layer>
+			<name>outer range ring</name>
+			<type>text</type>
+			<font>helvetica_bold</font>
+			<point-size>12</point-size>
+			<color>
+				<red>0.5</red>
+				<green>1.0</green>
+				<blue>0.5</blue>
+			</color>
+			<emissive>true</emissive>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>instrumentation/radar/range</property>
+					<format>%2.1f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-90</offset>
+				</transformation>
+				<transformation>
+					<type>y-shift</type>
+					<offset>66</offset>
+				</transformation>
+			</transformations>
+		</layer>
+
+		<layer>
+			<name>inner range ring</name>
+			<type>text</type>
+			<font>helvetica_bold</font>
+			<point-size>12</point-size>
+			<color>
+				<red>0.5</red>
+				<green>1.0</green>
+				<blue>0.5</blue>
+			</color>
+			<emissive>true</emissive>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>instrumentation/radar/range</property>
+					<scale>0.5</scale>
+					<format>%2.1f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-50</offset>
+				</transformation>
+				<transformation>
+					<type>y-shift</type>
+					<offset>32</offset>
+				</transformation>
+			</transformations>
+		</layer>
+	</layers>
+
+	<actions>
+		<action>
+			<name>double range</name>
+			<button>0</button>
+			<x>-93</x>
+			<y>54</y>
+			<w>32</w>
+			<h>32</h>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var p = "instrumentation/radar/range";
+					var v = getprop(p) * 2;
+					setprop(p, v > 640 ? 640 : v);
+				</script>
+			</binding>
+		</action>
+
+		<action>
+			<name>half range</name>
+			<button>0</button>
+			<x>-53</x>
+			<y>24</y>
+			<w>32</w>
+			<h>28</h>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var p = "instrumentation/radar/range";
+					var v = getprop(p) * 0.5;
+					setprop(p, v &lt; 1.25 ? 1.25 : v);
+				</script>
+			</binding>
+		</action>
+	</actions>
+</PropertyList>
diff --git a/Aircraft/ufo/Instruments/empty.rgb b/Aircraft/ufo/Instruments/empty.rgb
new file mode 100644
index 0000000000000000000000000000000000000000..be56497259e6fa042b04ab0e131f00c0734254e6
GIT binary patch
literal 640
ZcmZR)#lXnG%)kMJObnx7Gz91z0svc_0P+9;

literal 0
HcmV?d00001

diff --git a/Aircraft/ufo/Instruments/instrumentation.xml b/Aircraft/ufo/Instruments/instrumentation.xml
new file mode 100644
index 000000000..c1538487a
--- /dev/null
+++ b/Aircraft/ufo/Instruments/instrumentation.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<PropertyList>
+	<adf>
+		<name>adf</name>
+		<number>0</number>
+	</adf>
+
+	<adf>
+		<name>adf-radio</name>
+		<number>0</number>
+	</adf>
+
+	<airspeed-indicator>
+		<name>airspeed-indicator</name>
+		<number>0</number>
+		<total-pressure>/systems/pitot/total-pressure-inhg</total-pressure>
+		<static-pressure>/systems/static/pressure-inhg</static-pressure>
+	</airspeed-indicator>
+
+	<altimeter>
+		<name>altimeter</name>
+		<number>0</number>
+		<static-pressure>/systems/static/pressure-inhg</static-pressure>
+	</altimeter>
+
+	<attitude-indicator>
+		<name>attitude-indicator</name>
+		<number>0</number>
+		<suction>/systems/vacuum/suction-inhg</suction>
+	</attitude-indicator>
+
+	<clock>
+		<name>clock</name>
+		<number>0</number>
+	</clock>
+
+	<dme>
+		<name>dme</name>
+		<number>0</number>
+	</dme>
+
+	<encoder>
+		<name>encoder</name>
+		<number>0</number>
+		<static-pressure>/systems/static/pressure-inhg</static-pressure>
+	</encoder>
+
+	<marker-beacon>
+		<name>marker-beacon</name>
+		<number>0</number>
+	</marker-beacon>
+
+	<heading-indicator-fg>
+		<name>heading-indicator-fg</name>
+		<number>0</number>
+	</heading-indicator-fg>
+
+	<KT-70>
+		<name>kt-70</name>
+		<number>0</number>
+	</KT-70>
+
+	<magnetic-compass>
+		<name>magnetic-compass</name>
+		<number>0</number>
+	</magnetic-compass>
+
+	<nav-radio>
+		<name>nav</name>
+		<number>0</number>
+	</nav-radio>
+
+	<nav-radio>
+		<name>nav</name>
+		<number>1</number>
+	</nav-radio>
+
+	<slip-skid-ball>
+		<name>slip-skid-ball</name>
+		<number>0</number>
+	</slip-skid-ball>
+
+	<transponder>
+		<name>transponder</name>
+		<number>0</number>
+		<mode-c-altitude>/instrumentation/encoder/mode-c-alt-ft</mode-c-altitude>
+	</transponder>
+
+	<turn-indicator>
+		<name>turn-indicator</name>
+		<number>0</number>
+	</turn-indicator>
+
+	<vertical-speed-indicator>
+		<name>vertical-speed-indicator</name>
+		<number>0</number>
+		<static-pressure>/systems/static/pressure-inhg</static-pressure>
+	</vertical-speed-indicator>
+
+	<gps>
+		<name>gps</name>
+		<number>0</number>
+	</gps>
+
+	<wxradar>
+		<name>radar</name>
+		<number>0</number>
+	</wxradar>
+
+	<tacan>
+		<name>tacan</name>
+		<number>0</number>
+	</tacan>
+</PropertyList>
diff --git a/Aircraft/ufo/Instruments/panel.xml b/Aircraft/ufo/Instruments/panel.xml
new file mode 100644
index 000000000..669e26909
--- /dev/null
+++ b/Aircraft/ufo/Instruments/panel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE PropertyList SYSTEM "panel.dtd">
+
+<PropertyList>
+	<name>ufo radar panel</name>
+	<background>Aircraft/ufo/Instruments/empty.rgb</background>
+	<w>1024</w>
+	<h>768</h>
+	<y-offset>0</y-offset>
+	<view-height>768</view-height>
+
+	<instruments>
+		<instrument include="ehsi.xml">
+			<name>radar</name>
+			<x>128</x>
+			<y>640</y>
+			<w>256</w>
+			<h>256</h>
+		</instrument>
+	</instruments>
+</PropertyList>
diff --git a/Aircraft/ufo/ufo-set.xml b/Aircraft/ufo/ufo-set.xml
index e10974de5..0f31261d4 100644
--- a/Aircraft/ufo/ufo-set.xml
+++ b/Aircraft/ufo/ufo-set.xml
@@ -13,6 +13,7 @@
 
 		<panel>
 			<visibility>false</visibility>
+			<path>Aircraft/ufo/Instruments/panel.xml</path>
 		</panel>
 
 		<model>
@@ -20,6 +21,10 @@
 			<always-show-in-MP type="bool">false</always-show-in-MP>
 		</model>
 
+		<instrumentation>
+			<path>Aircraft/ufo/Instruments/instrumentation.xml</path>
+		</instrumentation>
+
 		<help>
 			<title>UFO</title>
 			<key>
@@ -361,7 +366,20 @@
 
 	<instrumentation>
 		<radar>
-			<debug-mode type="bool">true</debug-mode>
+			<serviceable type="bool">true</serviceable>
+			<switch type="string" archive="y">on</switch>
+			<range type="double" archive="y">40</range>
+			<mode-control type="int" archive="y">2</mode-control>
+
+			<mode type="string" archive="y">WX</mode>
+			<lightning type="bool" archive="y">true</lightning>
+			<display-mode type="string" archive="y">plan</display-mode>
+
+			<display-controls>
+				<WX type="bool" archive="y">false</WX>
+				<data type="bool" archive="y">true</data>
+				<pos type="bool" archive="y">true</pos>
+			</display-controls>
 		</radar>
 	</instrumentation>