Sim: Add chokes properly

This commit is contained in:
Joshua Davidson 2018-08-01 08:49:54 -04:00
parent af99f8bf05
commit 8932f02f06
10 changed files with 385 additions and 348 deletions

View file

@ -665,6 +665,14 @@
</gear>
</gear>
<services n="0">
<chokes n="0">
<nose type="bool">0</nose>
<left type="bool">0</left>
<right type="bool">0</right>
</chokes>
</services>
<systems>
<failures n="0">
<aileron-left type="bool">0</aileron-left>

View file

@ -227,39 +227,51 @@
<checkbox>
<label>Nose Gear Chock</label>
<halign>left</halign>
<enable>
<and>
<property>/gear/gear[0]/wow</property>
<property>/gear/gear[1]/wow</property>
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/nose</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable> <!-- Doesn't really do anything yet -->
<property>/systems/acconfig/unused/unused</property>
</enable>
<live>true</live>
</checkbox>
<checkbox>
<label>Main Left Gear Chock</label>
<halign>left</halign>
<enable>
<and>
<property>/gear/gear[0]/wow</property>
<property>/gear/gear[1]/wow</property>
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/left</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable> <!-- Doesn't really do anything yet -->
<property>/systems/acconfig/unused/unused</property>
</enable>
<live>true</live>
</checkbox>
<checkbox>
<label>Main Right Gear Chock</label>
<halign>left</halign>
<enable>
<and>
<property>/gear/gear[0]/wow</property>
<property>/gear/gear[1]/wow</property>
<property>/gear/gear[2]/wow</property>
</and>
</enable>
<property>/services/chokes/right</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable> <!-- Doesn't really do anything yet -->
<property>/systems/acconfig/unused/unused</property>
</enable>
<live>true</live>
</checkbox>

View file

@ -153,7 +153,7 @@
</condition>
<offsets>
<x-m>15.5</x-m>
<y-m>1.18</y-m>
<y-m>1.05</y-m>
<z-m>1.25</z-m>
</offsets>
</model>
@ -169,7 +169,7 @@
</condition>
<offsets>
<x-m>15.5</x-m>
<y-m>-1.18</y-m>
<y-m>-1.05</y-m>
<z-m>1.25</z-m>
</offsets>
</model>

View file

@ -14,9 +14,9 @@
<type>translate</type>
<property>systems/shake/shaking</property>
<axis>
<x1-m> 0</x1-m>
<y1-m> 0</y1-m>
<z1-m> 0</z1-m>
<x1-m> 0.0</x1-m>
<y1-m> 0.0</y1-m>
<z1-m> 0.0</z1-m>
<x2-m> 0.5</x2-m>
<y2-m>-0.5</y2-m>
<z2-m> 0.8</z2-m>

View file

