1
0
Fork 0

Fixes from Julian Foad:

- makes instrument knobs turn at a realistic rate
- removes redundant <min> and <max> specifications*
- corrects the indentation to reflect nesting depth
- corrects some descriptive names

* E.g. if the gyro compass heading is 365, there's no point clamping the
value to 360 before drawing it.  Just using the given value is more
likely to be right - or, if it's wrong, at least we won't hide the bug.
This commit is contained in:
j4strngs 2002-11-10 20:44:17 +00:00
parent a42a06cc9e
commit 056dff7dee
4 changed files with 290 additions and 289 deletions

View file

@ -50,8 +50,6 @@ properties' values.
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property>/instrumentation/heading-indicator/indicated-heading-deg</property> <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
<min>-720.0</min>
<max>720.0</max>
<scale>-1.0</scale> <scale>-1.0</scale>
</transformation> </transformation>
</transformations> </transformations>
@ -166,7 +164,7 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>Heading Knob</name> <name>Heading Knob</name>
<texture> <texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path> <path>Aircraft/Instruments/Textures/blister.rgb</path>
@ -188,10 +186,12 @@ properties' values.
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<offset>180</offset> <property>/autopilot/settings/heading-bug-deg</property>
<scale>5.0</scale>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>Heading label</name> <name>Heading label</name>
<texture> <texture>
@ -215,11 +215,12 @@ properties' values.
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property>/autopilot/settings/heading-bug-deg</property> <property>/autopilot/settings/heading-bug-deg</property>
<scale>5.0</scale>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>OBS Knob</name> <name>OBS Knob</name>
<texture> <texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path> <path>Aircraft/Instruments/Textures/blister.rgb</path>
@ -241,7 +242,8 @@ properties' values.
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<offset>180</offset> <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
<scale>5.0</scale>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
@ -269,12 +271,11 @@ properties' values.
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property>/instrumentation/heading-indicator/indicated-heading-deg</property> <property>/instrumentation/heading-indicator/indicated-heading-deg</property>
<min>0</min> <scale>5.0</scale>
<max>360</max>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
</layers> </layers>
<actions> <actions>

View file

@ -737,7 +737,7 @@ properties' values.
</action> </action>
<action> <action>
<name>timer set hours down</name> <name>timer set minutes down</name>
<button>1</button> <button>1</button>
<x>89</x> <x>89</x>
<y>-12</y> <y>-12</y>
@ -760,7 +760,7 @@ properties' values.
</action> </action>
<action> <action>
<name>timer set hours up</name> <name>timer set minutes up</name>
<button>1</button> <button>1</button>
<x>100</x> <x>100</x>
<y>-12</y> <y>-12</y>

View file

