This commit is contained in:
omega13a 2017-06-22 22:06:16 -07:00
commit b30256b4e9
17 changed files with 575 additions and 166 deletions

View file

@ -18,7 +18,7 @@
</livery>
</model>
<!--previews>
<previews>
<preview>
<type>exterior</type>
<splash type="bool">true</splash>
@ -29,12 +29,7 @@
<splash type="bool">true</splash>
<path>Splash/a318-2.png</path>
</preview>
<preview>
<type>exterior</type>
<splash type="bool">true</splash>
<path>Splash/a318-3.png</path>
</preview>
</previews!-->
</previews>
<view>
<name>Pilot View</name>

View file

@ -583,6 +583,7 @@
</pfd>
<old-gpws type="bool">0</old-gpws>
<steep-ils type="bool">0</steep-ils>
<steep-ils-avail type="bool">0</steep-ils-avail>
</options>
<instrumentation n="0">

View file

@ -42,6 +42,44 @@
</offsets>
</model>
<model>
<path>Aircraft/A320Family/Models/Instruments/OHpanel/OHpanelEPR.xml</path>
<condition>
<equals>
<property>/options/eng</property>
<value>IAE</value>
</equals>
</condition>
<offsets>
<x-m>-0.006166</x-m>
<y-m>0</y-m>
<z-m>0.752541</z-m>
<pitch-deg>62</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/A320Family/Models/Instruments/OHpanel/SteepAppr.xml</path>
<condition>
<and>
<equals>
<property>/options/eng</property>
<value>CFM</value>
</equals>
<equals>
<property>/options/steep-ils-avail</property>
<value>1</value>
</equals>
</and>
</condition>
<offsets>
<x-m>-0.006166</x-m>
<y-m>0</y-m>
<z-m>0.752541</z-m>
<pitch-deg>62</pitch-deg>
</offsets>
</model>
<!-- VOR Instrument -->
<model>

View file

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<path>res/ohpanelEPR.ac</path>
<!-- Panel lighting -->
<animation>
<name>Panel lighting select</name>
<type>select</type>
<object-name>MarkingLts</object-name>
<condition>
<or>
<not>
<property>controls/lighting/dome-norm</property>
</not>
<and>
<equals>
<property>controls/lighting/dome-norm</property>
<value>0.5</value>
</equals>
<greater-than>
<property>controls/lighting/overhead-panel-norm</property>
<value>0.25</value>
</greater-than>
</and>
<and>
<equals>
<property>controls/lighting/dome-norm</property>
<value>1</value>
</equals>
<greater-than>
<property>controls/lighting/overhead-panel-norm</property>
<value>0.5</value>
</greater-than>
</and>
</or>
</condition>
</animation>
<animation>
<name>Panel lighting</name>
<type>material</type>
<object-name>MarkingLts</object-name>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
</emission>
</animation>
</PropertyList>

View file

@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<path>res/SteepAppr.ac</path>
<!-- ANIMATIONS -->
<animation>
<type>select</type>
<object-name>SteepApprBtn2O</object-name>
<condition>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</animation>
<!-- Steep Approach -->
<animation>
<type>pick</type>
<object-name>SteepApprBtn1</object-name>
<object-name>SteepApprBtn2</object-name>
<object-name>SteepApprBtn2O</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<condition>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
<command>property-toggle</command>
<property>/options/steep-ils</property>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation>
<type>select</type>
<object-name>SteepApprBtn2O</object-name>
<condition>
<or>
<equals>
<property>/options/steep-ils</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<!-- Panel lighting -->
<animation>
<name>Panel lighting select</name>
<type>select</type>
<object-name>MarkingLts</object-name>
<condition>
<or>
<not>
<property>controls/lighting/dome-norm</property>
</not>
<and>
<equals>
<property>controls/lighting/dome-norm</property>
<value>0.5</value>
</equals>
<greater-than>
<property>controls/lighting/overhead-panel-norm</property>
<value>0.25</value>
</greater-than>
</and>
<and>
<equals>
<property>controls/lighting/dome-norm</property>
<value>1</value>
</equals>
<greater-than>
<property>controls/lighting/overhead-panel-norm</property>
<value>0.5</value>
</greater-than>
</and>
</or>
</condition>
</animation>
<animation>
<name>Panel lighting</name>
<type>material</type>
<object-name>MarkingLts</object-name>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
</emission>
</animation>
</PropertyList>

View file