@ -4,245 +4,245 @@ OBJECT world
kids 2
OBJECT poly
name "chock"
loc 3.52186 -5.34978 -4.81643
loc 3.47232 -5.34978 4.81645
texture "yellow.png"
crease 45.000000
numvert 16
0.68047 0.195222 8.83094
0.945805 -0.19873 8.83094
0.389816 -0.198707 8.83094
0.651829 0.195237 8.83094
0.651829 0.195237 10.4348
0.389816 -0.198707 10.4348
0.945805 -0.19873 10.4348
0.68047 0.195222 10.4348
0.377571 -0.20445 10.3956
0.958072 -0.20445 10.3956
0.958072 -0.20445 8.87011
0.377571 -0.20445 8.87011
0.644194 0.204451 8.87011
0.688069 0.204451 8.87011
0.688069 0.204451 10.3956
0.644194 0.204451 10.3956
0.644194 0.204451 -0.76274
0.688069 0.204451 -0.76274
0.688069 0.204451 0.762751
0.644194 0.204451 0.762751
0.377571 -0.20445 0.762751
0.958072 -0.20445 0.762751
0.958072 -0.20445 -0.76274
0.377571 -0.20445 -0.76274
0.68047 0.195222 -0.80194
0.945805 -0.19873 -0.80194
0.389816 -0.198707 -0.80194
0.651829 0.195237 -0.80194
0.651829 0.195237 0.80192
0.389816 -0.198707 0.80192
0.945805 -0.19873 0.80192
0.68047 0.195222 0.80192
numsurf 14
SURF 0x30
mat 0
refs 4
14 0.028715 0.897646
9 0.028715 0.11486
10 0.980857 0.11486
13 0.980857 0.897646
7 0.979703 0.92048
6 0.979703 0.0958905
5 0.0287309 0.0958905
4 0.0287309 0.92048
SURF 0x30
mat 0
refs 4
0 1 0.964797
3 1 0.964832
12 0.975579 0.987075
13 0.975579 0.987075
0 0.0013966 0.919732
3 0.0013966 0.919732
2 0.076978 0.919732
1 0.076978 0.919732
SURF 0x30
mat 0
refs 4
1 1 0.0138064
0 1 0.964797
13 0.975579 0.987075
10 0.975579 0
0 0.0286659 0.921475
7 0.0286659 0.0781799
4 0.979179 0.0781799
3 0.979179 0.921475
SURF 0x30
mat 0
refs 4
2 1 0.013862
1 1 0.0138064
10 0.975579 0
11 0.975579 0
8 0 0.964797
9 0 0.0138064
10 0 0.013862
11 0 0.964832
SURF 0x30
mat 0
refs 4
3 1 0.964832
2 1 0.013862
11 0.975579 0
12 0.975579 0.987075
1 0.0244208 0.987075
6 0.0244208 0
9 0 0.0138064
8 0 0.964797
SURF 0x30
mat 0
refs 4
0 1 0.964797
1 1 0.0138064
2 1 0.013862
3 1 0.964832
6 0.0244208 0
7 0.0244208 0
10 0 0.013862
9 0 0.0138064
SURF 0x30
mat 0
refs 4
4 0 0.964832
7 0 0.964797
14 0.0244208 0.987075
15 0.0244208 0.987075
7 0.0244208 0
0 0.0244208 0.987075
11 0 0.964832
10 0 0.013862
SURF 0x30
mat 0
refs 4
5 0 0.013862
4 0 0.964832
15 0.0244208 0.987075
8 0.0244208 0
0 0.0244208 0.987075
1 0.0244208 0.987075
8 0 0.964797
11 0 0.964832
SURF 0x30
mat 0
refs 4
6 0 0.0138064
5 0 0.013862
8 0.0244208 0
9 0.0244208 0
12 1 0.964832
13 1 0.013862
14 1 0.0138064
15 1 0.964797
SURF 0x30
mat 0
refs 4
7 0 0.964797
6 0 0.0138064
9 0.0244208 0
14 0.0244208 0.987075
3 0.975579 0.987075
4 0.975579 0
13 1 0.013862
12 1 0.964832
SURF 0x30
mat 0
refs 4
4 0 0.964832
5 0 0.013862
6 0 0.0138064
7 0 0.964797
4 0.975579 0
5 0.975579 0
14 1 0.0138064
13 1 0.013862
SURF 0x30
mat 0
refs 4
12 0.979179 0.921475
11 0.979179 0.0781799
8 0.0286659 0.0781799
15 0.0286659 0.921475
5 0.975579 0
2 0.975579 0.987075
15 1 0.964797
14 1 0.0138064
SURF 0x30
mat 0
refs 4
14 0.076978 0.919732
13 0.076978 0.919732
12 0.0013966 0.919732
15 0.0013966 0.919732
2 0.975579 0.987075
3 0.975579 0.987075
12 1 0.964832
15 1 0.964797
SURF 0x30
mat 0
refs 4
11 0.0287309 0.92048
10 0.0287309 0.0958905
9 0.979703 0.0958905
8 0.979703 0.92048
2 0.980857 0.897646
5 0.980857 0.11486
6 0.028715 0.11486
1 0.028715 0.897646
kids 0
OBJECT poly
name "chock"
loc 6.84041 -5.33333 -4.81643
loc 4.74781 -5.34978 4.81645
texture "yellow.png"
crease 45.000000
numvert 16
0.644194 0.20445 10.3956
0.688068 0.20445 10.3956
0.688068 0.20445 8.87011
0.644194 0.20445 8.87011
0.377571 -0.204451 8.87011
0.958072 -0.204451 8.87011
0.958072 -0.204451 10.3956
0.377571 -0.204451 10.3956
0.68047 0.195222 10.4348
0.945805 -0.198731 10.4348
0.389816 -0.198708 10.4348
0.651829 0.195236 10.4348
0.651829 0.195236 8.83094
0.389816 -0.198708 8.83094
0.945805 -0.198731 8.83094
0.68047 0.195222 8.83094
0.68047 0.195222 0.80192
0.945805 -0.198731 0.80192
0.389816 -0.198708 0.80192
0.651829 0.195236 0.80192
0.651829 0.195236 -0.80194
0.389816 -0.198708 -0.80194
0.945805 -0.198731 -0.80194
0.68047 0.195222 -0.80194
0.377571 -0.204451 -0.76274
0.958072 -0.204451 -0.76274
0.958072 -0.204451 0.762751
0.377571 -0.204451 0.762751
0.644194 0.20445 0.762751
0.688068 0.20445 0.762751
0.688068 0.20445 -0.76274
0.644194 0.20445 -0.76274
numsurf 14
SURF 0x30
mat 0
refs 4
4 0.0287309 0.92048
5 0.0287309 0.0958905
6 0.979703 0.0958905
7 0.979703 0.92048
13 0.980857 0.897646
10 0.980857 0.11486
9 0.028715 0.11486
14 0.028715 0.897646
SURF 0x30
mat 0
refs 4
1 0.076978 0.919732
2 0.076978 0.919732
3 0.0013966 0.919732
0 0.0013966 0.919732
13 0.975579 0.987075
12 0.975579 0.987075
3 1 0.964832
0 1 0.964797
SURF 0x30
mat 0
refs 4
3 0.979179 0.921475
4 0.979179 0.0781799
7 0.0286659 0.0781799
0 0.0286659 0.921475
10 0.975579 0
13 0.975579 0.987075
0 1 0.964797
1 1 0.0138064
SURF 0x30
mat 0
refs 4
11 0 0.964832
10 0 0.013862
9 0 0.0138064
8 0 0.964797
11 0.975579 0
10 0.975579 0
1 1 0.0138064
2 1 0.013862
SURF 0x30
mat 0
refs 4
8 0 0.964797
9 0 0.0138064
6 0.0244208 0
1 0.0244208 0.987075
12 0.975579 0.987075
11 0.975579 0
2 1 0.013862
3 1 0.964832
SURF 0x30
mat 0
refs 4
9 0 0.0138064
10 0 0.013862
7 0.0244208 0
6 0.0244208 0
3 1 0.964832
2 1 0.013862
1 1 0.0138064
0 1 0.964797
SURF 0x30
mat 0
refs 4
10 0 0.013862
11 0 0.964832
0 0.0244208 0.987075
7 0.0244208 0
15 0.0244208 0.987075
14 0.0244208 0.987075
7 0 0.964797
4 0 0.964832
SURF 0x30
mat 0
refs 4
11 0 0.964832
8 0 0.964797
1 0.0244208 0.987075
0 0.0244208 0.987075
8 0.0244208 0
15 0.0244208 0.987075
4 0 0.964832
5 0 0.013862
SURF 0x30
mat 0
refs 4
15 1 0.964797
14 1 0.0138064
13 1 0.013862
12 1 0.964832
9 0.0244208 0
8 0.0244208 0
5 0 0.013862
6 0 0.0138064
SURF 0x30
mat 0
refs 4
12 1 0.964832
13 1 0.013862
4 0.975579 0
3 0.975579 0.987075
14 0.0244208 0.987075
9 0.0244208 0
6 0 0.0138064
7 0 0.964797
SURF 0x30
mat 0
refs 4
13 1 0.013862
14 1 0.0138064
5 0.975579 0
4 0.975579 0
7 0 0.964797
6 0 0.0138064
5 0 0.013862
4 0 0.964832
SURF 0x30
mat 0
refs 4
14 1 0.0138064
15 1 0.964797
2 0.975579 0.987075
5 0.975579 0
15 0.0286659 0.921475
8 0.0286659 0.0781799
11 0.979179 0.0781799
12 0.979179 0.921475
SURF 0x30
mat 0
refs 4
15 1 0.964797
12 1 0.964832
3 0.975579 0.987075
2 0.975579 0.987075
15 0.0013966 0.919732
12 0.0013966 0.919732
13 0.076978 0.919732
14 0.076978 0.919732
SURF 0x30
mat 0
refs 4
1 0.028715 0.897646
6 0.028715 0.11486
5 0.980857 0.11486
2 0.980857 0.897646
8 0.979703 0.92048
9 0.979703 0.0958905
10 0.0287309 0.0958905
11 0.0287309 0.92048
kids 0

View file

@ -1,240 +1,248 @@
AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 50 trans 0
OBJECT world
kids 1
kids 2
OBJECT poly
name "chock"
loc -15.9636 -5.22866 0.0166722
loc -15.8122 -5.22866 0.0166722
texture "yellow.png"
crease 45.000000
numvert 32
-0.648396 0.188311 -0.50051
-0.60725 0.188311 -0.50051
-0.60725 0.188311 0.50051
-0.648396 0.188311 0.50051
-0.898413 -0.188311 0.50051
-0.354057 -0.188311 0.50051
-0.354057 -0.188311 -0.50051
-0.898413 -0.188311 -0.50051
-0.614374 0.179811 -0.526211
-0.365561 -0.183043 -0.526211
-0.88693 -0.183022 -0.526211
-0.641232 0.179824 -0.526211
-0.641232 0.179824 0.526211
-0.88693 -0.183022 0.526211
-0.365561 -0.183043 0.526211
numvert 16
-0.614374 0.179811 0.526211
0.638097 0.179811 0.526211
-0.365561 -0.183043 0.526211
-0.88693 -0.183022 0.526211
-0.641232 0.179824 0.526211
-0.641232 0.179824 -0.526211
-0.88693 -0.183022 -0.526211
-0.365561 -0.183043 -0.526211
-0.614374 0.179811 -0.526211
-0.898413 -0.188311 -0.50051
-0.354057 -0.188311 -0.50051
-0.354057 -0.188311 0.50051
-0.898413 -0.188311 0.50051
-0.648396 0.188311 0.50051
-0.60725 0.188311 0.50051
-0.60725 0.188311 -0.50051
-0.648396 0.188311 -0.50051
numsurf 14
SURF 0x30
mat 0
refs 4
13 0.980857 0.897646
10 0.980857 0.11486
9 0.028715 0.11486
14 0.028715 0.897646
SURF 0x30
mat 0
refs 4
13 0.975579 0.987075
12 0.975579 0.987075
3 1 0.964832
0 1 0.964797
SURF 0x30
mat 0
refs 4
10 0.975579 0
13 0.975579 0.987075
0 1 0.964797
1 1 0.0138064
SURF 0x30
mat 0
refs 4
11 0.975579 0
10 0.975579 0
1 1 0.0138064
2 1 0.013862
SURF 0x30
mat 0
refs 4
12 0.975579 0.987075
11 0.975579 0
2 1 0.013862
3 1 0.964832
SURF 0x30
mat 0
refs 4
3 1 0.964832
2 1 0.013862
1 1 0.0138064
0 1 0.964797
SURF 0x30
mat 0
refs 4
15 0.0244208 0.987075
14 0.0244208 0.987075
7 0 0.964797
4 0 0.964832
SURF 0x30
mat 0
refs 4
8 0.0244208 0
15 0.0244208 0.987075
4 0 0.964832
5 0 0.013862
SURF 0x30
mat 0
refs 4
9 0.0244208 0
8 0.0244208 0
5 0 0.013862
6 0 0.0138064
SURF 0x30
mat 0
refs 4
14 0.0244208 0.987075
9 0.0244208 0
6 0 0.0138064
7 0 0.964797
SURF 0x30
mat 0
refs 4
7 0 0.964797
6 0 0.0138064
5 0 0.013862
4 0 0.964832
SURF 0x30
mat 0
refs 4
15 0.0286659 0.921475
8 0.0286659 0.0781799
11 0.979179 0.0781799
12 0.979179 0.921475
SURF 0x30
mat 0
refs 4
15 0.0013966 0.919732
12 0.0013966 0.919732
13 0.076978 0.919732
14 0.076978 0.919732
SURF 0x30
mat 0
refs 4
8 0.979703 0.92048
9 0.979703 0.0958905
10 0.0287309 0.0958905
11 0.0287309 0.92048
kids 0
OBJECT poly
name "chock"
loc -16.1009 -5.22866 0.0166722
texture "yellow.png"
crease 45.000000
numvert 16
0.638098 0.179811 0.526211
0.886909 -0.183043 0.526211
0.365541 -0.183022 0.526211
0.611239 0.179824 0.526211
0.611239 0.179824 -0.526211
0.611238 0.179824 0.526211
0.611238 0.179824 -0.526211
0.365541 -0.183022 -0.526211
0.886909 -0.183043 -0.526211
0.638097 0.179811 -0.526211
0.638098 0.179811 -0.526211
0.354059 -0.188311 -0.50051
0.898412 -0.188311 -0.50051
0.898412 -0.188311 0.50051
0.898413 -0.188311 -0.50051
0.898413 -0.188311 0.50051
0.354059 -0.188311 0.50051
0.604078 0.188311 0.50051
0.645222 0.188311 0.50051
0.645222 0.188311 -0.50051
0.604078 0.188311 -0.50051
numsurf 28
numsurf 14
SURF 0x30
mat 0
refs 4
7 0.979703 0.92048
6 0.979703 0.0958905
5 0.0287309 0.0958905
4 0.0287309 0.92048
13 0.980857 0.897646
10 0.980857 0.11486
9 0.028715 0.11486
14 0.028715 0.897646
SURF 0x30
mat 0
refs 4
0 0.0013966 0.919732
3 0.0013966 0.919732
2 0.076978 0.919732
1 0.076978 0.919732
13 0.975579 0.987075
12 0.975579 0.987075
3 1 0.964832
0 1 0.964797
SURF 0x30
mat 0
refs 4
0 0.0286659 0.921475
7 0.0286659 0.0781799
4 0.979179 0.0781799
3 0.979179 0.921475
10 0.975579 0
13 0.975579 0.987075
0 1 0.964797
1 1 0.0138064
SURF 0x30
mat 0
refs 4
8 0 0.964797
9 0 0.0138064
10 0 0.013862
11 0 0.964832
11 0.975579 0
10 0.975579 0
1 1 0.0138064
2 1 0.013862
SURF 0x30
mat 0
refs 4
1 0.0244208 0.987075
6 0.0244208 0
9 0 0.0138064
8 0 0.964797
12 0.975579 0.987075
11 0.975579 0
2 1 0.013862
3 1 0.964832
SURF 0x30
mat 0
refs 4
6 0.0244208 0
7 0.0244208 0
10 0 0.013862
9 0 0.0138064
3 1 0.964832
2 1 0.013862
1 1 0.0138064
0 1 0.964797
SURF 0x30
mat 0
refs 4
7 0.0244208 0
0 0.0244208 0.987075
11 0 0.964832
10 0 0.013862
15 0.0244208 0.987075
14 0.0244208 0.987075
7 0 0.964797
4 0 0.964832
SURF 0x30
mat 0
refs 4
0 0.0244208 0.987075
1 0.0244208 0.987075
8 0 0.964797
11 0 0.964832
8 0.0244208 0
15 0.0244208 0.987075
4 0 0.964832
5 0 0.013862
SURF 0x30
mat 0
refs 4
12 1 0.964832
13 1 0.013862
14 1 0.0138064
15 1 0.964797
9 0.0244208 0
8 0.0244208 0
5 0 0.013862
6 0 0.0138064
SURF 0x30
mat 0
refs 4
3 0.975579 0.987075
4 0.975579 0
13 1 0.013862
12 1 0.964832
14 0.0244208 0.987075
9 0.0244208 0
6 0 0.0138064
7 0 0.964797
SURF 0x30
mat 0
refs 4
4 0.975579 0
5 0.975579 0
14 1 0.0138064
13 1 0.013862
7 0 0.964797
6 0 0.0138064
5 0 0.013862
4 0 0.964832
SURF 0x30
mat 0
refs 4
5 0.975579 0
2 0.975579 0.987075
15 1 0.964797
14 1 0.0138064
15 0.0286659 0.921475
8 0.0286659 0.0781799
11 0.979179 0.0781799
12 0.979179 0.921475
SURF 0x30
mat 0
refs 4
2 0.975579 0.987075
3 0.975579 0.987075
12 1 0.964832
15 1 0.964797
15 0.0013966 0.919732
12 0.0013966 0.919732
13 0.076978 0.919732
14 0.076978 0.919732
SURF 0x30
mat 0
refs 4
2 0.980857 0.897646
5 0.980857 0.11486
6 0.028715 0.11486
1 0.028715 0.897646
SURF 0x30
mat 0
refs 4
29 0.980857 0.897646
26 0.980857 0.11486
25 0.028715 0.11486
30 0.028715 0.897646
SURF 0x30
mat 0
refs 4
29 0.975579 0.987075
28 0.975579 0.987075
19 1 0.964832
16 1 0.964797
SURF 0x30
mat 0
refs 4
26 0.975579 0
29 0.975579 0.987075
16 1 0.964797
17 1 0.0138064
SURF 0x30
mat 0
refs 4
27 0.975579 0
26 0.975579 0
17 1 0.0138064
18 1 0.013862
SURF 0x30
mat 0
refs 4
28 0.975579 0.987075
27 0.975579 0
18 1 0.013862
19 1 0.964832
SURF 0x30
mat 0
refs 4
19 1 0.964832
18 1 0.013862
17 1 0.0138064
16 1 0.964797
SURF 0x30
mat 0
refs 4
31 0.0244208 0.987075
30 0.0244208 0.987075
23 0 0.964797
20 0 0.964832
SURF 0x30
mat 0
refs 4
24 0.0244208 0
31 0.0244208 0.987075
20 0 0.964832
21 0 0.013862
SURF 0x30
mat 0
refs 4
25 0.0244208 0
24 0.0244208 0
21 0 0.013862
22 0 0.0138064
SURF 0x30
mat 0
refs 4
30 0.0244208 0.987075
25 0.0244208 0
22 0 0.0138064
23 0 0.964797
SURF 0x30
mat 0
refs 4
23 0 0.964797
22 0 0.0138064
21 0 0.013862
20 0 0.964832
SURF 0x30
mat 0
refs 4
31 0.0286659 0.921475
24 0.0286659 0.0781799
27 0.979179 0.0781799
28 0.979179 0.921475
SURF 0x30
mat 0
refs 4
31 0.0013966 0.919732
28 0.0013966 0.919732
29 0.076978 0.919732
30 0.076978 0.919732
SURF 0x30
mat 0
refs 4
24 0.979703 0.92048
25 0.979703 0.0958905
26 0.0287309 0.0958905
27 0.0287309 0.92048
8 0.979703 0.92048
9 0.979703 0.0958905
10 0.0287309 0.0958905
11 0.0287309 0.92048
kids 0

