From 5da3e4c18bb85565febb55154237c3013301d147 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Sat, 25 Feb 2006 18:16:54 +0000
Subject: [PATCH] Changes from Dave Perry:

Here is a patch that included the changes in my 2/22/06 posting plus the
3d-instrument light "emission" animations.  I also added a magnetic
compas mount and moved it forward and down to better match the real ac
and make it easier to read when adjusting the hi.  Ignore the "?" flaged
files at the beginning.  none are required.  I noticed that there is a
backup copy of pa24-250.ac in the pa24-250 folder in cvs.  It can be
deleted.  The only copy of that file required is in pa24-25/Models.

I "flew" a shake down instrument XC from 2v2 (Longmont, CO) to KLVN
(Airlake, just south of Minneapolis, MN).  Even the fuel management is
realistic.  The autopilot on the menu bar works well.  Give the changes
a try and enjoy!
---
 Aircraft/Instruments-3d/adf/adf.xml           | 13 +++++++++
 Aircraft/Instruments-3d/ai/ai.xml             | 15 ++++++++++
 Aircraft/Instruments-3d/alt/alt.xml           | 15 ++++++++++
 Aircraft/Instruments-3d/asi-pa24/asi.xml      | 12 ++++++++
 Aircraft/Instruments-3d/clock/clock.xml       | 14 ++++++++++
 Aircraft/Instruments-3d/comp/comp.xml         | 11 ++++++++
 Aircraft/Instruments-3d/egt/egt.xml           | 12 ++++++++
 .../flap-ind/flap-indicator.xml               | 12 ++++++++
 Aircraft/Instruments-3d/gps-ind/gps.xml       | 10 +++++++
 Aircraft/Instruments-3d/hi/hi.xml             | 12 ++++++++
 Aircraft/Instruments-3d/mp/mp.xml             | 28 +++++++++++++------
 .../pa24-fuel-oil-amps/pa24-fuel-amps.xml     | 17 +++++++++++
 .../pa24-fuel-oil-amps/pa24-oil.xml           | 13 +++++++++
 Aircraft/Instruments-3d/tach/tach.xml         | 12 ++++++++
 Aircraft/Instruments-3d/tc/tc.xml             | 13 +++++++++
 Aircraft/Instruments-3d/vac/vac.xml           | 12 ++++++++
 Aircraft/Instruments-3d/vor/vor.xml           | 18 ++++++++++++
 Aircraft/Instruments-3d/vor/vor2.xml          | 18 ++++++++++++
 Aircraft/Instruments-3d/vsi/vsi.xml           | 12 ++++++++
 Aircraft/Instruments/adf-radio.xml            |  7 +++++
 20 files changed, 268 insertions(+), 8 deletions(-)

diff --git a/Aircraft/Instruments-3d/adf/adf.xml b/Aircraft/Instruments-3d/adf/adf.xml
index 345f7073f..edf9e0bd1 100644
--- a/Aircraft/Instruments-3d/adf/adf.xml
+++ b/Aircraft/Instruments-3d/adf/adf.xml
@@ -4,6 +4,19 @@
 
  <path>adf.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Front</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Face</object-name>
diff --git a/Aircraft/Instruments-3d/ai/ai.xml b/Aircraft/Instruments-3d/ai/ai.xml
index 646688b3d..39825f125 100644
--- a/Aircraft/Instruments-3d/ai/ai.xml
+++ b/Aircraft/Instruments-3d/ai/ai.xml
@@ -4,6 +4,21 @@
 
  <path>ai.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Pitch</object-name>
+  <object-name>Bezel</object-name>
+  <object-name>Ring</object-name>
+  <object-name>Front</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <name>PitchTranslation</name>
   <type>translate</type>
diff --git a/Aircraft/Instruments-3d/alt/alt.xml b/Aircraft/Instruments-3d/alt/alt.xml
index 96284e10f..c90bd4b64 100644
--- a/Aircraft/Instruments-3d/alt/alt.xml
+++ b/Aircraft/Instruments-3d/alt/alt.xml
@@ -4,6 +4,21 @@
 
  <path>alt.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>inhg</object-name>
+  <object-name>Needle10000</object-name>
+  <object-name>Needle1000</object-name>
+  <object-name>Needle100</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle100</object-name>
diff --git a/Aircraft/Instruments-3d/asi-pa24/asi.xml b/Aircraft/Instruments-3d/asi-pa24/asi.xml
index bb4f1721d..5f99e4244 100644
--- a/Aircraft/Instruments-3d/asi-pa24/asi.xml
+++ b/Aircraft/Instruments-3d/asi-pa24/asi.xml
@@ -5,6 +5,18 @@
  <name>ASI</name>
  <path>asi.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
diff --git a/Aircraft/Instruments-3d/clock/clock.xml b/Aircraft/Instruments-3d/clock/clock.xml
index 71c1ff17a..4ee97cf3c 100644
--- a/Aircraft/Instruments-3d/clock/clock.xml
+++ b/Aircraft/Instruments-3d/clock/clock.xml
@@ -4,6 +4,20 @@
 
  <path>clock.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>SecondHand</object-name>
