Merge branch 'master' of https://github.com/Marsdolphin/followme_e-tron into Marsdolphin-master

This commit is contained in:
Sidi Liang 2020-02-16 15:33:50 +08:00
commit 99ca331442
No known key found for this signature in database
GPG Key ID: 79F0A6B20B72F42F
7 changed files with 1434 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -0,0 +1,132 @@
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 "case.003" rgb 0.275682 0.263133 0.275682 amb 0.857063 0.857063 0.857063 emis 0 0 0 spec 0.701169 0.688621 0.676072 shi 128 trans 0
MATERIAL "ring.001" rgb 0.15 0.15 0.15 amb 1 1 1 emis 0 0 0 spec 0.6 0.6 0.6 shi 99 trans 0
MATERIAL "case.004" rgb 0.275682 0.263133 0.275682 amb 0.857063 0.857063 0.857063 emis 0 0 0 spec 0.701169 0.688621 0.676072 shi 128 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 10 trans 0
MATERIAL "Material.001" rgb 0.3672 0.3672 0.3672 amb 1 1 1 emis 0 0 0 spec 0 0 0.050244 shi 32 trans 0
OBJECT world
kids 1
OBJECT poly
name "face"
data 4
Mesh
texture "horn.png"
texrep 1 1
crease 30.000000
numvert 17
0.003763 -0.000147 -0.027526
0.003763 0.010405 -0.025427
0.003763 0.019351 -0.01945
0.003763 0.025329 -0.010504
0.003763 0.027428 4.9e-05
0.003763 0.025329 0.010602
0.003763 0.019351 0.019548
0.003763 0.010405 0.025525
0.003763 -0.000147 0.027624
0.003763 -0.0107 0.025525
0.003763 -0.019646 0.019548
0.003763 -0.025624 0.010602
0.003763 -0.027723 4.9e-05
0.003763 -0.025624 -0.010504
0.003763 -0.019646 -0.01945
0.003763 -0.0107 -0.025427
0.003763 -0.000147 4.9e-05
numsurf 16
SURF 0x00
mat 4
refs 3
0 0.941269516945 0.496725380421
1 0.907679200172 0.665592133999
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
1 0.907679200172 0.665592133999
2 0.81202507019 0.808750331402
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
2 0.81202507019 0.808750331402
3 0.668866753578 0.904405295849
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
3 0.668866753578 0.904405295849
4 0.5 0.937994778156
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
4 0.5 0.937994778156
5 0.331133395433 0.904405295849
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
5 0.331133395433 0.904405295849
6 0.187975004315 0.808750331402
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
6 0.187975004315 0.808750331402
7 0.0923201590776 0.665592133999
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
7 0.0923201590776 0.665592133999
8 0.0587307475507 0.496725380421
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
8 0.0587307475507 0.496725380421
9 0.0923201590776 0.327858656645
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
9 0.0923201590776 0.327858656645
10 0.187975004315 0.184700280428
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
10 0.187975004315 0.184700280428
11 0.331133395433 0.089046575129
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
11 0.331133395433 0.089046575129
12 0.5 0.055456019938
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
12 0.5 0.055456019938
13 0.668866753578 0.089046575129
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
13 0.668866753578 0.089046575129
14 0.81202507019 0.184700280428
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
14 0.81202507019 0.184700280428
15 0.907679200172 0.327858656645
16 0.5 0.496725380421
SURF 0x00
mat 4
refs 3
15 0.907679200172 0.327858656645
0 0.941269516945 0.496725380421
16 0.5 0.496725380421
kids 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<PropertyList>
<path>horn.ac</path>
<animation>
<type>material</type>
<object-name>face</object-name>
</animation>
<animation>
<type>material</type>
<emission>
<factor-prop>controls/switches/gauge-light</factor-prop>
<red>0.5</red>
<green>0.25</green>
<blue>0.8</blue>
</emission>
</animation>
</PropertyList>

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>switch-Horn.ac</path>
<animation>
<type>material</type>
<object-name>fond</object-name>
<object-name>button</object-name>
<emission>
<factor-prop>controls/switches/gauge-light</factor-prop>
<red> 0.21 </red>
<green> 0.21 </green>
<blue> 0.21 </blue>
</emission>
</animation>
<animation>
<type>translate</type>
<object-name>button</object-name>
<property>/systems/horn</property>
<factor>0.001</factor>
<axis>
<x>-1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
</animation>
<!--Control-->
<animation>
<type>pick</type>
<object-name>button</object-name>
<visible>true</visible>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>sim/multiplay/generic/int[18]</property>
<value>1</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>sim/multiplay/generic/int[18]</property>
<value>0</value>
</binding>
</mod-up>
</action>
</animation>
</PropertyList>

View File

@ -821,4 +821,26 @@
</binding>
</action>
</animation>
<!-- switch for horn -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Horn/switch-horn.xml</path>
<offsets>
<x-m>1.405</x-m>
<y-m>-0.143</y-m>
<z-m>0.919</z-m>
<heading-deg>80.0</heading-deg>
<pitch-deg>-5.0</pitch-deg>
</offsets>
</model>
<!-- sign for horn -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Horn/horn.xml</path>
<offsets>
<x-m>1.416</x-m>
<y-m>-0.17</y-m>
<z-m>0.905</z-m>
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
</PropertyList>