fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A3XX: Move lego's lights to pedestal, make integral lights working

Browse source
This commit is contained in:
Joshua Davidson 2017-10-03 18:02:42 -04:00
parent 893cd0216b
commit 0df3d7235d
10 changed files with 126 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

@ -552,6 +552,8 @@
<landing-lights n="0" type="bool">0</landing-lights>
<landing-lights n="1" type="double">0</landing-lights>
<landing-lights n="2" type="double">0</landing-lights>
<main-flood-norm type="double">0</main-flood-norm>
<main-panel-norm type="double">0</main-panel-norm>
<nav-lights-switch type="int">0</nav-lights-switch>
<overhead-panel-norm type="double">0.0</overhead-panel-norm>
<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>

2
Models/Effects/cockpitwallconsole.eff
View file

@ -9,7 +9,7 @@
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-norm</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole.png</image>

2
Models/Effects/consolelightmap.eff
View file

@ -9,7 +9,7 @@
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-norm</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/consolelightmap.png</image>

2
Models/Effects/floorlightmap.eff
View file

@ -9,7 +9,7 @@
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-norm</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/floorlightmap.png</image>

2
Models/Effects/tiller.eff
View file

@ -9,7 +9,7 @@
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-norm</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/tiller.png</image>

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

@ -5571,6 +5571,120 @@
</action>
</animation>
<!-- Interior lights -->
<animation>
<name>Flood light pick</name>
<type>pick</type>
<object-name>cylinder09</object-name>
<action>
<button>0</button>
<button>3</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property>
<step>0.05</step>
<max>1</max>
</binding>
</action>
<action>
<button>1</button>
<button>4</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property>
<step>-0.05</step>
<min>0</min>
</binding>
</action>
</animation>
<animation>
<name>Flood light rotate</name>
<type>rotate</type>
<object-name>cylinder09</object-name>
<property>controls/lighting/main-flood-norm</property>
<interpolation>
<entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry>
</interpolation>
<axis>
<x1-m>-0.14076</x1-m>
<y1-m>-0.19698</y1-m>
<z1-m>-0.36123</z1-m>
<x2-m>-0.14321</x2-m>
<y2-m>-0.19698</y2-m>
<z2-m>-0.37223</z2-m>
</axis>
</animation>
<animation>
<name>Integrity light pick</name>
<type>pick</type>
<object-name>cylinder08</object-name>
<action>
<button>0</button>
<button>3</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property>
<step>0.05</step>
<max>1</max>
</binding>
</action>
<action>
<button>1</button>
<button>4</button>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property>
<step>-0.05</step>
<min>0</min>
</binding>
</action>
</animation>
<animation>
<name>Integrity light rotate</name>
<type>rotate</type>
<object-name>cylinder08</object-name>
<property>controls/lighting/main-panel-norm</property>
<interpolation>
<entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry>
</interpolation>
<axis>
<x1-m>-0.14076</x1-m>
<y1-m>-0.16113</y1-m>
<z1-m>-0.36123</z1-m>
<x2-m>-0.14321</x2-m>
<y2-m>-0.16113</y2-m>
<z2-m>-0.37223</z2-m>
</axis>
</animation>
<animation>
<name>Panel lighting</name>
<type>material</type>
<object-name>trans</object-name>
<object-name>trans.001</object-name>
<object-name>thr_quad_lts</object-name>
<object-name>trim_2_lts</object-name>
<object-name>ped-lts</object-name>
<object-name>ped-lts.001</object-name>
<object-name>cylinde126</object-name> <!-- Flap lever integrity -->
<object-name>rect.001</object-name> <!-- Gear lever integrity -->
<object-name>rect.004</object-name> <!-- Left chrono and side stick buttons -->
<object-name>rect.003</object-name> <!-- Right chrono and side stick buttons -->
<emission>
<red>1</red>
<green>1</green>
<blue>1</blue>
<factor-prop>controls/lighting/main-panel-norm</factor-prop>
</emission>
</animation>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/floorlightmap</inherits-from>
<object-name>object0000</object-name>
@ -5590,6 +5704,5 @@
<inherits-from>Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole</inherits-from>
<object-name>object.001</object-name>
</effect>
</PropertyList>

2
Models/FlightDeck/res/fd_complete.ac
View file

@ -217111,7 +217111,7 @@ refs 4
3 0.118804 0.015592
kids 0
OBJECT poly
name "rect.002"
name "trans.001"
loc -0.581517 -0.0463276 -0.191084
texture "main_labels.png"
crease 45.000000

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

@ -4831,10 +4831,6 @@
<command>property-toggle</command>
<property>controls/lighting/wing-lights</property>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/model/lights/floor-light</property> <!-- temporary until proper control panel for this light is made -->
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>

8
Nasal/libraries.nas
View file

@ -64,18 +64,18 @@ setlistener("controls/lighting/taxi-light-switch", func {
setlistener("controls/lighting/landing-lights[1]", func {
var landl = getprop("/controls/lighting/landing-lights[1]");
if (landl == 1) {
setprop("/sim/rendering/als-secondary-lights/use-landing-light",1);
setprop("/sim/rendering/als-secondary-lights/use-landing-light", 1);
} else {
setprop("/sim/rendering/als-secondary-lights/use-landing-light",0);
setprop("/sim/rendering/als-secondary-lights/use-landing-light", 0);
}
});
setlistener("controls/lighting/landing-lights[2]", func {
var landr = getprop("/controls/lighting/landing-lights[2]");
if (landr == 1) {
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",1);
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 1);
} else {
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",0);
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 0);
}
});

2
revision.txt
View file

@ -1 +1 @@
2019
2020