3D: Fix missing pushback, enable the new model for it

This commit is contained in:
Joshua Davidson 2018-06-23 11:43:08 -04:00
parent a91046ff3b
commit c7a8502893
9 changed files with 227 additions and 401 deletions

View file

@ -15,12 +15,11 @@
<z-m>1.7005004</z-m>
</offsets>
<model>
<name>Fuselage</name>
<path>Aircraft/IDG-A32X/Models/Fuselages/A320-100/fuselage.xml</path>
</model>
<!-- Separate Flightdeck to fit the modified nose -->
<model>
<name>Flightdeck</name>
@ -316,22 +315,13 @@
<!-- Other non-aircraft models -->
<model>
<name>Pushback</name>
<path>Models/Goldhofert-autopush.xml</path>
<path>Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml</path>
<offsets>
<x-m>5.55</x-m>
<x-m>6.0</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m>
<!-- <x-m>7.55</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m> -->
<z-m>-4.24</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- LIVERY SELECT -->
<!-- Animation -->

View file

@ -341,27 +341,18 @@
<z-m>-1.25</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Other non-aircraft models -->
<model>
<name>Pushback</name>
<path>Models/Goldhofert-autopush.xml</path>
<path>Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml</path>
<offsets>
<x-m>5.55</x-m>
<x-m>6.0</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m>
<!-- <x-m>7.55</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m> -->
<z-m>-4.24</z-m>
</offsets>
</model>
<!-- LIVERY SELECT -->
<!-- Animation -->
<animation>

View file

@ -344,22 +344,13 @@
<!-- Other non-aircraft models -->
<model>
<name>Pushback</name>
<path>Models/Goldhofert-autopush.xml</path>
<path>Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml</path>
<offsets>
<x-m>5.55</x-m>
<x-m>6.0</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m>
<!-- <x-m>7.55</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m> -->
<z-m>-4.24</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- LIVERY SELECT -->
<!-- Animation -->

View file

@ -15,7 +15,6 @@
<z-m>1.7005004</z-m>
</offsets>
<model>
<name>Fuselage</name>
<path>Aircraft/IDG-A32X/Models/Fuselages/A320neo/fuselage.xml</path>
@ -325,22 +324,13 @@
<!-- Other non-aircraft models -->
<model>
<name>Pushback</name>
<path>Models/Goldhofert-autopush.xml</path>
<path>Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml</path>
<offsets>
<x-m>5.55</x-m>
<x-m>6.0</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m>
<!-- <x-m>7.55</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m> -->
<z-m>-4.24</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- LIVERY SELECT -->
<!-- Animation -->

View file

@ -15,7 +15,6 @@
<z-m>1.7005004</z-m>
</offsets>
<model>
<name>Fuselage</name>
<path>Aircraft/IDG-A32X/Models/Fuselages/A320neo/fuselage.xml</path>
@ -325,22 +324,13 @@
<!-- Other non-aircraft models -->
<model>
<name>Pushback</name>
<path>Models/Goldhofert-autopush.xml</path>
<path>Aircraft/IDG-A32X/Models/Services/Pushback/Douglas.xml</path>
<offsets>
<x-m>5.55</x-m>
<x-m>6.0</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m>
<!-- <x-m>7.55</x-m>
<y-m>0</y-m>
<z-m>-4.14</z-m> -->
<z-m>-4.24</z-m>
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- LIVERY SELECT -->
<!-- Animation -->

View file

@ -1,130 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
AUTOPUSH
Copyright (c) 2018 Michael Danilov <mike.d.ft402 -eh- gmail.com>
Original code (c) FlightGear
Distribute under the terms of GPLv2.
-->
<PropertyList>
<path>Models/Airport/Pushback/Goldhofert.ac</path>
<!-- Trucks models and artworks courtesy of XPGoodWay Team
(http://www.xpgoodwayteam.org/site_xpushback/) -->
<model>
<path>Models/Airport/Pushback/Goldhofert-warning-light.xml</path>
<offsets>
<x-m>-2.908</x-m>
<y-m>0.260</y-m>
<z-m>1.326</z-m>
<heading-deg>0</heading-deg>
</offsets>
</model>
<model>
<path>Models/Airport/Pushback/Goldhofert-warning-light.xml</path>
<offsets>
<x-m>-1.781</x-m>
<y-m>0.260</y-m>
<z-m>1.326</z-m>
<heading-deg>90</heading-deg>
</offsets>
</model>
<animation>
<type>spin</type>
<object-name>wheelfl</object-name>
<object-name>wheelfr</object-name>
<!-- SETTING The aircraft's front wheel rollspeed in m/s. -->
<property>gear/gear[0]/rollspeed-ms</property>
<factor>-16.3</factor>
<center>
<x-m>-2.8976</x-m>
<y-m>0</y-m>
<z-m>0.5809</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>
<!-- SETTING The aircraft's front wheel rollspeed in m/s. -->
<property>gear/gear[0]/rollspeed-ms</property>
<factor>-16.3</factor>
<center>
<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>select</type>
<condition>
<!-- SETTING Whether connected. -->
<property>sim/model/pushback/connected</property>
</condition>
</animation>
<animation>
<type>rotate</type>
<!-- SETTING Normalized steering. -->
<property>gear/gear/steering-norm</property>
<!-- SETTING Max steering. -->
<factor>70.0</factor>
<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>
<animation>
<type>translate</type>
<!-- SETTING Gear compression. -->
<property>gear/gear[0]/compression-ft</property>
<factor>0.3048</factor>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<!-- SETTING Aircraft pitch. -->
<property>orientation/pitch-deg</property>
<!-- SETTING Average ground pitch. -->
<offset-deg>2.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>1</y>
<z>0</z>
</axis>
</animation>
</PropertyList>

View file

@ -1,12 +1,13 @@
<?xml version="1.0"?>
<PropertyList>
<path>Douglas.ac</path>
<!-- Trucks models and artworks courtesy of XPGoodWay Team
(http://www.xpgoodwayteam.org/site_xpushback/) -->
(http://www.xpgoodwayteam.org/site_xpushback/) -->
<path>Douglas.ac</path>
<!-- switch to night/day textures -->
<animation>
<type>textranslate</type>
<property>/sim/time/sun-angle-rad</property>
@ -64,16 +65,10 @@
<animation>
<type>rotate</type>
<condition>
<greater-than>
<property>sim/model/pushback/position-norm</property>
<value>0.99</value>
</greater-than>
</condition>
<property>gear/gear[0]/steering-norm</property>
<factor>-70</factor>
<property>fdm/jsbsim/fcs/pushback-steer-deg</property>
<factor>-1</factor>
<center>
<x-m>3</x-m>
<x-m>1.53665</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
@ -147,6 +142,7 @@
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<property>sim/model/pushback/position-norm</property>
@ -179,6 +175,7 @@
<z>0</z>
</axis>
</animation>
<!-- compensate for pitch of aircraft, keep pushback level -->
<animation>
<type>rotate</type>
@ -195,4 +192,4 @@
<z>0</z>
</axis>
</animation>
</PropertyList>
</PropertyList>

View file

@ -1920,6 +1920,13 @@
<output>fcs/steer-pos-deg[0]</output>
</actuator>
<switch name="fcs/pushback-steer-deg">
<default value="0"/>
<test value="fcs/steer-deg">
/sim/model/pushback/position-norm gt 0.999
</test>
</switch>
</channel>
<channel name="Brakes">

View file

@ -1 +1 @@
4510
4511