+  <object-name>MinuteHand</object-name>
+  <object-name>HourHand</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>SecondHand</object-name>
diff --git a/Aircraft/Instruments-3d/comp/comp.xml b/Aircraft/Instruments-3d/comp/comp.xml
index 0c940bf68..45eedd000 100644
--- a/Aircraft/Instruments-3d/comp/comp.xml
+++ b/Aircraft/Instruments-3d/comp/comp.xml
@@ -4,6 +4,17 @@
 
  <path>comp.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Ring</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Ring</object-name>
diff --git a/Aircraft/Instruments-3d/egt/egt.xml b/Aircraft/Instruments-3d/egt/egt.xml
index dab45048f..b94ed2ee5 100644
--- a/Aircraft/Instruments-3d/egt/egt.xml
+++ b/Aircraft/Instruments-3d/egt/egt.xml
@@ -4,6 +4,18 @@
 
  <path>egt.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
diff --git a/Aircraft/Instruments-3d/flap-ind/flap-indicator.xml b/Aircraft/Instruments-3d/flap-ind/flap-indicator.xml
index f072c3673..9770f218a 100644
--- a/Aircraft/Instruments-3d/flap-ind/flap-indicator.xml
+++ b/Aircraft/Instruments-3d/flap-ind/flap-indicator.xml
@@ -4,6 +4,18 @@
 
  <path>flap-indicator.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
diff --git a/Aircraft/Instruments-3d/gps-ind/gps.xml b/Aircraft/Instruments-3d/gps-ind/gps.xml
index d50847f76..7299a5963 100644
--- a/Aircraft/Instruments-3d/gps-ind/gps.xml
+++ b/Aircraft/Instruments-3d/gps-ind/gps.xml
@@ -4,6 +4,16 @@
 
  <path>gps.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
 
 </PropertyList>
 
diff --git a/Aircraft/Instruments-3d/hi/hi.xml b/Aircraft/Instruments-3d/hi/hi.xml
index f7ca5f6e2..63be9b985 100644
--- a/Aircraft/Instruments-3d/hi/hi.xml
+++ b/Aircraft/Instruments-3d/hi/hi.xml
@@ -4,6 +4,18 @@
 
  <path>hi.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Front</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Face</object-name>
diff --git a/Aircraft/Instruments-3d/mp/mp.xml b/Aircraft/Instruments-3d/mp/mp.xml
index 1676d692a..a6484ade1 100644
--- a/Aircraft/Instruments-3d/mp/mp.xml
+++ b/Aircraft/Instruments-3d/mp/mp.xml
@@ -4,20 +4,32 @@
 
  <path>mp.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
   <property>/engines/engine[0]/mp-osi</property>
   <interpolation>
-   <entry><ind>  0.0</ind><dep>-135 </dep></entry>     
-   <entry><ind>  10</ind><dep>-110</dep></entry>     
-   <entry><ind>  15</ind><dep> -70</dep></entry>     
-   <entry><ind> 20</ind><dep> -50 </dep></entry>     
-   <entry><ind> 25</ind><dep> -30 </dep></entry>     
+   <entry><ind>  5</ind><dep>-116 </dep></entry>     
+   <entry><ind>  10</ind><dep>-96</dep></entry>     
+   <entry><ind>  15</ind><dep> -74</dep></entry>     
+   <entry><ind> 20</ind><dep> -52 </dep></entry>     
+   <entry><ind> 25</ind><dep> -28 </dep></entry>     
    <entry><ind> 30</ind><dep>  0 </dep></entry>     
-   <entry><ind> 35</ind><dep>  30 </dep></entry>     
-   <entry><ind> 40</ind><dep>  50 </dep></entry>     
-   <entry><ind> 48</ind><dep> 90 </dep></entry>     
+   <entry><ind> 35</ind><dep>  28 </dep></entry>     
+   <entry><ind> 40</ind><dep>  56 </dep></entry>     
+   <entry><ind> 45</ind><dep> 84 </dep></entry>     
   </interpolation>
   <axis>
    <x>-1</x>
diff --git a/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-fuel-amps.xml b/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-fuel-amps.xml
index e2d72da7c..3bff1dfbd 100644
--- a/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-fuel-amps.xml
+++ b/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-fuel-amps.xml
@@ -4,6 +4,23 @@
 
  <path>pa24-fuel-amps.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>FuelAmpsFace</object-name>
+  <object-name>AmpsNeedle</object-name>
+  <object-name>FuelPressNeedle</object-name>
+  <object-name>LeftMainFuelNeedle</object-name>
+  <object-name>RightMainFuelNeedle</object-name>
+  <object-name>LeftAuxFuelNeedle</object-name>
+  <object-name>RightAuxFuelNeedle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <name>RightMainGage</name>
   <type>rotate</type>
