1
0
Fork 0

- Make hi-res c172s instrument knobs drawn conditionally.

- HSI GS needles shouldn't disappear when they hit their limits, only when
  there is no GS signal.
- Make vac/amp gauge driven by new minimalistic amp model.
- Update digital clock face color to look more "LCD-ish" based on a real
  C172-S cockpit photo.
- Add an OAT gauge to the old C172 2d panel.
This commit is contained in:
curt 2003-05-27 19:58:52 +00:00
parent 053610a636
commit 4667e2f9f1
9 changed files with 340 additions and 5 deletions

Binary file not shown.

View file

@ -113,6 +113,12 @@ Mar 6 2003
<layer>
<name>HDG Knob</name>
<condition>
<equals>
<property>/sim/instrument-options/omit-knobs</property>
<value></value>
</equals>
</condition>
<w>100</w>
<h>100</h>
<texture>

View file

@ -0,0 +1,230 @@
<?xml version="1.0"?>
<!--
C172S Annunciator
Started May 2003 by Curtis L. Olson <curt@flightgear.org>
This is an instrument configuration file for the open-source flight
simulator FlightGear (www.flightgear.org). The file is an XML-encoded
FlightGear property list defining the instrument's layers and actions.
Each instrument is composed of layers stacked on top of each other.
A layer may be a texture (with transparent parts to show the layers
underneath), text, or a special layer that switches between two
others (say, to turn an indicator light on or off). Each layer can
move independently in proportion to a property value, and text
can be generated from property values as well: all of the layer's
movements are defined as transformations.
Actions are hotspots on the instrument that will respond to a mouse
click. Actions always modify the values of properties, either by
adjusting them, toggling them, or swaping them with other
properties' values.
-->
<PropertyList>
<name>C172S Annunciator</name>
<w-base>115</w-base>
<h-base>35</h-base>
<layers>
<layer>
<name>background</name>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.6</x1>
<y1>0.2</y1>
<x2>0.9</x2>
<y2>0.3</y2>
</texture>
<w>115</w>
<h>35</h>
</layer>
<layer>
<name>volts</name>
<condition>
<property>/instrumentation/annunciator/volts</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.0625</x1>
<y1>0.789</y1>
<x2>0.465</x2>
<y2>0.898</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-47</offset>
</transformation>
</transformations>
<w>15</w>
<h>15</h>
</layer>
<layer>
<name>left fuel tank</name>
<condition>
<property>/instrumentation/annunciator/fuel-left</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.0625</x1>
<y1>0.347</y1>
<x2>0.117</x2>
<y2>0.457</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-34</offset>
</transformation>
</transformations>
<w>4</w>
<h>15</h>
</layer>
<layer>
<name>shared fuel</name>
<condition>
<or>
<property>/instrumentation/annunciator/fuel-left</property>
<property>/instrumentation/annunciator/fuel-right</property>
</or>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.145</x1>
<y1>0.347</y1>
<x2>0.793</x2>
<y2>0.457</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-18</offset>
</transformation>
</transformations>
<w>27</w>
<h>15</h>
</layer>
<layer>
<name>right fuel tank</name>
<condition>
<property>/instrumentation/annunciator/fuel-right</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.832</x1>
<y1>0.347</y1>
<x2>0.906</x2>
<y2>0.457</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-2</offset>
</transformation>
</transformations>
<w>4</w>
<h>15</h>
</layer>
<layer>
<name>left vacuum</name>
<condition>
<property>/instrumentation/annunciator/vacuum-left</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.0625</x1>
<y1>0.496</y1>
<x2>0.117</x2>
<y2>0.609</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>6</offset>
</transformation>
</transformations>
<w>4</w>
<h>15</h>
</layer>
<layer>
<name>shared vacuum</name>
<condition>
<or>
<property>/instrumentation/annunciator/vacuum-left</property>
<property>/instrumentation/annunciator/vacuum-right</property>
</or>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.145</x1>
<y1>0.496</y1>
<x2>0.461</x2>
<y2>0.609</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>15</offset>
</transformation>
</transformations>
<w>12</w>
<h>15</h>
</layer>
<layer>
<name>right vacuum</name>
<condition>
<property>/instrumentation/annunciator/vacuum-right</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.51</x1>
<y1>0.496</y1>
<x2>0.58</x2>
<y2>0.609</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>24</offset>
</transformation>
</transformations>
<w>4</w>
<h>15</h>
</layer>
<layer>
<name>oil pressure</name>
<condition>
<property>/instrumentation/annunciator/oil-pressure</property>
</condition>
<texture>
<path>Aircraft/Instruments/Textures/ann-c172s.rgb</path>
<x1>0.0625</x1>
<y1>0.641</y1>
<x2>0.684</x2>
<y2>0.75</y2>
</texture>
<transformations>
<transformation>
<type>x-shift</type>
<offset>42</offset>
</transformation>
</transformations>
<w>24</w>
<h>15</h>
</layer>
</layers>
</PropertyList>