View file

@ -4,7 +4,7 @@ OBJECT world
kids 2
OBJECT poly
name "chock"
loc 3.52186 -5.34978 -4.81643
loc 3.47232 -5.34978 -4.81643
texture "yellow.png"
crease 45.000000
numvert 16
@ -126,7 +126,7 @@ refs 4
kids 0
OBJECT poly
name "chock"
loc 6.84041 -5.33333 -4.81643
loc 4.74781 -5.34978 -4.81643
texture "yellow.png"
crease 45.000000
numvert 16

View file

@ -1833,9 +1833,16 @@
<channel name="Brakes">
<pure_gain name="/services/chokes/nose-half">
<input>/services/chokes/nose</input>
<gain>0.5</gain>
</pure_gain>
<summer name="fcs/left-brake-summer">
<input>/controls/gear/brake-left</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chokes/nose-half</input>
<input>/services/chokes/left</input>
<clipto>
<min>0</min>
<max>1</max>
@ -1853,6 +1860,8 @@
<summer name="fcs/right-brake-summer">
<input>/controls/gear/brake-right</input>
<input>/controls/gear/brake-parking</input>
<input>/services/chokes/nose-half</input>
<input>/services/chokes/right</input>
<clipto>
<min>0</min>
<max>1</max>

View file

@ -1 +1 @@
4614
4615