Merge branch 'master' of github.com:it0uchpods/IDG-A32X

This commit is contained in:
Joshua Davidson 2017-12-01 17:28:44 -05:00
commit f9d0a9291f
17 changed files with 10031 additions and 9494 deletions

View file

@ -259,7 +259,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>-3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>
@ -267,11 +267,41 @@
<name>Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.81</x-m>
<y-m>0</y-m>
<x-m>7.6</x-m>
<y-m>-0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Second Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.6</x-m>
<y-m>0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Left Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffL.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>-0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Right Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffR.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Starboard landing light ALS</name>
@ -279,7 +309,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>

View file

@ -288,7 +288,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>-3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>
@ -296,11 +296,41 @@
<name>Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.81</x-m>
<y-m>0</y-m>
<x-m>7.6</x-m>
<y-m>-0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Second Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.6</x-m>
<y-m>0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Left Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffL.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>-0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Right Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffR.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Starboard landing light ALS</name>
@ -308,7 +338,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>

View file

@ -287,7 +287,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>-3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>
@ -295,11 +295,41 @@
<name>Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.81</x-m>
<y-m>0</y-m>
<x-m>7.6</x-m>
<y-m>-0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Second Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.6</x-m>
<y-m>0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Left Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffL.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>-0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Right Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffR.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Starboard landing light ALS</name>
@ -307,7 +337,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>

View file

@ -177,31 +177,31 @@
<model>
<path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
<name>l1</name>
<offsets>
<x-m>7.94</x-m>
<y-m>-0.1</y-m>
<z-m>-0.6</z-m>
<heading-deg>-8</heading-deg>
</offsets>
<condition>
<property>services/stairs/l1</property>
</condition>
<path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
<name>l1</name>
<offsets>
<x-m>7.32829</x-m>
<y-m>-0.10833</y-m>
<z-m>-0.6</z-m>
<heading-deg>-4.037</heading-deg>
</offsets>
<condition>
<property>services/stairs/l1</property>
</condition>
</model>
<model>
<path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
<name>l4</name>
<offsets>
<x-m>31.94</x-m>
<y-m>0.4</y-m>
<z-m>-0.6</z-m>
<heading-deg>6</heading-deg>
</offsets>
<condition>
<property>services/stairs/l4</property>
</condition>
<path>Aircraft/IDG-A32X/Models/Services/Stairs/stairs.xml</path>
<name>l4</name>
<offsets>
<x-m>31.68355</x-m>
<y-m>0.04962</y-m>
<z-m>-0.6</z-m>
<heading-deg>6.705</heading-deg>
</offsets>
<condition>
<property>services/stairs/l4</property>
</condition>
</model>

View file

@ -268,7 +268,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>-3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>
@ -276,11 +276,41 @@
<name>Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.81</x-m>
<y-m>0</y-m>
<x-m>7.6</x-m>
<y-m>-0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Second Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.6</x-m>
<y-m>0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Left Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffL.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>-0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Right Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffR.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Starboard landing light ALS</name>
@ -288,7 +318,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>

View file

@ -268,7 +268,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>-3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>
@ -276,11 +276,41 @@
<name>Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.81</x-m>
<y-m>0</y-m>
<x-m>7.6</x-m>
<y-m>-0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Second Nosegear landing light ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/taxilight.xml</path>
<offsets>
<x-m>7.6</x-m>
<y-m>0.1018315</y-m>
<z-m>-2.5</z-m>
</offsets>
</model>
<model>
<name>Left Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffL.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>-0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Right Turnoff ALS</name>
<path>Aircraft/IDG-A32X/Models/Lights/ALS/turnoffR.xml</path>
<offsets>
<x-m>7.7</x-m>
<y-m>0.1518315</y-m>
<z-m>-2.9</z-m>
</offsets>
</model>
<model>
<name>Starboard landing light ALS</name>
@ -288,7 +318,7 @@
<offsets>
<x-m>15.9</x-m>
<y-m>3.16</y-m>
<z-m>-1.4</z-m>
<z-m>-1.25</z-m>
</offsets>
</model>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 259 KiB

View file

@ -4876,7 +4876,62 @@
<z-m>-0.265</z-m>
</center>
</animation>
<animation>
<name>Turnoff light pick</name>
<type>pick</type>
<object-name>TurnoffLtSwtch</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/turnoff-light-switch</property>
<value>0</value>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>
</binding>
</action>
<action>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/turnoff-light-switch</property>
<value>1</value>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>
</binding>
</action>
</animation>
<animation>
<name>turnoff light rotate</name>
<type>rotate</type>
<object-name>TurnoffLtSwtch</object-name>
<property>controls/lighting/turnoff-light-switch</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>
</interpolation>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
<center>
<x-m>-0.01</x-m>
<y-m>0</y-m>
<z-m>-0.3037</z-m>
</center>
</animation>
<animation>
<name>landing light pick</name>
<type>pick</type>
@ -4948,6 +5003,7 @@
</binding>
</action>
</animation>
<animation>
<name>landing light rotate</name>
<type>rotate</type>
@ -4968,6 +5024,7 @@
<z-m>-0.3037</z-m>
</center>
</animation>
<animation>
<name>landing light rotate</name>
<type>rotate</type>

View file

