1
0
Fork 0

Removed alpha component (and switch labels) from 3D panel. That fixes

the bleed-through problem -- it occurs only when the texture has an
alpha component.  It's not a good, long-term solution, though.
This commit is contained in:
david 2002-11-19 03:36:37 +00:00
parent 6f8e2ab711
commit 06d40db457
5 changed files with 306 additions and 36 deletions

Binary file not shown.

View file

@ -0,0 +1,304 @@
<?xml version="1.0"?>
<!--
Legacy 2D instruments and actions for the 3D C172P cockpit.
-->
<!DOCTYPE PropertyList>
<PropertyList>
<name>C172P 2D instruments.</name>
<background>Aircraft/c172/Panels/Textures/transparent-bg.rgb</background>
<w>1424</w>
<h>488</h>
<view-height>500</view-height>
<instruments>
<!-- engine gauge cluster -->
<instrument include="../../Instruments/clock.xml">
<name>Chronometer</name>
<x>177</x>
<y>216</y>
<w>74</w>
<h>74</h>
</instrument>
<instrument include="../../Instruments/egt.xml">
<name>Exhaust Gas Temperature Gauge</name>
<x>177</x>
<y>142</y>
<w>74</w>
<h>74</h>
</instrument>
<instrument include="../../Instruments/fuel.xml">
<name>Fuel Gauge</name>
<x>100</x>
<y>142</y>
<w>74</w>
<h>74</h>
</instrument>
<instrument include="../../Instruments/oil.xml">
<name>Oil Gauge</name>
<x>100</x>
<y>65</y>
<w>74</w>
<h>74</h>
</instrument>
<instrument include="../../Instruments/vacamp.xml">
<name>Vacuum Pressure Gauge</name>
<x>177</x>
<y>65</y>
<w>74</w>
<h>74</h>
</instrument>
<!-- end engine gauges cluster -->
<!-- engine controls cluster -->
<instrument include="../../Instruments/rpm.xml">
<name>RPM Gauge</name>
<x>542</x>
<y>-31</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/single-magneto-switch.xml">
<name>Magneto switch panel</name>
<x>50</x>
<y>-225</y>
</instrument>
<!-- end engine controls cluster -->
<!-- sacred six -->
<instrument include="../../Instruments/asi-160-knot.xml">
<name>Airspeed Indicator</name>
<x>279</x>
<y>235</y>
<w>128</w>
<h>128</h>
</instrument>
<instrument include="../../Instruments/attitude-indicator.xml">
<name>Attitude Gyro</name>
<x>412</x>
<y>235</y>
<w>128</w>
<h>128</h>
</instrument>
<instrument include="../../Instruments/altimeter.xml">
<name>Altimeter</name>
<x>542</x>
<y>235</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/turn.xml">
<name>Turn Coordinator</name>
<x>279</x>
<y>102</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/gyro.xml">
<name>Directional Gyro</name>
<x>412</x>
<y>102</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/vertical.xml">
<name>Vertical Velocity Indicator</name>
<x>542</x>
<y>102</y>
<w>120</w>
<h>120</h>
</instrument>
<!-- end sacred six -->
<!-- radio nav instruments -->
<instrument include="../../Instruments/nav1.xml">
<name>VOR 1 Gauge</name>
<x>675</x>
<y>235</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/nav1.xml">
<name>VOR 2 Gauge</name>
<params>
<nav-to-flag>/radios/nav[1]/to-flag</nav-to-flag>
<nav-from-flag>/radios/nav[1]/from-flag</nav-from-flag>
<nav-radial-selected>/radios/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/radios/nav[1]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/radios/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>
</params>
<x>675</x>
<y>102</y>
<w>120</w>
<h>120</h>
</instrument>
<instrument include="../../Instruments/adf.xml">
<name>ADF Gauge</name>
<x>675</x>
<y>-31</y>
<w>120</w>
<h>120</h>
</instrument>
<!-- end radio nav instruments -->
<!-- radio stack -->
<instrument include="../../Instruments/markerbeacon.xml">
<name>Marker Beacon Indicators</name>
<x>786</x>
<y>261</y>
</instrument>
<instrument include="../../Instruments/navcom-radio.xml">
<name>NavCom 1 Radio</name>
<x>880</x>
<y>215</y>
</instrument>
<instrument include="../../Instruments/navcom-radio.xml">
<name>NavCom 2 Radio</name>
<params>
<comm-freq-selected-prop>/radios/comm[1]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/radios/comm[1]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/radios/nav[1]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/radios/nav[1]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/radios/nav[1]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/radios/nav[1]/ident</nav-morse-ident-toggle-prop>
</params>
<x>880</x>
<y>150</y>
</instrument>
<instrument include="../../Instruments/adf-radio.xml">
<name>ADF Radio</name>
<x>880</x>
<y>85</y>
</instrument>
<instrument include="../../Instruments/autopilot.xml">
<name>Autopilot</name>
<x>880</x>
<y>27</y>
</instrument>
<!-- end radio stack -->
<instrument include="../../Instruments/magcompass.xml">
<name>Magnetic Compass</name>
<x>712</x>
<y>412</y>
<w>85</w>
<h>50</h>
</instrument>
<instrument>
<name>3D Action Placeholder</name>
<x>712</x>
<y>0</y>
<w>1424</w>
<h>488</h>
<w-base>1424</w-base>
<h-base>488</h-base>
<layers>
<layer>
<name>background</name>
<texture>
<path>Aircraft/c172/Panels/Textures/transparent-bg.rgb</path>
<x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
</layer>
<layer>
<name>background</name>
<texture>
<path>Aircraft/c172/Panels/Textures/transparent-bg.rgb</path>
<x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
</layer>
<layer>
<name>background</name>
<texture>
<path>Aircraft/c172/Panels/Textures/transparent-bg.rgb</path>
<x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
</layer>
<layer>
<name>background</name>
<texture>
<path>Aircraft/c172/Panels/Textures/transparent-bg.rgb</path>
<x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
</layer>
<layer>
<name>background</name>
<texture>
<path>Aircraft/c172/Panels/Textures/transparent-bg.rgb</path>
<x1>0.0</x1>
<y1>0.0</y1>
<x2>1.0</x2>
<y2>1.0</y2>
</texture>
</layer>
</layers>
<actions>
<action>
<name>toggle nav lights</name>
<button>0</button>
<x>-300</x>
<y>-100</y>
<w>20</w>
<h>50</h>
<binding>
<command>property-toggle</command>
<property>/controls/lights/navigation</property>
</binding>
</action>
</actions>
</instrument>
</instruments>
</PropertyList>