@ -117,14 +117,14 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>pivoting vertical needle</name> <name>pivoting vertical needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
@ -153,14 +153,14 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>arcing vertical needle</name> <name>arcing vertical needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
@ -181,84 +181,84 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>pivoting glidescope needle</name> <name>pivoting glidescope needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-has-gs-needle"/> <property alias="../../../../../params/nav-has-gs-needle"/>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
<y1>0.5</y1> <y1>0.5</y1>
<x2>0.4575</x2> <x2>0.4575</x2>
<y2>1.0</y2> <y2>1.0</y2>
</texture> </texture>
<w>6</w> <w>6</w>
<h>64</h> <h>64</h>
<transformations> <transformations>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-32</offset> <offset>-32</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property alias="../../../../../params/nav-gs-needle-deflection"/> <property alias="../../../../../params/nav-gs-needle-deflection"/>
<min>-3.5</min> <min>-3.5</min>
<max>3.5</max> <max>3.5</max>
<scale>-7</scale> <scale>-7</scale>
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>32</offset> <offset>32</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<offset>90</offset> <offset>90</offset>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>sliding glidescope needle</name> <name>sliding glidescope needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-has-gs-needle"/> <property alias="../../../../../params/nav-has-gs-needle"/>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
<y1>0.5</y1> <y1>0.5</y1>
<x2>0.4575</x2> <x2>0.4575</x2>
<y2>1.0</y2> <y2>1.0</y2>
</texture> </texture>
<w>6</w> <w>6</w>
<h>64</h> <h>64</h>
<transformations> <transformations>
<transformation> <transformation>
<type>y-shift</type> <type>y-shift</type>
<property alias="../../../../../params/nav-gs-needle-deflection"/> <property alias="../../../../../params/nav-gs-needle-deflection"/>
<min>-1</min> <min>-1</min>
<max>1</max> <max>1</max>
<scale>25.6</scale> <scale>25.6</scale>
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<offset>90</offset> <offset>90</offset>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
<!-- fix misc.rgb --> <!-- fix misc.rgb -->
@ -276,76 +276,77 @@ properties' values.
</layer> </layer>
<layer> <layer>
<name>bezel</name> <name>bezel</name>
<condition> <condition>
<not-equals> <not-equals>
<property>/sim/aero</property> <property>/sim/aero</property>
<value>c310u3a</value> <value>c310u3a</value>
</not-equals> </not-equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/bezel.rgb</path> <path>Aircraft/Instruments/Textures/bezel.rgb</path>
<x1>0.0</x1> <x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-1</offset>
</transformation>
</transformations>
</layer>
<layer>
<name>glare shield</name>
<texture>
<path>Aircraft/Instruments/Textures/bezel1.rgb</path>
<x1>0.5</x1>
<y1>0.0</y1> <y1>0.0</y1>
<x2>1.0</x2> <x2>1.0</x2>
<y2>0.5</y2> <y2>1.0</y2>
</texture> </texture>
<w>124</w> <transformations>
<h>124</h> <transformation>
<transformations>
<transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>2</offset> <offset>-1</offset>
</transformation> </transformation>
<transformation> </transformations>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer> </layer>
<layer> <layer>
<name>OBS Knob</name> <name>glare shield</name>
<texture> <texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path> <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
<x1>0.25</x1> <x1>0.5</x1>
<y1>0.75</y1> <y1>0.0</y1>
<x2>0.5</x2> <x2>1.0</x2>
<y2>1.0</y2> <y2>0.5</y2>
</texture> </texture>
<h>24</h> <w>124</w>
<w>24</w> <h>124</h>
<transformations> <transformations>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-45</offset> <offset>2</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>y-shift</type> <type>y-shift</type>
<offset>-45</offset> <offset>-2</offset>
</transformation> </transformation>
<transformation> </transformations>
<type>rotation</type> </layer>
<offset>180</offset>
</transformation> <layer>
</transformations> <name>OBS Knob</name>
<texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path>
<x1>0.25</x1>
<y1>0.75</y1>
<x2>0.5</x2>
<y2>1.0</y2>
</texture>
<h>24</h>
<w>24</w>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-45</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-45</offset>
</transformation>
<transformation>
<type>rotation</type>
<property alias="../../../../../params/nav-radial-selected"/>
<scale>5</scale>
</transformation>
</transformations>
</layer> </layer>
<layer> <layer>
@ -371,8 +372,7 @@ properties' values.
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property alias="../../../../../params/nav-radial-selected"/> <property alias="../../../../../params/nav-radial-selected"/>
<min>0</min> <scale>5</scale>
<max>360</max>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>

View file

