fly/fgdata
1
0
Fork 0
Code Activity

Dave Perry: parks gs needle when gs out of range, yoke-pa24 animation change to accommodate ap/joystick inputs

Browse source
This commit is contained in:
jmt 2009-11-08 18:51:39 +00:00
parent 08aca14c8a
commit c57bfe7832
4 changed files with 67 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,34 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10
MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1 MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.15 0.15 0.15 spec 0.5 0.5 0.5 shi 64 trans 0 MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.15 0.15 0.15 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world OBJECT world
kids 13 kids 14
OBJECT poly
name "GlideslopeNeedlePark"
loc -0.003005 0 -0.00318549
crease 45.000000
numvert 6
0 0.000533 0.0187818
0 0.000533 -0.0124695
0 -0.000532 -0.0124695
0 0.000533 0.00311013
0 -0.000532 0.0187818
0 -0.000532 0.00311013
numsurf 2
SURF 0x0
mat 3
refs 4
5 0 0
3 0 0
0 0 0
4 0 0
SURF 0x0
mat 3
refs 4
5 0 0
2 0 0
1 0 0
3 0 0
kids 0
OBJECT poly OBJECT poly
name "GS_out_of_range" name "GS_out_of_range"
loc -0.00480549 1.74623e-10 0.0198121 loc -0.00480549 1.74623e-10 0.0198121
@ -106,15 +133,16 @@ refs 4
2 0 0 2 0 0
kids 0 kids 0
OBJECT poly OBJECT poly
name "GlidescopeNeedle" name "GlideslopeNeedle"
loc -0.003005 0 -0.00318549
crease 45.000000 crease 45.000000
numvert 6 numvert 6
-0.003005 -0.000532 0.004932 0 -0.000532 0.00311013
-0.003005 -0.000532 0.029784 0 -0.000532 0.0187818
-0.003005 0.000533 0.004932 0 0.000533 0.00311013
-0.003005 -0.000532 -0.019774 0 -0.000532 -0.0124695
-0.003005 0.000533 -0.019774 0 0.000533 -0.0124695
-0.003005 0.000533 0.029784 0 0.000533 0.0187818
numsurf 2 numsurf 2
SURF 0x0 SURF 0x0
mat 3 mat 3
@ -133,14 +161,15 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "LocalizerNeedle" name "LocalizerNeedle"
loc -0.003005 -0.00305231 0
crease 45.000000 crease 45.000000
numvert 6 numvert 6
-0.003005 -0.019816 0.000532 0 -0.0125218 0.000532
-0.003005 0.029784 0.000532 0 0.0188207 0.000532
-0.003005 -0.019816 -0.000532 0 -0.0125218 -0.000532
-0.003005 0.029784 -0.000532 0 0.0188207 -0.000532
-0.003005 0.004974 0.000532 0 0.00314309 0.000532
-0.003005 0.004974 -0.000532 0 0.00314309 -0.000532
numsurf 2 numsurf 2
SURF 0x0 SURF 0x0
mat 3 mat 3

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

@ -17,7 +17,8 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>Face</object-name> <object-name>Face</object-name>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<object-name>GlideslopeNeedlePark</object-name>
<object-name>Ring</object-name> <object-name>Ring</object-name>
<object-name>LocalizerNeedle</object-name> <object-name>LocalizerNeedle</object-name>
<object-name>Front</object-name> <object-name>Front</object-name>
@ -65,7 +66,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<condition> <condition>
<property alias="../../../params/gs-in-range"/> <property alias="../../../params/gs-in-range"/>
</condition> </condition>
@ -82,6 +83,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>GS_out_of_range</object-name> <object-name>GS_out_of_range</object-name>
<object-name>GlideslopeNeedlePark</object-name>
<condition> <condition>
<not> <not>
<property alias="../../../../params/gs-in-range"/> <property alias="../../../../params/gs-in-range"/>
@ -119,9 +121,9 @@
<animation> <animation>
<name>GlidescopeNeedleTransform</name> <name>GlideslopeNeedleTransform</name>
<type>rotate</type> <type>rotate</type>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<property alias="../../params/nav-gs-needle-deflection"/> <property alias="../../params/nav-gs-needle-deflection"/>
<factor>-25</factor> <factor>-25</factor>
<min-deg>-25</min-deg> <min-deg>-25</min-deg>
@ -162,7 +164,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav/radials/selected-deg</property> <property>/instrumentation/nav/radials/selected-deg</property>
<step>-1</step> <step>-1</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -175,7 +177,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav/radials/selected-deg</property> <property>/instrumentation/nav/radials/selected-deg</property>
<step>-5</step> <step>-5</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -194,7 +196,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav/radials/selected-deg</property> <property>/instrumentation/nav/radials/selected-deg</property>
<step>1</step> <step>1</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -207,7 +209,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav/radials/selected-deg</property> <property>/instrumentation/nav/radials/selected-deg</property>
<step>5</step> <step>5</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -220,7 +222,7 @@
<name>Alpha Order Group</name> <name>Alpha Order Group</name>
<object-name>Face</object-name> <object-name>Face</object-name>
<object-name>LocalizerNeedleTransform</object-name> <object-name>LocalizerNeedleTransform</object-name>
<object-name>GlidescopeNeedleTransform</object-name> <object-name>GlideslopeNeedleTransform</object-name>
<object-name>RingTransform</object-name> <object-name>RingTransform</object-name>
<object-name>Front</object-name> <object-name>Front</object-name>
</animation> </animation>

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