diff --git a/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-oil.xml b/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-oil.xml
index 307bf043d..c31851ee7 100644
--- a/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-oil.xml
+++ b/Aircraft/Instruments-3d/pa24-fuel-oil-amps/pa24-oil.xml
@@ -4,6 +4,19 @@
 
  <path>pa24-oil.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>OilTempNeedle</object-name>
+  <object-name>OilPressNeedle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>OilPressNeedle</object-name>
diff --git a/Aircraft/Instruments-3d/tach/tach.xml b/Aircraft/Instruments-3d/tach/tach.xml
index 400631201..3da9898b0 100644
--- a/Aircraft/Instruments-3d/tach/tach.xml
+++ b/Aircraft/Instruments-3d/tach/tach.xml
@@ -4,6 +4,18 @@
 
  <path>tach.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
diff --git a/Aircraft/Instruments-3d/tc/tc.xml b/Aircraft/Instruments-3d/tc/tc.xml
index ea1613237..a8d0c996f 100644
--- a/Aircraft/Instruments-3d/tc/tc.xml
+++ b/Aircraft/Instruments-3d/tc/tc.xml
@@ -4,6 +4,19 @@
 
  <path>tc.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Ball</object-name>
+  <object-name>Airplane</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Airplane</object-name>
diff --git a/Aircraft/Instruments-3d/vac/vac.xml b/Aircraft/Instruments-3d/vac/vac.xml
index 9a2a13b10..d4e2dcdcb 100644
--- a/Aircraft/Instruments-3d/vac/vac.xml
+++ b/Aircraft/Instruments-3d/vac/vac.xml
@@ -4,6 +4,18 @@
 
  <path>vac.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>VacNeedle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>VacNeedle</object-name>
diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml
index 8328f024c..feba93894 100644
--- a/Aircraft/Instruments-3d/vor/vor.xml
+++ b/Aircraft/Instruments-3d/vor/vor.xml
@@ -4,6 +4,24 @@
 
  <path>vor.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>GlidescopeNeedle</object-name>
+  <object-name>Ring</object-name>
+  <object-name>LocalizerNeedle</object-name>
+  <object-name>Front</object-name>
+  <object-name>TO</object-name>
+  <object-name>FR</object-name>
+  <object-name>NAV</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <name>LocalizerNeedleTransform</name>
   <type>rotate</type>
diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml
index 631aca74a..65ae20528 100644
--- a/Aircraft/Instruments-3d/vor/vor2.xml
+++ b/Aircraft/Instruments-3d/vor/vor2.xml
@@ -4,6 +4,24 @@
 
  <path>vor.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>GlidescopeNeedle</object-name>
+  <object-name>Ring</object-name>
+  <object-name>LocalizerNeedle</object-name>
+  <object-name>Front</object-name>
+  <object-name>TO</object-name>
+  <object-name>FR</object-name>
+  <object-name>NAV</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <name>LocalizerNeedleTransform</name>
   <type>rotate</type>
diff --git a/Aircraft/Instruments-3d/vsi/vsi.xml b/Aircraft/Instruments-3d/vsi/vsi.xml
index 2b06183b3..1fea5057d 100644
--- a/Aircraft/Instruments-3d/vsi/vsi.xml
+++ b/Aircraft/Instruments-3d/vsi/vsi.xml
@@ -4,6 +4,18 @@
 
  <path>vsi.ac</path>
 
+ <animation>
+  <type>material</type>
+  <object-name>Face</object-name>
+  <object-name>Needle</object-name>
+  <emission>
+   <red>1.0</red>
+   <green>0.2</green>
+   <blue>0.0</blue>
+   <factor-prop>/sim/model//material/instruments/factor</factor-prop>
+  </emission>
+ </animation>
+
  <animation>
   <type>rotate</type>
   <object-name>Needle</object-name>
diff --git a/Aircraft/Instruments/adf-radio.xml b/Aircraft/Instruments/adf-radio.xml
index b4ba67139..72730c4d6 100644
--- a/Aircraft/Instruments/adf-radio.xml
+++ b/Aircraft/Instruments/adf-radio.xml
@@ -34,6 +34,7 @@ properties' values.
   <adf-freq-standby-prop>/instrumentation/adf/frequencies/standby-khz</adf-freq-standby-prop>
   <adf-morse-id-volume-prop>/instrumentation/adf/volume-norm</adf-morse-id-volume-prop>
   <adf-morse-ident-toggle-prop>/instrumentation/adf/ident-audible</adf-morse-ident-toggle-prop>
+  <adf-pwr-volts-prop>/systems/electrical/outputs/adf[0]</adf-pwr-volts-prop>
 </params>
 
  <layers>
@@ -51,6 +52,12 @@ properties' values.
   
   <layer>
    <name>display</name>
+   <condition>
+    <greater-than>
+     <property alias="../../../../../params/adf-pwr-volts-prop"/>
+     <value>8.0</value>
+    </greater-than>
+   </condition>
    <type>text</type>
    <font>led</font>
    <point-size>7</point-size>