fly/fgdata
1
0
Fork 0
Code Activity

Changes from Dave Perry:

Browse source 
I put 3 patches and a sound file in this tar.  The c172p... patch
removes an unnecessary patch I submitted to the c172p.  It has no affect
on performance.  The Instruments-3d... patch adds a working skid ball to
the tc and switches the vor xmls to using params so it is easier to
edit.  It also constrains the glide-slope needle to -32 to 32 degrees.
The pa24-250... patch fixes an edit error (corrects a misnamed switch
"click", no change in performance) and adds a "squish" sound to the
primer pump action.
This commit is contained in:
david 2006-03-04 13:29:30 +00:00
parent fb63a9934b
commit 61eef54dac
5 changed files with 67 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Aircraft/Instruments-3d/tc/tc.xml
View file

@ -6,8 +6,8 @@
<animation>
<type>material</type>
<object-name>Face</object-name>
<object-name>Ball</object-name>
<object-name>Face</object-name>
<object-name>Airplane</object-name>
<emission>
<red>1.0</red>
@ -29,6 +29,32 @@
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>Ball</object-name>
<property>/instrumentation/slip-skid-ball/indicated-slip-skid</property>
<factor>5.729</factor>
<!--
From the source for slip_skid_ball.cxx, the number returned is (-z_accel/y_accel)*10.
For small theta, theta~=tan(theta) when theta is in radians. So the angle of a "ball"
undergoing z_accel and y_accel hung on the end of a string makes with the verticle
will be approximately -z_accel/y_accel radians. Converting to degrees, multiply by
180/pi=57.29, or 5.729 times the returned value. Edited by Dave Perry, 2/26/06.
-->
<min-deg>-5</min-deg>
<max-deg>5</max-deg>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0.25</z-m> <!-- Makes the radius of curvature for the glass tube ~10 inches -->
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
</PropertyList>

2
Aircraft/Instruments-3d/vor/vor.ac
View file

@ -196,7 +196,7 @@ refs 4
kids 0
OBJECT poly
name "disk"
loc 0 -0.0308515 0.0268345
loc 0 -0.0292413 0.0272215
crease 101.000000
numvert 20
0.01 0.00396059 0.00479285

29
Aircraft/Instruments-3d/vor/vor.xml
View file

@ -1,7 +1,16 @@
<?xml version="1.1"?>
<?xml version="1.0"?>
<PropertyList>
<params>
<nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag>
<nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag>
<nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-in-range>/instrumentation/nav[0]/in-range</nav-in-range>
</params>
<path>vor.ac</path>
<animation>
@ -18,7 +27,7 @@
<red>1.0</red>
<green>0.2</green>
<blue>0.0</blue>
<factor-prop>/sim/model//material/instruments/factor</factor-prop>
<factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
@ -26,7 +35,7 @@
<name>LocalizerNeedleTransform</name>
<type>rotate</type>
<object-name>LocalizerNeedle</object-name>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<property alias="../../params/nav-heading-needle-deflection"/>
<factor>-3.2</factor>
<center>
<x-m>0</x-m>
@ -44,7 +53,7 @@
<type>select</type>
<object-name>GlidescopeNeedle</object-name>
<condition>
<property>/instrumentation/nav[0]/in-range</property>
<property alias="../../../params/nav-in-range"/>
</condition>
</animation>
@ -53,7 +62,7 @@
<object-name>NAV</object-name>
<condition>
<not>
<property>/instrumentation/nav[0]/in-range</property>
<property alias="../../../../params/nav-in-range"/>
</not>
</condition>
</animation>
@ -62,7 +71,7 @@
<type>select</type>
<object-name>TO</object-name>
<condition>
<property>/instrumentation/nav[0]/to-flag</property>
<property alias="../../../params/nav-to-flag"/>
</condition>
</animation>
@ -70,7 +79,7 @@
<type>select</type>
<object-name>FR</object-name>
<condition>
<property>/instrumentation/nav[0]/from-flag</property>
<property alias="../../../params/nav-from-flag"/>
</condition>
</animation>
@ -81,8 +90,10 @@
<name>GlidescopeNeedleTransform</name>
<type>rotate</type>
<object-name>GlidescopeNeedle</object-name>
<property>/instrumentation/nav[0]/gs-needle-deflection</property>
<property alias="../../params/nav-gs-needle-deflection"/>
<factor>-3.2</factor>
<min-deg>-32</min-deg>
<max-deg>32</max-deg>
<center>
<x-m>0</x-m>
<y-m>-0.03</y-m>
@ -99,7 +110,7 @@
<name>RingTransform</name>
<type>rotate</type>
<object-name>Ring</object-name>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<property alias="../../params/nav-radial-selected"/>
<factor>-1</factor>
<axis>
<x>-1</x>