@ -17,7 +17,8 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>Face</object-name> <object-name>Face</object-name>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<object-name>GlideslopeNeedlePark</object-name>
<object-name>Ring</object-name> <object-name>Ring</object-name>
<object-name>LocalizerNeedle</object-name> <object-name>LocalizerNeedle</object-name>
<object-name>Front</object-name> <object-name>Front</object-name>
@ -65,7 +66,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<condition> <condition>
<property alias="../../../params/gs-in-range"/> <property alias="../../../params/gs-in-range"/>
</condition> </condition>
@ -82,6 +83,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>GS_out_of_range</object-name> <object-name>GS_out_of_range</object-name>
<object-name>GlideslopeNeedlePark</object-name>
<condition> <condition>
<not> <not>
<property alias="../../../../params/gs-in-range"/> <property alias="../../../../params/gs-in-range"/>
@ -119,9 +121,9 @@
<animation> <animation>
<name>GlidescopeNeedleTransform</name> <name>GlideslopeNeedleTransform</name>
<type>rotate</type> <type>rotate</type>
<object-name>GlidescopeNeedle</object-name> <object-name>GlideslopeNeedle</object-name>
<property alias="../../params/nav-gs-needle-deflection"/> <property alias="../../params/nav-gs-needle-deflection"/>
<factor>-25</factor> <factor>-25</factor>
<min-deg>-25</min-deg> <min-deg>-25</min-deg>
@ -162,7 +164,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav[1]/radials/selected-deg</property> <property>/instrumentation/nav[1]/radials/selected-deg</property>
<step>-1</step> <step>-1</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -175,7 +177,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav[1]/radials/selected-deg</property> <property>/instrumentation/nav[1]/radials/selected-deg</property>
<step>-5</step> <step>-5</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -194,7 +196,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav[1]/radials/selected-deg</property> <property>/instrumentation/nav[1]/radials/selected-deg</property>
<step>1</step> <step>1</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -207,7 +209,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/instrumentation/nav[1]/radials/selected-deg</property> <property>/instrumentation/nav[1]/radials/selected-deg</property>
<step>5</step> <step>5</step>
<min>0</min> <min>0</min>
<max>360</max> <max>360</max>
@ -220,7 +222,7 @@
<name>Alpha Order Group</name> <name>Alpha Order Group</name>
<object-name>Face</object-name> <object-name>Face</object-name>
<object-name>LocalizerNeedleTransform</object-name> <object-name>LocalizerNeedleTransform</object-name>
<object-name>GlidescopeNeedleTransform</object-name> <object-name>GlideslopeNeedleTransform</object-name>
<object-name>RingTransform</object-name> <object-name>RingTransform</object-name>
<object-name>Front</object-name> <object-name>Front</object-name>
</animation> </animation>

4
Aircraft/Instruments-3d/yoke/yoke-pa24.xml
View file

@ -38,7 +38,7 @@
<animation> <animation>
<type>translate</type> <type>translate</type>
<group-name>Yoke-pa24</group-name> <group-name>Yoke-pa24</group-name>
<property>controls/flight/elevator</property> <property>controls/flight/elevator_in</property>
<factor>-0.09</factor> <factor>-0.09</factor>
<axis> <axis>
<x>1.0</x> <x>1.0</x>
@ -50,7 +50,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<group-name>Yoke-pa24</group-name> <group-name>Yoke-pa24</group-name>
<property>controls/flight/aileron</property> <property>controls/flight/aileron_in</property>
<factor>-80.0</factor> <factor>-80.0</factor>
<axis> <axis>
<x>1.0</x> <x>1.0</x>