Merge branch 'Marsdolphin-master'

This commit is contained in:
Sidi Liang 2020-02-17 17:23:45 +08:00
commit 00adb99e9f
No known key found for this signature in database
GPG Key ID: 79F0A6B20B72F42F
19 changed files with 12720 additions and 6 deletions

View File

@ -1 +1 @@
20170405
20200217

View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>switch.ac</path>
<animation>
<object-name>fond</object-name>
<!--object-name>switch</object-name-->
</animation>
<animation>
<type>pick</type>
<object-name>switch</object-name>
<action>
<button>0</button>
<binding>
<command>property-toggle</command>
<property>controls/lighting/indicator-right</property>
</binding>
<binding>
<command>property-toggle</command>
<property>controls/lighting/indicator-left</property>
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>switch</object-name>
<property>controls/lighting/indicator-right</property>
<factor> -50 </factor>
<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

@ -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 "sign.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.0 KiB

View File

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<PropertyList>
<path>sign.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>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
</PropertyList>

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>switch.ac</path>
<animation>
<object-name>fond</object-name>
<!--object-name>switch</object-name-->
</animation>
<animation>
<type>pick</type>
<object-name>switch</object-name>
<action>
<button>0</button>
<binding>
<command>property-toggle</command>
<property>warninglight/start</property>
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>switch</object-name>
<property>/warninglight/start</property>
<factor> -50 </factor>
<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>

File diff suppressed because it is too large Load Diff

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 "wl.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: 2.5 KiB

View File

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<PropertyList>
<path>wl.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>

View File

@ -1,12 +1,10 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Orange</name>
<texture>Texture/Orange.png</texture>
<texture-fuse>Texture/Orange.png</texture-fuse>
</livery>
</model>
</sim>

BIN
Models/Texture/blue.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

11
Models/Texture/blue.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Blue</name>
<texture-fuse>Texture/blue.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

View File

@ -843,4 +843,44 @@
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
<!-- Switch for indicator -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Switches/Indicators/indicators.xml</path>
<offsets>
<x-m>1.306</x-m>
<y-m>-0.52</y-m>
<z-m>0.935</z-m>
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
<!-- Indicator sign -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Switches/Indicators/sign.xml</path>
<offsets>
<x-m>1.306</x-m>
<y-m>-0.52</y-m>
<z-m>0.935</z-m>
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
<!-- Switch for warning lights -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Switches/Warninglights/s-warninglights.xml</path>
<offsets>
<x-m>1.306</x-m>
<y-m>-0.498</y-m>
<z-m>0.935</z-m>
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
<!-- Indicator warning lights -->
<model>
<path>Aircraft/followme_e-tron/Models/Instruments/Switches/Warninglights/wl.xml</path>
<offsets>
<x-m>1.306</x-m>
<y-m>-0.498</y-m>
<z-m>0.935</z-m>
<pitch-deg>-18.0</pitch-deg>
</offsets>
</model>
</PropertyList>

View File

@ -16,10 +16,17 @@
<type>select</type>
<object-name>warninglight</object-name>
<condition>
<and>
<property>/sim/model/lights/warning/state</property>
<equals>
<property>warninglight/start</property>
<value>1</value>
</equals>
</and>
</condition>
</animation>
<animation>
<type>range</type>
<min-m>0</min-m>

View File

@ -4,7 +4,8 @@ This is a Follow-me vehicle (Renault Kangoo I) based on Gijs's work, but an elec
Authors:
Sidi Liang(FGPRC-0762): FDM, Engine, Nasal, Systems, Instruments, Models, Textures, Effects
ValKmjolnir(FGPRC-0818): 'Auto Crash' System, Nasal
Weihao Lee(FGPRC-0405): Models, Textures, Effects
Weihao Lee(FGPRC-0405): Models, Textures, Effects
Qiyuan Luo(FGPRC-0404): Instruments, Textures
Mars006: Models, Lights, Instruments
![Preview](http://wiki.flightgear.org/images/5/51/Preview-etron.png)