Merge branch 'dev' into 3D
This commit is contained in:
legoboyvdlp R
commit
13de9cb1d2
6 changed files with 126719 additions and 126476 deletions
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 259 KiB |
|
|
@ -1,23 +1,62 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<!-- Trucks models and artworks courtesy of XPGoodWay Team
|
||||
(http://www.xpgoodwayteam.org/site_xpushback/) -->
|
||||
|
||||
|
||||
<path>Douglas.ac</path>
|
||||
|
||||
<!-- Lights-->
|
||||
|
||||
<model>
|
||||
<name>warning light left</name>
|
||||
<path>Aircraft/A320-family/Models/Services/Pushback/warning-light.xml</path>
|
||||
<offsets>
|
||||
<x-m>-4.308</x-m>
|
||||
<y-m>-1.08</y-m>
|
||||
<z-m>2.23</z-m>
|
||||
</offsets>
|
||||
</model>
|
||||
|
||||
<model>
|
||||
<name>warning light center</name>
|
||||
<path>Aircraft/A320-family/Models/Services/Pushback/warning-light.xml</path>
|
||||
<offsets>
|
||||
<x-m>-3.795</x-m>
|
||||
<y-m>-0.2683</y-m>
|
||||
<z-m>2.343</z-m>
|
||||
</offsets>
|
||||
</model>
|
||||
|
||||
<model>
|
||||
<name>warning light right</name>
|
||||
<path>Aircraft/A320-family/Models/Services/Pushback/warning-light.xml</path>
|
||||
<offsets>
|
||||
<x-m>-4.308</x-m>
|
||||
<y-m>0.5438</y-m>
|
||||
<z-m>2.229</z-m>
|
||||
</offsets>
|
||||
</model>
|
||||
|
||||
<!-- switch to night/day textures -->
|
||||
<animation>
|
||||
<type>textranslate</type>
|
||||
<!--<object-name>Mesh</object-name>
|
||||
<object-name>Mesh.001</object-name>
|
||||
<object-name>Mesh.002</object-name>
|
||||
<object-name>wheelfl</object-name>
|
||||
<object-name>wheelfr</object-name>
|
||||
<object-name>wheelrl</object-name>
|
||||
<object-name>wheelrr</object-name>-->
|
||||
<property>sim/time/sun-angle-rad</property>
|
||||
<step>1.60</step>
|
||||
<step>1.57</step>
|
||||
<factor>0.318471338</factor>
|
||||
<center>
|
||||
<!--<center>
|
||||
<x-m>0</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0</z-m>
|
||||
</center>
|
||||
</center>-->
|
||||
<axis>
|
||||
<x>-1</x>
|
||||
<y>0</y>
|
||||
|
|
@ -27,34 +66,90 @@
|
|||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<!--<object-name>Mesh</object-name>
|
||||
<object-name>Mesh.001</object-name>
|
||||
<object-name>Mesh.002</object-name>
|
||||
<object-name>wheelfl</object-name>
|
||||
<object-name>wheelfr</object-name>
|
||||
<object-name>wheelrl</object-name>
|
||||
<object-name>wheelrr</object-name>-->
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>sim/time/sun-angle-rad</property>
|
||||
<value>1.60</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>1</red>
|
||||
<green>1</green>
|
||||
<emission>
|
||||
<red>1</red>
|
||||
<green>1</green>
|
||||
<blue>1</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<condition>
|
||||
<less-than-equals>
|
||||
<!--<object-name>Mesh</object-name>
|
||||
<object-name>Mesh.001</object-name>
|
||||
<object-name>Mesh.002</object-name>
|
||||
<object-name>wheelfl</object-name>
|
||||
<object-name>wheelfr</object-name>
|
||||
<object-name>wheelrl</object-name>
|
||||
<object-name>wheelrr</object-name>-->
|
||||
<condition>
|
||||
<less-than-equals>
|
||||
<property>sim/time/sun-angle-rad</property>
|
||||
<value>1.60</value>
|
||||
</less-than-equals>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<emission>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>spin</type>
|
||||
<object-name>wheelfl</object-name>
|
||||
<object-name>wheelfr</object-name>
|
||||
<property>velocities/uBody-fps</property>
|
||||
<factor>-4.973</factor>
|
||||
<center>
|
||||
<x-m>-1.4081</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0.58458</z-m>
|
||||
<!--<x>0</x>
|
||||
<y>0</y>
|
||||
<z>0</z>
|
||||
<x-m>2.0501</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0.5735</z-m>-->
|
||||
</center>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>1</y>
|
||||
<z>0</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>spin</type>
|
||||
<object-name>wheelrl</object-name>
|
||||
<object-name>wheelrr</object-name>
|
||||
<property>velocities/uBody-fps</property>
|
||||
<factor>-4.973</factor>
|
||||
<center>
|
||||
<x-m>2.2942</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0.44266</z-m>
|
||||
</center>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>1</y>
|
||||
<z>0</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>select</type>
|
||||
<condition>
|
||||
|
|
@ -79,33 +174,51 @@
|
|||
</axis>
|
||||
</animation>
|
||||
|
||||
<!-- compensate for gear compression -->
|
||||
<animation>
|
||||
<type>translate</type>
|
||||
<property>gear/gear[0]/compression-ft</property>
|
||||
<factor>0.3048</factor>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<z>1</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
<!-- compensate for pitch of aircraft, keep pushback level -->
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<property>orientation/pitch-deg</property>
|
||||
<factor>-1</factor>
|
||||
<center>
|
||||
<x-m>0</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0</z-m>
|
||||
</center>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>1</y>
|
||||
<z>0</z>
|
||||
</axis>
|
||||
</animation>
|
||||
<!-- change heading of the pushback when driving the arc -->
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<property>sim/model/pushback/position-norm</property>
|
||||
<factor>-90</factor>
|
||||
<offset-deg>0</offset-deg>
|
||||
<center>
|
||||
<x-m>0</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0</z-m>
|
||||
</center>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<z>1</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
</PropertyList>
|
||||
<!-- compensate for gear compression -->
|
||||
<animation>
|
||||
<type>translate</type>
|
||||
<property>gear/gear[0]/compression-ft</property>
|
||||
<factor>0.3048</factor>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<z>1</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
<!-- compensate for pitch of aircraft, keep pushback level -->
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<property>orientation/pitch-deg</property>
|
||||
<factor>-1</factor>
|
||||
<center>
|
||||
<x-m>0</x-m>
|
||||
<y-m>0</y-m>
|
||||
<z-m>0</z-m>
|
||||
</center>
|
||||
<axis>
|
||||
<x>0</x>
|
||||
<y>1</y>
|
||||
<z>0</z>
|
||||
</axis>
|
||||
</animation>
|
||||
|
||||
</PropertyList>
|
||||
|
|
|
|||
24
Models/Services/Pushback/warning-light.ac
Normal file
24
Models/Services/Pushback/warning-light.ac
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
AC3Db
|
||||
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
|
||||
MATERIAL "DefaultWhite.001" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.025 0.025 0.025 shi 50 trans 0.1
|
||||
OBJECT world
|
||||
kids 1
|
||||
OBJECT poly
|
||||
name "warning-als"
|
||||
data 8
|
||||
Mesh.005
|
||||
crease 30.000000
|
||||
numvert 4
|
||||
-0.090665 -0.991468 -0.999611
|
||||
-0.090663 1.008532 -0.999611
|
||||
-0.090662 -0.991468 1.000389
|
||||
-0.090661 1.008532 1.000389
|
||||
numsurf 1
|
||||
SURF 0x20
|
||||
mat 1
|
||||
refs 4
|
||||
1 0.0 0.0
|
||||
0 0.0 0.0
|
||||
2 0.0 0.0
|
||||
3 0.0 0.0
|
||||
kids 0
|
||||
34
Models/Services/Pushback/warning-light.eff
Normal file
34
Models/Services/Pushback/warning-light.eff
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PropertyList>
|
||||
<name>Effects/warning-als</name>
|
||||
<inherits-from>Effects/procedural-light</inherits-from>
|
||||
|
||||
<parameters>
|
||||
<texture n="0">
|
||||
<type>white</type>
|
||||
</texture>
|
||||
|
||||
<light_color_base_r type="float">0.98</light_color_base_r>
|
||||
<light_color_base_g type="float">0.75</light_color_base_g>
|
||||
<light_color_base_b type="float">0.0</light_color_base_b>
|
||||
<light_color_center_r type="float">0.98</light_color_center_r>
|
||||
<light_color_center_g type="float">0.75</light_color_center_g>
|
||||
<light_color_center_b type="float">0.0</light_color_center_b>
|
||||
<intensity_scale type="float">0.8</intensity_scale>
|
||||
<!--<pointing_x type="float">0.0</pointing_x>
|
||||
<pointing_y type="float">0.0</pointing_y>
|
||||
<pointing_z type="float">0.0</pointing_z>-->
|
||||
<is_directional type="bool">false</is_directional>
|
||||
<is_strobe type="bool">true</is_strobe>
|
||||
<!--<inner_angle type="float">0.2</inner_angle>
|
||||
<outer_angle type="float">0.4</outer_angle>
|
||||
<zero_angle type="float">0.7</zero_angle>
|
||||
<outer_gain type="float">0.5</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>
|
||||
40
Models/Services/Pushback/warning-light.xml
Normal file
40
Models/Services/Pushback/warning-light.xml
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>warning-light.ac</path>
|
||||
|
||||
<effect>
|
||||
<inherits-from>Aircraft/A320-family/Models/Services/Pushback/warning-light</inherits-from>
|
||||
<object-name>warning-als</object-name>
|
||||
</effect>
|
||||
|
||||
<animation>
|
||||
<type>scale</type>
|
||||
<x-offset>1.0</x-offset>
|
||||
<y-offset>1.0</y-offset>
|
||||
<z-offset>1.0</z-offset>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>dist-scale</type>
|
||||
<object-name>warning-als</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>
|
||||
|
||||
</PropertyList>
|
||||
Loading…
Reference in a new issue