27
Aircraft/Instruments-3d/vor/vor2.xml
View file

@ -2,6 +2,15 @@
<PropertyList>
<params>
<nav-to-flag>/instrumentation/nav[1]/to-flag</nav-to-flag>
<nav-from-flag>/instrumentation/nav[1]/from-flag</nav-from-flag>
<nav-radial-selected>/instrumentation/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[1]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-in-range>/instrumentation/nav[1]/in-range</nav-in-range>
</params>
<path>vor.ac</path>
<animation>
@ -18,7 +27,7 @@
<red>1.0</red>
<green>0.2</green>
<blue>0.0</blue>
<factor-prop>/sim/model//material/instruments/factor</factor-prop>
<factor-prop>/sim/model/material/instruments/factor</factor-prop>
</emission>
</animation>
@ -26,7 +35,7 @@
<name>LocalizerNeedleTransform</name>
<type>rotate</type>
<object-name>LocalizerNeedle</object-name>
<property>/instrumentation/nav[1]/heading-needle-deflection</property>
<property alias="../../params/nav-heading-needle-deflection"/>
<factor>-3.2</factor>
<center>
<x-m>0</x-m>
@ -44,7 +53,7 @@
<type>select</type>
<object-name>GlidescopeNeedle</object-name>
<condition>
<property>/instrumentation/nav[1]/in-range</property>
<property alias="../../../params/nav-in-range"/>
</condition>
</animation>
@ -53,7 +62,7 @@
<object-name>NAV</object-name>
<condition>
<not>
<property>/instrumentation/nav[1]/in-range</property>
<property alias="../../../../params/nav-in-range"/>
</not>
</condition>
</animation>
@ -62,7 +71,7 @@
<type>select</type>
<object-name>TO</object-name>
<condition>
<property>/instrumentation/nav[1]/to-flag</property>
<property alias="../../../params/nav-to-flag"/>
</condition>
</animation>
@ -70,7 +79,7 @@
<type>select</type>
<object-name>FR</object-name>
<condition>
<property>/instrumentation/nav[1]/from-flag</property>
<property alias="../../../params/nav-from-flag"/>
</condition>
</animation>
@ -81,8 +90,10 @@
<name>GlidescopeNeedleTransform</name>
<type>rotate</type>
<object-name>GlidescopeNeedle</object-name>
<property>/instrumentation/nav[1]/gs-needle-deflection</property>
<property alias="../../params/nav-gs-needle-deflection"/>
<factor>-3.2</factor>
<min-deg>-32</min-deg>
<max-deg>32</max-deg>
<center>
<x-m>0</x-m>
<y-m>-0.03</y-m>
@ -99,7 +110,7 @@
<name>RingTransform</name>
<type>rotate</type>
<object-name>Ring</object-name>
<property>/instrumentation/nav[1]/radials/selected-deg</property>
<property alias="../../params/nav-radial-selected"/>
<factor>-1</factor>
<axis>
<x>-1</x>

8
Aircraft/c172p/Models/c172p-2d-panel.xml
View file

@ -202,14 +202,6 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
<nav-heading-needle-deflection>/instrumentation/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-has-gs-needle>/sim/instrument-options/nav[1]/has-gs-needle</nav-has-gs-needle>
<nav-needles-pivot>/sim/instrument-options/nav[1]/needles-pivot</nav-needles-pivot>
<!-- Dave Perry added a check for nav voltage in Aircraft/Instruments/navcom-kx155.xml
which won't "light up" the radio frequencies if this voltage is less than 8.0 volts.
This allows more realistic implementation of a master switch or an avionics master
switch, as is done in pa24-electrical.nas. Since the c172p has this voltage at 28 volts,
this change has no affect on the c172p. The following param is required for this to
work.
-->
<nav-com-pwr-volts-prop>/systems/electrical/outputs/nav[1]</nav-com-pwr-volts-prop>
</params>
<x>620</x>
<y>100</y>