fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
Jonathan Redpath 2021-10-28 21:07:13 +01:00
commit 707761d9be
5 changed files with 66 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/FlightDeck/a320.flightdeck.xml
View file

@ -7665,6 +7665,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
@ -7680,6 +7681,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</emission> </emission>
</animation> </animation>

44
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -6414,7 +6414,7 @@
<!-- Texts --> <!-- Texts -->
<text> <text>
<name>Battery-volt</name> <name>Battery-volt1</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>-0.057</y-m> <y-m>-0.057</y-m>
@ -6440,7 +6440,7 @@
</text> </text>
<text> <text>
<name>Battery-volt-test</name> <name>Battery-volt1-test</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>-0.057</y-m> <y-m>-0.057</y-m>
@ -6466,7 +6466,7 @@
</text> </text>
<text> <text>
<name>Battery-volt</name> <name>Battery-volt2</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>0.035</y-m> <y-m>0.035</y-m>
@ -6492,7 +6492,7 @@
</text> </text>
<text> <text>
<name>Battery-volt-test</name> <name>Battery-volt2-test</name>
<offsets> <offsets>
<x-m>-0.008</x-m> <x-m>-0.008</x-m>
<y-m>0.035</y-m> <y-m>0.035</y-m>
@ -6519,7 +6519,8 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Battery-volt</object-name> <object-name>Battery-volt1</object-name>
<object-name>Battery-volt2</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -6530,7 +6531,8 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Battery-volt-test</object-name> <object-name>Battery-volt1-test</object-name>
<object-name>Battery-volt2-test</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -6539,6 +6541,36 @@
</condition> </condition>
</animation> </animation>
<animation>
<type>material</type>
<object-name>Battery-volt1</object-name>
<object-name>Battery-volt2</object-name>
<object-name>Battery-volt1-test</object-name>
<object-name>Battery-volt2-test</object-name>
<diffuse>
<red>1</red>
<green>1</green>
<blue>1</blue>
<factor-prop>controls/lighting/overhead-panel-norm-digital</factor-prop>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
<factor-prop>controls/lighting/overhead-panel-norm-digital</factor-prop>
</emission>
</animation>
<!-- Fire Buttons --> <!-- Fire Buttons -->
<!-- Engine 1 --> <!-- Engine 1 -->

2
Models/Instruments/Radio/Radio1.xml
View file

@ -2179,6 +2179,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
@ -2194,6 +2195,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</emission> </emission>
</animation> </animation>

2
Models/Instruments/Radio/Radio2.xml
View file

@ -2179,6 +2179,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</diffuse> </diffuse>
<ambient> <ambient>
<red>0</red> <red>0</red>
@ -2194,6 +2195,7 @@
<red>1.00</red> <red>1.00</red>
<green>0.355</green> <green>0.355</green>
<blue>0.00</blue> <blue>0.00</blue>
<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
</emission> </emission>
</animation> </animation>

22
Systems/a320-lights-proprules.xml
View file

@ -25,6 +25,17 @@
<output>/controls/lighting/main-panel-norm</output> <output>/controls/lighting/main-panel-norm</output>
</filter> </filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>
<property>/controls/lighting/main-panel-norm-tied</property>
<min>0.15</min>
<max>1.0</max>
</input>
<output>/controls/lighting/main-panel-norm-digital</output>
</filter>
<filter> <filter>
<type>gain</type> <type>gain</type>
<gain>1.0</gain> <gain>1.0</gain>
@ -32,6 +43,17 @@
<output>/controls/lighting/overhead-panel-norm</output> <output>/controls/lighting/overhead-panel-norm</output>
</filter> </filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>
<property>/controls/lighting/overhead-panel-norm-tied</property>
<min>0.15</min>
<max>1.0</max>
</input>
<output>/controls/lighting/overhead-panel-norm-digital</output>
</filter>
<filter> <filter>
<type>gain</type> <type>gain</type>
<gain>1.0</gain> <gain>1.0</gain>