A32X: make the strobe lights flash twice, and fix the formatting of some .eff / .xml files

This commit is contained in:
Jonathan Redpath 2017-11-07 18:30:40 -04:00
parent 8e3e7fd2e6
commit 26d957a441
4 changed files with 55 additions and 57 deletions

View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PropertyList> <PropertyList>
<name>IDG-A32X-interior</name> <name>IDG-A32X-interior</name>
<inherits-from>Effects/model-interior</inherits-from> <inherits-from>Effects/model-interior</inherits-from>
<parameters> <parameters>
<texture n="4"> <texture n="4">
<type>cubemap</type> <type>cubemap</type>
<images> <images>
<positive-x>res/0004.png</positive-x> <positive-x>res/0004.png</positive-x>
<negative-x>res/0002.png</negative-x> <negative-x>res/0002.png</negative-x>
<positive-y>res/0001.png</positive-y> <positive-y>res/0001.png</positive-y>
<negative-y>res/0003.png</negative-y> <negative-y>res/0003.png</negative-y>
<positive-z>res/0005.png</positive-z> <positive-z>res/0005.png</positive-z>
<negative-z>res/0006.png</negative-z> <negative-z>res/0006.png</negative-z>
</images> </images>
</texture> </texture>
<opacity-cube-center type="vec3d" n="0"> 0.6 0.0 0.7</opacity-cube-center> <opacity-cube-center type="vec3d" n="0"> 0.6 0.0 0.7</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1 1 1</opacity-cube-scale> <opacity-cube-scale type="vec3d" n="0"> 1 1 1</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle> <opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters> </parameters>
</PropertyList> </PropertyList>

View file

@ -5875,39 +5875,39 @@
</emission> </emission>
</animation> </animation>
<effect> <effect>
<inherits-from>Models/Effects/IDG-A32X-interior</inherits-from> <inherits-from>Models/Effects/IDG-A32X-interior</inherits-from>
<object-name>fcu_panel</object-name> <object-name>fcu_panel</object-name>
<object-name>main_panel</object-name> <object-name>main_panel</object-name>
<object-name>ped_labels_1</object-name> <object-name>ped_labels_1</object-name>
<object-name>ped_labels_2</object-name> <object-name>ped_labels_2</object-name>
<object-name>carpet</object-name> <object-name>carpet</object-name>
<object-name>so.1</object-name> <object-name>so.1</object-name>
<object-name>sts.002</object-name> <object-name>sts.002</object-name>
<object-name>Seat</object-name> <object-name>Seat</object-name>
<object-name>beam_a</object-name> <object-name>beam_a</object-name>
<object-name>beam_f</object-name> <object-name>beam_f</object-name>
<object-name>wall_1</object-name> <object-name>wall_1</object-name>
<object-name>seat3.001</object-name> <object-name>seat3.001</object-name>
<object-name>seat4.002</object-name> <object-name>seat4.002</object-name>
<object-name>pedal_adjust</object-name> <object-name>pedal_adjust</object-name>
<object-name>pedals_block_capt</object-name> <object-name>pedals_block_capt</object-name>
<object-name>ped_surface</object-name> <object-name>ped_surface</object-name>
<object-name>ped_wf</object-name> <object-name>ped_wf</object-name>
<object-name>pedestal1</object-name> <object-name>pedestal1</object-name>
<object-name>pedestal2</object-name> <object-name>pedestal2</object-name>
<object-name>pedestal3</object-name> <object-name>pedestal3</object-name>
<object-name>sfl</object-name> <object-name>sfl</object-name>
<object-name>sfl.003</object-name> <object-name>sfl.003</object-name>
<object-name>sts</object-name> <object-name>sts</object-name>
<object-name>sfl.001</object-name> <object-name>sfl.001</object-name>
<object-name>sts.003</object-name> <object-name>sts.003</object-name>
<object-name>sts.001</object-name> <object-name>sts.001</object-name>
<object-name>speaker_front</object-name> <object-name>speaker_front</object-name>
<object-name>efis_box_1</object-name> <object-name>efis_box_1</object-name>
<object-name>efis_box_2</object-name> <object-name>efis_box_2</object-name>
<object-name>efis_box_3</object-name> <object-name>efis_box_3</object-name>
<object-name>efis_box_4</object-name> <object-name>efis_box_4</object-name>
</effect> </effect>
</PropertyList> </PropertyList>

View file

@ -33,7 +33,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2); var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2);
var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.015, 3], "/controls/lighting/beacon"); var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.015, 3], "/controls/lighting/beacon");
var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2); var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2);
var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.025, 1.5], "/controls/lighting/strobe"); var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.005, 0.005, 0.005, 1], "/controls/lighting/strobe");
var logo_lights = getprop("/sim/model/lights/logo-lights"); var logo_lights = getprop("/sim/model/lights/logo-lights");
var setting = getprop("/controls/lighting/nav-lights-switch"); var setting = getprop("/controls/lighting/nav-lights-switch");
var wow = getprop("/gear/gear[2]/wow"); var wow = getprop("/gear/gear[2]/wow");
@ -42,9 +42,7 @@ var slats = getprop("/controls/flight/slats");
setlistener("controls/lighting/nav-lights-switch", func { setlistener("controls/lighting/nav-lights-switch", func {
var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights"); var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights");
var setting = getprop("/controls/lighting/nav-lights-switch"); var setting = getprop("/controls/lighting/nav-lights-switch");
if (setting == 1) { if (setting == 1 or setting == 2) {
nav_lights.setBoolValue(1);
} else if (setting == 2) {
nav_lights.setBoolValue(1); nav_lights.setBoolValue(1);
} else { } else {
nav_lights.setBoolValue(0); nav_lights.setBoolValue(0);

View file

@ -1 +1 @@
3053 3054