3D: sync Tu-144_src. Animation: make windows open, fix wipers and chutes, tail...

3D: sync Tu-144_src. Animation: make windows open, fix wipers and chutes, tail light emission colour.
parent 794baabc
......@@ -61,9 +61,9 @@
<name>Light_Strobe_B</name>
<path>Exterior/collision.xml</path>
<offsets>
<x-m>-0.509016</x-m>
<x-m>-0.51113</x-m>
<y-m>0.0</y-m>
<z-m>2.41706</z-m>
<z-m>2.421</z-m>
</offsets>
</model>
......@@ -71,9 +71,9 @@
<name>Light_Strobe_T</name>
<path>Exterior/collision.xml</path>
<offsets>
<x-m>0.03048</x-m>
<y-m>-2.85598</y-m>
<z-m>-2.19456</z-m>
<x-m>-0.062126</x-m>
<y-m>-2.86001</y-m>
<z-m>-2.21</z-m>
</offsets>
</model>
......
This diff is collapsed.
......@@ -408,6 +408,80 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</animation>
<animation>
<type>translate</type>
<object-name>WindowL</object-name>
<object-name>WindowGlassL</object-name>
<object-name>WindowExtL</object-name>
<axis><object-name>WindowTranslAxis0L</object-name></axis>
<property>instrumentation/jsbsim/systems/doors/window[0]/pos-norm</property>
<interpolation>
<entry>
<ind>0.1</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.3</ind>
<dep>-0.06</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>WindowL</object-name>
<object-name>WindowGlassL</object-name>
<object-name>WindowExtL</object-name>
<axis><object-name>WindowTranslAxis1L</object-name></axis>
<property>instrumentation/jsbsim/systems/doors/window[0]/pos-norm</property>
<interpolation>
<entry>
<ind>0.3</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>-0.4</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>WindowR</object-name>
<object-name>WindowGlassR</object-name>
<object-name>WindowExtR</object-name>
<axis><object-name>WindowTranslAxis0R</object-name></axis>
<property>instrumentation/jsbsim/systems/doors/window[1]/pos-norm</property>
<interpolation>
<entry>
<ind>0.1</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.3</ind>
<dep>-0.06</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>WindowR</object-name>
<object-name>WindowGlassR</object-name>
<object-name>WindowExtR</object-name>
<axis><object-name>WindowTranslAxis1R</object-name></axis>
<property>instrumentation/jsbsim/systems/doors/window[1]/pos-norm</property>
<interpolation>
<entry>
<ind>0.3</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>-0.4</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>rotate</type>
<object-name>MlgDoor0L</object-name>
......@@ -2589,129 +2663,6 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute0</object-name>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.4</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.43</ind>
<dep>0.6</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute0</object-name>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.4</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.43</ind>
<dep>0.55</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute1</object-name>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.6</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.63</ind>
<dep>0.6</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute1</object-name>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.6</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.63</ind>
<dep>0.55</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute2</object-name>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.8</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.83</ind>
<dep>0.6</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>translate</type>
<object-name>Chute2</object-name>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.8</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.83</ind>
<dep>0.55</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>select</type>
<object-name>Chute0</object-name>
......@@ -2746,6 +2697,23 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</condition>
</animation>
<animation>
<type>translate</type>
<object-name>Chute0</object-name>
<axis><object-name>ChuteTranslAxis</object-name></axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.4</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.43</ind>
<dep>-1.0</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>scale</type>
<object-name>Chute0</object-name>
......@@ -2767,6 +2735,23 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</center>
</animation>
<animation>
<type>translate</type>
<object-name>Chute1</object-name>
<axis><object-name>ChuteTranslAxis</object-name></axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.6</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.63</ind>
<dep>-1.0</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>scale</type>
<object-name>Chute1</object-name>
......@@ -2788,6 +2773,23 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</center>
</animation>
<animation>
<type>translate</type>
<object-name>Chute2</object-name>
<axis><object-name>ChuteTranslAxis</object-name></axis>
<property>surface-positions/speedbrake-pos-norm</property>
<interpolation>
<entry>
<ind>0.8</ind>
<dep>0.0</dep>
</entry>
<entry>
<ind>0.83</ind>
<dep>-1.0</dep>
</entry>
</interpolation>
</animation>
<animation>
<type>scale</type>
<object-name>Chute2</object-name>
......@@ -3559,9 +3561,9 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
<object-name>NavlightTail</object-name>
<emission>
<factor-prop>sim/multiplay/generic/bool[1]</factor-prop>
<red>1.0</red>
<green>0.945</green>
<blue>0.878</blue>
<red>0.8</red>
<green>0.6712</green>
<blue>0.5336</blue>
</emission>
</animation>
......@@ -3743,11 +3745,11 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</animation>
<animation>
<type>material</type>
<object-name>BelAZ-74212Beacon</object-name>
<object-name>BelAZ-74212Lights</object-name>
<emission>
<red>0.5</red>
<green>0.386</green>
<blue>0.280</blue>
<red>0.8</red>
<green>0.6712</green>
<blue>0.5336</blue>
</emission>
</animation>
......@@ -3905,6 +3907,7 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
<effect>
<inherits-from>Effects/Tu-144D</inherits-from>
<object-name>Aircraft</object-name>
<object-name>Groundsupply</object-name>
</effect>
<effect>
......@@ -3954,6 +3957,34 @@ pos-norm MlgDoor{0,1} MlgBase MlgStrut MlgHinge
</animation>
<animation>
<type>knob</type>
<object-name>WindowL</object-name>
<action>
<binding>
<command>property-adjust</command>
<property>fdm/jsbsim/systems/doors/window[0]/cmd-norm</property>
<factor>0.1</factor>
<min>0.0</min>
<max>1.0</max>
</binding>
</action>
</animation>
<animation>
<type>knob</type>
<object-name>WindowR</object-name>
<action>
<binding>
<command>property-adjust</command>
<property>fdm/jsbsim/systems/doors/window[1]/cmd-norm</property>
<factor>0.1</factor>
<min>0.0</min>
<max>1.0</max>
</binding>
</action>
</animation>
<animation>
<type>knob</type>
<object-name>Door0</object-name>
......
......@@ -798,6 +798,21 @@ IntlightsOff = func () {
}
# @brief Set window command
# @param door Window number. 0: Left; 1: Right.
# @param cmd Command norm (0.0 .. 1.0).
Window = func(door, cmd) {
setprop("fdm/jsbsim/systems/doors/window[" ~ door ~ "]/cmd-norm", cmd);
}
# @brief Set all windows' command at once
# @param cmd Command norm (0.0 .. 1.0).
WindowsImmed = func(cmd) {
for(var ii = 0; ii < 2; ii += 1){
Window(ii, cmd);
}
}
# @brief Set door command
# @param door Door number. 0: Front; 1: Front catering; 2: Back; 3: Back catering.
# @param cmd Command norm (0.0 .. 1.0).
......@@ -910,6 +925,7 @@ PreTaxi = func {
}
gui.popupTip("Starting engines, 7 minutes to go.");
Parkingbrake(1);
WindowsImmed(0.0);
Doors(0.0);
Cargodoors(0.0);
LightsStartup(1);
......
......@@ -573,6 +573,20 @@
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/systems/doors/window[0]/pos-norm</input>
<output>/instrumentation/jsbsim/systems/doors/window[0]/pos-norm</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
<input>/fdm/jsbsim/systems/doors/window[1]/pos-norm</input>
<output>/instrumentation/jsbsim/systems/doors/window[1]/pos-norm</output>
</filter>
<filter>
<type>gain</type>
<gain>1.0</gain>
......
......@@ -33,6 +33,8 @@
<signal><property type="string">/gear/gear[3]/compression-norm</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/doors/window[0]/pos-norm</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/doors/window[1]/pos-norm</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/doors/door[0]/pos-norm</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/doors/door[1]/pos-norm</property><type>float</type></signal>
<signal><property type="string">/instrumentation/jsbsim/systems/doors/door[2]/pos-norm</property><type>float</type></signal>
......
......@@ -7,6 +7,9 @@
<system name="Tu-144 doors">
<property>&U;/window[0]/cmd-norm</property>
<property>&U;/window[1]/cmd-norm</property>
<property>&U;/door[0]/cmd-norm</property>
<property>&U;/door[1]/cmd-norm</property>
<property>&U;/door[2]/cmd-norm</property>
......@@ -67,6 +70,36 @@
<channel name="Doors" execrate="4">
<switch name="&U;/window[0]/func/inp-norm">
<default value="&U;/window[0]/cmd-norm"/>
<test value="0.0">
&U;/allowed-left EQ 0
</test>
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
</switch>
<actuator name="&U;/window[0]/pos-norm">
<input>&U;/window[0]/func/inp-norm</input>
<rate_limit>0.5</rate_limit>
</actuator>
<switch name="&U;/window[1]/func/inp-norm">
<default value="&U;/window[1]/cmd-norm"/>
<test value="0.0">
&U;/allowed-left EQ 0
</test>
<clipto>
<min>0.0</min>
<max>1.0</max>
</clipto>
</switch>
<actuator name="&U;/window[1]/pos-norm">
<input>&U;/window[1]/func/inp-norm</input>
<rate_limit>0.5</rate_limit>
</actuator>
<switch name="&U;/door[0]/func/inp-norm">
<default value="&U;/door[0]/cmd-norm"/>
<test value="0.0">
......
......@@ -1165,6 +1165,8 @@
<path>/fdm/jsbsim/inertia/pointmass-weight-lbs[5]</path>
<path>/fdm/jsbsim/inertia/pointmass-weight-lbs[6]</path>
<!-- Doors -->
<path>/fdm/jsbsim/systems/doors/window[0]/cmd-norm</path>
<path>/fdm/jsbsim/systems/doors/window[1]/cmd-norm</path>
<path>/fdm/jsbsim/systems/doors/door[0]/cmd-norm</path>
<path>/fdm/jsbsim/systems/doors/door[1]/cmd-norm</path>
<path>/fdm/jsbsim/systems/doors/door[2]/cmd-norm</path>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment