Commit 6fc70f71 authored by Михаил Данилов's avatar Михаил Данилов 💬

Port to 2017.2.1 protocol.

parent 35bd560b
......@@ -7,6 +7,10 @@ ________
В скобках указаны промежуточные версии.
(0.8.0)
Протокол анимации 2017.1+
Улучшена точность счисления ЦВМ
0.7.3 24 Mar 2018
Текстуры основных приборов
Подробная загрузка
......
......@@ -78,17 +78,8 @@ Distribute under the terms of GPLv2.
<animation>
<type>select</type>
<condition>
<!-- BEGIN SETTING Whether connected: /sim/model/pushback/connected -->
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>131072</value>
</mod>
</expression>
<value>65536</value>
</greater-than-equals>
<!-- END SETTING -->
<!-- SETTING Whether connected: /sim/model/pushback/connected -->
<property>sim/multiplay/generic/bool[14]</property>
</condition>
</animation>
......
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<particlesystem>
<name>canard-contrail</name>
<type>trail</type>
<texture>wingtip-contrail.png</texture>
<emissive type="bool">false</emissive>
<lighting type="bool">true</lighting>
<pass>true</pass>
<condition>
<and>
<!-- FIXME Adjust when moves with folding. -->
<greater-than-equals>
<property>surface-positions/wing-fold-pos-norm</property>
<value>1.0</value>
</greater-than-equals>
<!-- END FIXME -->
<greater-than>
<property>engines/engine[9]/rpm</property>
<value>100.0</value>
</greater-than>
<or>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>32</value>
</mod>
</expression>
<value>16</value>
</greater-than-equals>
<greater-than-equals>
<property>engines/engine[9]/n1</property>
<value>7.5</value>
</greater-than-equals>
</or>
</and>
</condition>
<attach>world</attach>
<placer><type>point</type></placer>
<shooter>
<speed-mps><value>0</value><spread>0</spread></speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>engines/engine[9]/rpm</property>
<factor>1</factor>
<offset>5</offset>
</particles-per-sec>
</counter>
<align>fixed</align>
<particle>
<start>
<color>
<red><value>1.0</value></red>
<green><value>1.0</value></green>
<blue><value>1.0</value></blue>
<alpha><value>0.1</value></alpha>
</color>
<size><value>0.10</value></size>
</start>
<end>
<color>
<red><value>1.0</value></red>
<green><value>1.0</value></green>
<blue><value>1.0</value></blue>
<alpha><value>0.01</value></alpha>
</color>
<size><value>0.30</value></size>
</end>
<life-sec><value>0.03</value></life-sec>
<mass-kg>0.005</mass-kg>
<radius-m>0.1</radius-m>
</particle>
<program>
<fluid>air</fluid>
<gravity>true</gravity>
<wind>true</wind>
</program>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="contrail.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>1024</value>
</mod>
</expression>
<value>512</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[9]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="contrail.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>2048</value>
</mod>
</expression>
<value>1024</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[10]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="fire.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>8</value>
</mod>
</expression>
<value>4</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[63]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="fire.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>16</value>
</mod>
</expression>
<value>8</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[64]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,10 +2,7 @@
<PropertyList>
<particlesystem include="fireball.xml">
<condition>
<greater-than-equals>
<property>sim/multiplay/generic/int[1]</property>
<value>1073741824</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[75]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,10 +2,7 @@
<PropertyList>
<particlesystem include="fireballsmoke.xml">
<condition>
<greater-than-equals>
<property>sim/multiplay/generic/int[1]</property>
<value>1073741824</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[75]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="firesmoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>2</value>
</mod>
</expression>
<value>1</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[61]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="firesmoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>4</value>
</mod>
</expression>
<value>2</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[62]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="smoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>8192</value>
</mod>
</expression>
<value>4096</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[11]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="smoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>16384</value>
</mod>
</expression>
<value>8192</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[12]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="sparks.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>512</value>
</mod>
</expression>
<value>256</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[8]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="tyre-smoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>64</value>
</mod>
</expression>
<value>32</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[5]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="tyre-smoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>128</value>
</mod>
</expression>
<value>64</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[6]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -2,15 +2,7 @@
<PropertyList>
<particlesystem include="tyre-smoke.xml">
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>256</value>
</mod>
</expression>
<value>128</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[7]</property>
</condition>
</particlesystem>
</PropertyList>
......@@ -8,15 +8,7 @@
<value>0.3</value>
</greater-than>
<or>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>32</value>
</mod>
</expression>
<value>16</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[4]</property>
<greater-than-equals>
<expression>
<abs>
......@@ -26,15 +18,9 @@
<value>8.5</value>
</greater-than-equals>
</or>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>512</value>
</mod>
</expression>
<value>256</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[76]</property>
</not>
</and>
</condition>
</particlesystem>
......
......@@ -8,15 +8,7 @@
<value>0.3</value>
</greater-than>
<or>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>32</value>
</mod>
</expression>
<value>16</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[4]</property>
<greater-than-equals>
<expression>
<abs>
......@@ -26,15 +18,9 @@
<value>8.5</value>
</greater-than-equals>
</or>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>1024</value>
</mod>
</expression>
<value>512</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[77]</property>
</not>
</and>
</condition>
</particlesystem>
......
......@@ -6,15 +6,7 @@
<particlesystem>
<condition>
<or>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>32</value>
</mod>
</expression>
<value>16</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[4]</property>
<greater-than-equals>
<expression>
<abs>
......
......@@ -5,15 +5,10 @@
<type>select</type>
<object-name>Red</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>2</value>
</mod>
</expression>
<value>1</value>
</greater-than-equals>
<!-- FGBUG bool[0] not sync over MP
<property>sim/multiplay/generic/bool[0]</property>
-->
<property>sim/multiplay/generic/int[0]</property>
</condition>
</animation>
<animation>
......
......@@ -5,15 +5,7 @@
<type>select</type>
<object-name>White</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>8</value>
</mod>
</expression>
<value>4</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[2]</property>
</condition>
</animation>
<animation>
......
......@@ -5,15 +5,7 @@
<type>select</type>
<object-name>Red</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>4</value>
</mod>
</expression>
<value>2</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[1]</property>
</condition>
</animation>
<animation>
......
......@@ -5,15 +5,7 @@
<type>select</type>
<object-name>Green</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>4</value>
</mod>
</expression>
<value>2</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[1]</property>
</condition>
</animation>
<animation>
......
......@@ -5,15 +5,7 @@
<type>select</type>
<object-name>White</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>4</value>
</mod>
</expression>
<value>2</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[1]</property>
</condition>
</animation>
<animation>
......
......@@ -5,15 +5,7 @@
<type>select</type>
<object-name>White</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>16</value>
</mod>
</expression>
<value>8</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[3]</property>
</condition>
</animation>
<animation>
......
This diff is collapsed.
......@@ -214,30 +214,18 @@
<type>select</type>
<object-name>CanardLeft</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>512</value>
</mod>
</expression>
<value>256</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[69]</property>
</not>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>CanardRight</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>1024</value>
</mod>
</expression>
<value>512</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[70]</property>
</not>
</condition>
</animation>
......@@ -354,15 +342,9 @@
<type>select</type>
<object-name>Cone</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>2048</value>
</mod>
</expression>
<value>1024</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[71]</property>
</not>
</condition>
</animation>
......@@ -477,15 +459,9 @@
<object-name>Gear_F_Whl_rub</object-name>
<condition>
<!-- If pushback is not attached. -->
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>131072</value>
</mod>
</expression>
<value>65536</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[14]</property>
</not>
</condition>
<property>engines/engine[8]/rpm</property>
<!-- w = v * pi / r, diameter 0.94 m. Paradoxially, we have to multiply instead... -->
......@@ -556,15 +532,9 @@
<object-name>GearF_HR</object-name>
<object-name>Pushback</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>4096</value>
</mod>
</expression>
<value>2048</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[72]</property>
</not>
</condition>
</animation>
......@@ -803,15 +773,9 @@
<object-name>Gear_L_H_P_1</object-name>
<object-name>Gear_L_H_P_2</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>8192</value>
</mod>
</expression>
<value>4096</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[73]</property>
</not>
</condition>
</animation>
......@@ -1050,15 +1014,9 @@
<object-name>Gear_R_H_P_1</object-name>
<object-name>Gear_R_H_P_2</object-name>
<condition>
<less-than>
<expression>
<mod>
<property>sim/multiplay/generic/int[1]</property>
<value>16384</value>
</mod>
</expression>
<value>8192</value>
</less-than>
<not>
<property>sim/multiplay/generic/bool[74]</property>
</not>
</condition>
</animation>
......@@ -1808,17 +1766,12 @@
<animation>
<type>material</type>
<object-name>Gear_F_Str_gls_l</object-name>
<object-name>Strobe</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>8</value>
</mod>
</expression>
<value>4</value>
</greater-than-equals>
<!-- FGBUG bool[0] not sync over MP
<property>sim/multiplay/generic/bool[0]</property>
-->
<property>sim/multiplay/generic/int[0]</property>
</condition>
<emission>
<red>1.0</red>
......@@ -1829,17 +1782,9 @@
<animation>
<type>material</type>
<object-name>Gear_F_Str_gls_t</object-name>
<object-name>Gear_F_Str_gls_l</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>16</value>
</mod>
</expression>
<value>8</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[2]</property>
</condition>
<emission>
<red>1.0</red>
......@@ -1850,22 +1795,14 @@
<animation>
<type>material</type>
<object-name>Strobe</object-name>
<object-name>Gear_F_Str_gls_t</object-name>
<condition>
<greater-than-equals>
<expression>
<mod>
<property>sim/multiplay/generic/int[0]</property>
<value>2</value>
</mod>
</expression>
<value>1</value>
</greater-than-equals>
<property>sim/multiplay/generic/bool[3]</property>
</condition>
<emission>
<red>1.0</red>
<green>0.0</green>
<blue>0.0</blue>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
......@@ -1874,15 +1811,7 @@
<type>select</type>