@ -117,14 +117,14 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>pivoting vertical needle</name> <name>pivoting vertical needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
@ -153,14 +153,14 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>arcing vertical needle</name> <name>arcing vertical needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>0</value> <value>0</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
@ -181,48 +181,48 @@ properties' values.
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
<name>pivoting glidescope needle</name> <name>pivoting glidescope needle</name>
<condition> <condition>
<equals> <equals>
<property alias="../../../../../params/nav-has-gs-needle"/> <property alias="../../../../../params/nav-has-gs-needle"/>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property alias="../../../../../params/nav-needles-pivot"/> <property alias="../../../../../params/nav-needles-pivot"/>
<value>1</value> <value>1</value>
</equals> </equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/misc-1.rgb</path> <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
<x1>0.439</x1> <x1>0.439</x1>
<y1>0.5</y1> <y1>0.5</y1>
<x2>0.4575</x2> <x2>0.4575</x2>
<y2>1.0</y2> <y2>1.0</y2>
</texture> </texture>
<w>6</w> <w>6</w>
<h>64</h> <h>64</h>
<transformations> <transformations>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-32</offset> <offset>-32</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property alias="../../../../../params/nav-gs-needle-deflection"/> <property alias="../../../../../params/nav-gs-needle-deflection"/>
<min>-3.5</min> <min>-3.5</min>
<max>3.5</max> <max>3.5</max>
<scale>-7</scale> <scale>-7</scale>
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>32</offset> <offset>32</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<offset>90</offset> <offset>90</offset>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>
<layer> <layer>
@ -276,76 +276,77 @@ properties' values.
</layer> </layer>
<layer> <layer>
<name>bezel</name> <name>bezel</name>
<condition> <condition>
<not-equals> <not-equals>
<property>/sim/aero</property> <property>/sim/aero</property>
<value>c310u3a</value> <value>c310u3a</value>
</not-equals> </not-equals>
</condition> </condition>
<texture> <texture>
<path>Aircraft/Instruments/Textures/bezel.rgb</path> <path>Aircraft/Instruments/Textures/bezel.rgb</path>
<x1>0.0</x1> <x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-1</offset>
</transformation>
</transformations>
</layer>
<layer>
<name>glare shield</name>
<texture>
<path>Aircraft/Instruments/Textures/bezel1.rgb</path>
<x1>0.5</x1>
<y1>0.0</y1> <y1>0.0</y1>
<x2>1.0</x2> <x2>1.0</x2>
<y2>0.5</y2> <y2>1.0</y2>
</texture> </texture>
<w>124</w> <transformations>
<h>124</h> <transformation>
<transformations>
<transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>2</offset> <offset>-1</offset>
</transformation> </transformation>
<transformation> </transformations>
<type>y-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
</layer> </layer>
<layer> <layer>
<name>OBS Knob</name> <name>glare shield</name>
<texture> <texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path> <path>Aircraft/Instruments/Textures/bezel1.rgb</path>
<x1>0.25</x1> <x1>0.5</x1>
<y1>0.75</y1> <y1>0.0</y1>
<x2>0.5</x2> <x2>1.0</x2>
<y2>1.0</y2> <y2>0.5</y2>
</texture> </texture>
<h>24</h> <w>124</w>
<w>24</w> <h>124</h>
<transformations> <transformations>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-45</offset> <offset>2</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>y-shift</type> <type>y-shift</type>
<offset>-45</offset> <offset>-2</offset>
</transformation> </transformation>
<transformation> </transformations>
<type>rotation</type> </layer>
<offset>180</offset>
</transformation> <layer>
</transformations> <name>OBS Knob</name>
<texture>
<path>Aircraft/Instruments/Textures/blister.rgb</path>
<x1>0.25</x1>
<y1>0.75</y1>
<x2>0.5</x2>
<y2>1.0</y2>
</texture>
<h>24</h>
<w>24</w>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-45</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-45</offset>
</transformation>
<transformation>
<type>rotation</type>
<property alias="../../../../../params/nav-radial-selected"/>
<scale>5</scale>
</transformation>
</transformations>
</layer> </layer>
<layer> <layer>
@ -371,8 +372,7 @@ properties' values.
<transformation> <transformation>
<type>rotation</type> <type>rotation</type>
<property alias="../../../../../params/nav-radial-selected"/> <property alias="../../../../../params/nav-radial-selected"/>
<min>0</min> <scale>5</scale>
<max>360</max>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>