@ -0,0 +1,164 @@
AC3Db
MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
OBJECT world
kids 4
OBJECT poly
name "SteepApprBtn2O"
loc 0.0102001 -0.168758 -0.244878
data 8
Cube.063
texture "buttons2.png"
crease 30.000000
numvert 8
-0.00349075 -0.0464 -0.0536251
-0.00592814 -0.0464 -0.0337741
-0.00295051 -0.0464 -0.0334085
-0.00051312 -0.0464 -0.0532595
-0.00349075 -0.0564 -0.0536251
-0.00592814 -0.0564 -0.0337741
-0.00295051 -0.0564 -0.0334085
-0.00051312 -0.0564 -0.0532595
numsurf 4
SURF 0x0
mat 0
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 0
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
kids 0
OBJECT poly
name "SteepApprBtn1"
loc 0.0152448 0.00304149 -0.286474
data 8
Cube.031
texture "buttons.png"
crease 30.000000
numvert 8
-0.00561947 -0.2182 -0.0116719
-0.00805682 -0.2182 0.00817901
-0.0110345 -0.2182 0.00781345
-0.0085971 -0.2182 -0.0120375
-0.00561947 -0.2082 -0.0116719
-0.00805682 -0.2082 0.00817901
-0.0110345 -0.2082 0.00781345
-0.0085971 -0.2082 -0.0120375
numsurf 4
SURF 0x0
mat 0
refs 4
4 0.5 1
7 0.5 1
6 9.31321e-008 1
5 9.31321e-008 1
SURF 0x0
mat 0
refs 4
0 0.5 0.75
4 0.5 1
5 9.31321e-008 1
1 0 0.75
SURF 0x0
mat 0
refs 4
1 0 0.75
5 9.31321e-008 1
6 9.31321e-008 1
2 0 0.75
SURF 0x0
mat 0
refs 4
4 0.5 1
0 0.5 0.75
3 0.5 0.75
7 0.5 1
kids 0
OBJECT poly
name "SteepApprBtn2"
loc 0.0152448 0.00304149 -0.286474
data 8
Cube.032
texture "buttons.png"
crease 30.000000
numvert 8
-0.0085971 -0.2182 -0.0120375
-0.0110345 -0.2182 0.00781345
-0.00805682 -0.2182 0.00817901
-0.00561947 -0.2182 -0.0116719
-0.0085971 -0.2282 -0.0120375
-0.0110345 -0.2282 0.00781345
-0.00805682 -0.2282 0.00817901
-0.00561947 -0.2282 -0.0116719
numsurf 4
SURF 0x0
mat 0
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 0
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
kids 0
OBJECT poly
name "MarkingLts"
loc 0.00126776 -5.00064e-005 -5.00083e-005
data 9
Plane.007
texture "markingsSteepAppr.png"
crease 30.000000
numvert 4
0.00329813 -0.232617 -0.270463
0.00329813 -0.1956 -0.270463
0.00775683 -0.232617 -0.306132
0.00775683 -0.1956 -0.306132
numsurf 1
SURF 0x0
mat 1
refs 4
3 0.942185 0.199076
1 0.888916 0.199076
0 0.888916 0.142127
2 0.942185 0.142127
kids 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -8,7 +8,7 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5
MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
OBJECT world
kids 273
kids 271
OBJECT poly
name "PrbWinHeatBtn2O"
loc 0.000175806 -0.17185 0.0418501
@ -15975,84 +15975,6 @@ refs 4
4 0.5 0.5
kids 0
OBJECT poly
name "Eng1N1Btn"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8
Cube.092
texture "buttons.png"
crease 30.000000
numvert 12
0.003771 -0.2157 -0.275044
0.00129 -0.2157 -0.255198
0.004267 -0.2157 -0.254826
0.006747 -0.2157 -0.274672
0.003771 -0.2257 -0.275044
0.00129 -0.2257 -0.255198
0.004267 -0.2257 -0.254826
0.006747 -0.2257 -0.274672
0.003771 -0.2057 -0.275044
0.00129 -0.2057 -0.255198
0.004267 -0.2057 -0.254826
0.006747 -0.2057 -0.274672
numsurf 8
SURF 0x0
mat 4
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 4
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 4
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 4
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
SURF 0x0
mat 4
refs 4
11 0.5 1
3 0.5 0.75
0 0.5 0.75
8 0.5 1
SURF 0x0
mat 4
refs 4
2 0 0.75
10 9.31321e-008 1
9 9.31321e-008 1
1 0 0.75
SURF 0x0
mat 4
refs 4
3 0.5 0.75
11 0.5 1
10 9.31321e-008 1
2 0 0.75
SURF 0x0
mat 4
refs 4
11 0.5 1
8 0.5 1
9 9.31321e-008 1
10 9.31321e-008 1
kids 0
OBJECT poly
name "GreenEngPump2"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8
@ -16589,84 +16511,6 @@ refs 4
4 0.5 0.5
kids 0
OBJECT poly
name "Eng2N1Btn"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8
Cube.093
texture "buttons.png"
crease 30.000000
numvert 12
0.007727 -0.2157 -0.306697
0.005247 -0.2157 -0.286852
0.008223 -0.2157 -0.28648
0.010704 -0.2157 -0.306325
0.007727 -0.2257 -0.306697
0.005247 -0.2257 -0.286852
0.008223 -0.2257 -0.28648
0.010704 -0.2257 -0.306325
0.007727 -0.2057 -0.306697
0.005247 -0.2057 -0.286852
0.008223 -0.2057 -0.28648
0.010704 -0.2057 -0.306325
numsurf 8
SURF 0x0
mat 4
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 4
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 4
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 4
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
SURF 0x0
mat 4
refs 4
11 0.5 1
3 0.5 0.75
0 0.5 0.75
8 0.5 1
SURF 0x0
mat 4
refs 4
2 0 0.75
10 9.31321e-008 1
9 9.31321e-008 1
1 0 0.75
SURF 0x0
mat 4
refs 4
3 0.5 0.75
11 0.5 1
10 9.31321e-008 1
2 0 0.75
SURF 0x0
mat 4
refs 4
11 0.5 1
8 0.5 1
9 9.31321e-008 1
10 9.31321e-008 1
kids 0
OBJECT poly
name "YellowEngPump1"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8