View file

@ -7,7 +7,7 @@ MATERIAL "GreenLightOn" rgb 0.0 1.0 0.0 amb 1 1 1 emis 0 1 0 spec 0 0 0 shi 72
MATERIAL "RedLightOff" rgb 1.0 0.0 0.0 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 72 trans 0
MATERIAL "RedLightOn" rgb 1.0 0.0 0.0 amb 1 1 1 emis 1 0 0 spec 0 0 0 shi 72 trans 0
OBJECT world
kids 71
kids 69
OBJECT poly
name "RearNavLightOff"
texture "//textures/c172p-01.rgb"
@ -186,40 +186,6 @@ refs 4
4 1.0 1.0
kids 0
OBJECT poly
name "ElectronicsLabels"
texture "//textures/c172p-int-01.rgb"
numvert 4
-0.365281 -0.23818 0.120403
-0.365281 -0.252113 0.120403
-0.365281 -0.252113 0.162958
-0.365281 -0.23818 0.162958
numsurf 1
SURF 0x00
mat 0
refs 4
0 0.777344 0.605469
3 0.53125 0.605469
2 0.53125 0.498047
1 0.777344 0.498047
kids 0
OBJECT poly
name "ElectronicsLabels2"
texture "//textures/c172p-int-01.rgb"
numvert 4
-0.365281 -0.28534 0.114738
-0.365281 -0.299273 0.114738
-0.365281 -0.299273 0.218403
-0.365281 -0.28534 0.218403
numsurf 1
SURF 0x00
mat 0
refs 4
0 0.517578 0.605469
3 0.0 0.605469
2 0.0 0.498047
1 0.517578 0.498047
kids 0
OBJECT poly
name "LandingLightSwitch"
data 12
RockerSwitch

View file

@ -9,7 +9,7 @@
<panel>
<name>PanelInstruments</name>
<path>Aircraft/c172/Panels/c172-trans-panel.xml</path>
<path>Aircraft/c172p/Models/c172p-2d-panel.xml</path>
<bottom-left>
<x-m>-0.35</x-m>
<y-m>-0.50</y-m>