View file

@ -109,6 +109,12 @@ Jan 26 2003
<layer>
<name>Knob</name>
<condition>
<equals>
<property>/sim/instrument-options/omit-knobs</property>
<value></value>
</equals>
</condition>
<w>96</w>
<h>96</h>
<texture>

View file

@ -424,8 +424,8 @@ Mar 18 2003
<transformation>
<type>y-shift</type>
<property alias="../../../../../params/gs-needle"/>
<min>-11.0</min>
<max>11.0</max>
<min>-10.0</min>
<max>10.0</max>
<scale>8.35</scale>
<offset>-24</offset>
</transformation>
@ -457,8 +457,8 @@ Mar 18 2003
<transformation>
<type>y-shift</type>
<property alias="../../../../../params/gs-needle"/>
<min>-11.0</min>
<max>11.0</max>
<min>-10.0</min>
<max>10.0</max>
<scale>8.35</scale>
<offset>-24</offset>
</transformation>
@ -547,6 +547,12 @@ Mar 18 2003
<layer>
<name>HDG Knob</name>
<condition>
<equals>
<property>/sim/instrument-options/omit-knobs</property>
<value></value>
</equals>
</condition>
<w>88</w>
<h>88</h>
<texture>
@ -575,6 +581,12 @@ Mar 18 2003
<layer>
<name>OBS Knob</name>
<condition>
<equals>
<property>/sim/instrument-options/omit-knobs</property>
<value></value>
</equals>
</condition>
<w>88</w>
<h>88</h>
<texture>

View file

@ -0,0 +1,75 @@
<?xml version="1.0"?>
<!--
Simple OAT Gauge
Started May 2003 by Curtis L. Olson <curt@flightgear.org>
This is an instrument configuration file for the open-source flight
simulator FlightGear (www.flightgear.org). The file is an XML-encoded
FlightGear property list defining the instrument's layers and actions.
Each instrument is composed of layers stacked on top of each other.
A layer may be a texture (with transparent parts to show the layers
underneath), text, or a special layer that switches between two
others (say, to turn an indicator light on or off). Each layer can
move independently in proportion to a property value, and text
can be generated from property values as well: all of the layer's
movements are defined as transformations.
Actions are hotspots on the instrument that will respond to a mouse
click. Actions always modify the values of properties, either by
adjusting them, toggling them, or swaping them with other
properties' values.
-->
<PropertyList>
<name>Digital OAT</name>
<w-base>80</w-base>
<h-base>25</h-base>
<layers>
<layer>
<name>OAT background</name>
<texture>
<path>Aircraft/Instruments/Textures/faces-3.rgb</path>
<x1>0.6</x1>
<y1>0.2</y1>
<x2>0.9</x2>
<y2>0.3</y2>
</texture>
<w>80</w>
<h>25</h>
</layer>
<layer>
<name>display</name>
<type>text</type>
<font>led</font>
<point-size>6.5</point-size>
<color>
<red>0.0</red>
<green>0.0</green>
<blue>0.0</blue>
</color>
<chunks>
<chunk>
<type>number-value</type>
<property>/environment/temperature-degc</property>
<format>%.1f C</format>
</chunk>
</chunks>
<transformations>
<transformation>
<type>x-shift</type>
<offset>-20</offset>
</transformation>
<transformation>
<type>y-shift</type>
<offset>-6</offset>
</transformation>
</transformations>
</layer>
</layers>
</PropertyList>

View file

@ -18,7 +18,7 @@ Feb 9 2003
<h-base>512</h-base>
<params>
<engine-vac-select>/systems/vacuum/suction-inhg</engine-vac-select>
<engine-amp-select>/systems/electrical/suppliers/alternator</engine-amp-select>
<engine-amp-select>/systems/electrical/amps</engine-amp-select>
</params>
<layers>

View file

@ -251,6 +251,12 @@ Jan 26 2003
<layer>
<name>OBS Knob</name>
<condition>
<equals>
<property>/sim/instrument-options/omit-knobs</property>
<value></value>
</equals>
</condition>
<w>100</w>
<h>100</h>
<texture>