@ -65,8 +65,8 @@
<factor>6</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.5</min>
<max>80</max>
<min>0.1</min>
<max>1.5</max>
</animation>

View file

@ -65,8 +65,8 @@
<factor>6</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.5</min>
<max>80</max>
<min>0.1</min>
<max>1.5</max>
</animation>

View file

@ -65,8 +65,8 @@
<factor>3</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.5</min>
<max>80</max>
<min>0.1</min>
<max>0.8</max>
</animation>

View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/left-strobe</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.46</light_color_base_r>
<light_color_base_g type="float">0.46</light_color_base_g>
<light_color_base_b type="float">0.63</light_color_base_b>
<light_color_center_r type="float">0.98</light_color_center_r>
<light_color_center_g type="float">0.98</light_color_center_g>
<light_color_center_b type="float">0.98</light_color_center_b>
<intensity_scale type="float"><use>controls/lighting/leftturnoff</use></intensity_scale>
<pointing_x type="float">1.0</pointing_x>
<pointing_y type="float">0.75</pointing_y>
<pointing_z type="float">0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.3</inner_angle>
<outer_angle type="float">1</outer_angle>
<zero_angle type="float">0.5</zero_angle>
<outer_gain type="float">1.1</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

View file

@ -0,0 +1,73 @@
<?xml version="1.0"?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<PropertyList>
<path>landinglight.ac</path>
<nopreview/>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/lights/ALS/turnoffL</inherits-from>
<object-name>landinglightals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.75</x-offset>
<y-offset>0.75</y-offset>
<z-offset>0.75</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>landinglightals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>flash</type>
<object-name>landinglightals</object-name>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
<axis>
<x>-1</x>
<y>-0.75</y>
<z>0</z>
</axis>
<power>8</power>
<factor>6</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.15</min>
<max>0.5</max>
</animation>
</PropertyList>

View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/left-strobe</name>
<inherits-from>Effects/procedural-light</inherits-from>
<parameters>
<texture n="0">
<type>white</type>
</texture>
<light_color_base_r type="float">0.46</light_color_base_r>
<light_color_base_g type="float">0.46</light_color_base_g>
<light_color_base_b type="float">0.63</light_color_base_b>
<light_color_center_r type="float">0.98</light_color_center_r>
<light_color_center_g type="float">0.98</light_color_center_g>
<light_color_center_b type="float">0.98</light_color_center_b>
<intensity_scale type="float"><use>controls/lighting/rightturnoff</use></intensity_scale>
<pointing_x type="float"> 1.0</pointing_x>
<pointing_y type="float">-0.75</pointing_y>
<pointing_z type="float"> 0.0</pointing_z>
<is_directional type="bool">true</is_directional>
<is_strobe type="bool">false</is_strobe>
<inner_angle type="float">0.3</inner_angle>
<outer_angle type="float">1</outer_angle>
<zero_angle type="float">0.5</zero_angle>
<outer_gain type="float">1.1</outer_gain>
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
</parameters>
</PropertyList>

View file

@ -0,0 +1,73 @@
<?xml version="1.0"?>
<!--
##############################################
# Copyright (c) Joshua Davidson (it0uchpods) #
##############################################
-->
<PropertyList>
<path>landinglight.ac</path>
<nopreview/>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/lights/ALS/turnoffR</inherits-from>
<object-name>landinglightals</object-name>
</effect>
<animation>
<type>scale</type>
<x-offset>0.75</x-offset>
<y-offset>0.75</y-offset>
<z-offset>0.75</z-offset>
</animation>
<animation>
<type>dist-scale</type>
<object-name>landinglightals</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>1</dep>
</entry>
<entry>
<ind>300</ind>
<dep>4</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>8</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>flash</type>
<object-name>landinglightals</object-name>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
<axis>
<x>-1</x>
<y>0.75</y>
<z>0</z>
</axis>
<power>8</power>
<factor>6</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.15</min>
<max>0.5</max>
</animation>
</PropertyList>

File diff suppressed because it is too large Load diff

View file

@ -20,6 +20,9 @@ setprop("/controls/tray/surprise", 1);
# Lights
setprop("/sim/model/lights/nose-lights", 0);
setprop("/sim/model/lights/turnoffsw", 0);
setprop("/controls/lighting/turnoff-light-switch", 0);
setprop("/controls/lighting/leftturnoff", 0);
setprop("/controls/lighting/rightturnoff", 0);
# Oil Qty
var qty1 = math.round((rand() * 5 ) + 20, 0.1);
@ -51,6 +54,19 @@ setlistener("controls/lighting/nav-lights-switch", func {
}
});
setlistener("controls/lighting/turnoff-light-switch", func {
var left_turnoff_light = props.globals.getNode("/controls/lighting/leftturnoff");
var right_turnoff_light = props.globals.getNode("/controls/lighting/rightturnoff");
var settingT = getprop("/controls/lighting/turnoff-light-switch");
if (settingT == 1) {
left_turnoff_light.setBoolValue(1);
right_turnoff_light.setBoolValue(1);
} else {
left_turnoff_light.setBoolValue(0);
right_turnoff_light.setBoolValue(0);
}
});
setlistener("controls/lighting/taxi-light-switch", func {
var nose_lights = getprop("/sim/model/lights/nose-lights");
var settingT = getprop("/controls/lighting/taxi-light-switch");