View file

@ -0,0 +1,182 @@
AC3Db
MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
OBJECT world
kids 3
OBJECT poly
name "Eng1N1Btn"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8
Cube.092
texture "buttons.png"
crease 30.000000
numvert 12
0.003771 -0.2157 -0.275044
0.00129 -0.2157 -0.255198
0.004267 -0.2157 -0.254826
0.006747 -0.2157 -0.274672
0.003771 -0.2257 -0.275044
0.00129 -0.2257 -0.255198
0.004267 -0.2257 -0.254826
0.006747 -0.2257 -0.274672
0.003771 -0.2057 -0.275044
0.00129 -0.2057 -0.255198
0.004267 -0.2057 -0.254826
0.006747 -0.2057 -0.274672
numsurf 8
SURF 0x0
mat 0
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 0
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
SURF 0x0
mat 0
refs 4
11 0.5 1
3 0.5 0.75
0 0.5 0.75
8 0.5 1
SURF 0x0
mat 0
refs 4
2 0 0.75
10 9.31321e-008 1
9 9.31321e-008 1
1 0 0.75
SURF 0x0
mat 0
refs 4
3 0.5 0.75
11 0.5 1
10 9.31321e-008 1
2 0 0.75
SURF 0x0
mat 0
refs 4
11 0.5 1
8 0.5 1
9 9.31321e-008 1
10 9.31321e-008 1
kids 0
OBJECT poly
name "Eng2N1Btn"
loc 0.000113685 -5.00064e-005 -4.99785e-005
data 8
Cube.093
texture "buttons.png"
crease 30.000000
numvert 12
0.007727 -0.2157 -0.306697
0.005247 -0.2157 -0.286852
0.008223 -0.2157 -0.28648
0.010704 -0.2157 -0.306325
0.007727 -0.2257 -0.306697
0.005247 -0.2257 -0.286852
0.008223 -0.2257 -0.28648
0.010704 -0.2257 -0.306325
0.007727 -0.2057 -0.306697
0.005247 -0.2057 -0.286852
0.008223 -0.2057 -0.28648
0.010704 -0.2057 -0.306325
numsurf 8
SURF 0x0
mat 0
refs 4
3 0.5 0.75
7 0.5 0.5
4 0.5 0.5
0 0.5 0.75
SURF 0x0
mat 0
refs 4
6 0 0.5
2 9.31321e-008 0.75
1 9.31321e-008 0.75
5 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
3 0.5 0.75
2 9.31321e-008 0.75
6 0 0.5
SURF 0x0
mat 0
refs 4
7 0.5 0.5
6 0 0.5
5 0 0.5
4 0.5 0.5
SURF 0x0
mat 0
refs 4
11 0.5 1
3 0.5 0.75
0 0.5 0.75
8 0.5 1
SURF 0x0
mat 0
refs 4
2 0 0.75
10 9.31321e-008 1
9 9.31321e-008 1
1 0 0.75
SURF 0x0
mat 0
refs 4
3 0.5 0.75
11 0.5 1
10 9.31321e-008 1
2 0 0.75
SURF 0x0
mat 0
refs 4
11 0.5 1
8 0.5 1
9 9.31321e-008 1
10 9.31321e-008 1
kids 0
OBJECT poly
name "MarkingLts"
loc 0.00126776 -5.00064e-005 -5.00083e-005
data 9
Plane.007
texture "markingsEPR.png"
crease 30.000000
numvert 4
0.000105106 -0.233886 -0.244919
0.00844791 -0.233886 -0.311661
0.000105106 -0.18353 -0.244919
0.00844791 -0.18353 -0.311661
numsurf 1
SURF 0x0
mat 1
refs 4
1 0.950441 0.140174
3 0.950441 0.217645
2 0.850769 0.217645
0 0.850769 0.140175
kids 0

View file

@ -12,4 +12,10 @@
</nose>
</model>
</sim>
<options>
<steep-ils type="bool">0</steep-ils>
<steep-ils-avail type="bool">0</steep-ils-avail>
</options>
</PropertyList>

View file

@ -12,4 +12,10 @@
</nose>
</model>
</sim>
<options>
<steep-ils type="bool">0</steep-ils>
<steep-ils-avail type="bool">0</steep-ils-avail>
</options>
</PropertyList>

BIN
Splash/a318-1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
Splash/a318-2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

View file

@ -398,8 +398,8 @@
<gamma>0</gamma>
<Ti>5</Ti>
<Td>0.002</Td>
<u_min>-0.5</u_min>
<u_max>0.5</u_max>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
</pid-controller>