p38192567
/
followme_e-tron
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Instruments: Added Type_BT, and light fix for some others

This commit is contained in:
Sidi Liang 2020-01-29 00:26:06 +08:00
parent 3c3e8c6a62
commit 51923b76ab
29 changed files with 3246 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Models/Instruments/fuelgauge/Concept/fuelgauge.xml
View File

@ -6,8 +6,13 @@
<effect>
<inherits-from>fuelgauge-light</inherits-from>
<object-name>face</object-name>
</effect>
<effect>
<inherits-from>needle-light</inherits-from>
<object-name>needle</object-name>
</effect>
<animation>
<type>rotate</type>
<object-name>needle</object-name>

22
Models/Instruments/fuelgauge/Concept/needle-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>needle-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>fuelgauge_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

22
Models/Instruments/fuelgauge/Type_BT/fuelgauge-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>fuelgauge-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int"><use>controls/lighting/headlight</use></lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>fuelgauge_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

1215
Models/Instruments/fuelgauge/Type_BT/fuelgauge.ac Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Models/Instruments/fuelgauge/Type_BT/fuelgauge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

35
Models/Instruments/fuelgauge/Type_BT/fuelgauge.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0"?>
<PropertyList>
<path>fuelgauge.ac</path>
<effect>
<inherits-from>fuelgauge-light</inherits-from>
<object-name>face</object-name>
</effect>
<effect>
<inherits-from>needle-light</inherits-from>
<object-name>needle</object-name>
</effect>
<animation>
<type>rotate</type>
<object-name>needle</object-name>
<property>sim/multiplay/generic/float[17]</property>
<factor>-0.9</factor>
<offset>22.5</offset>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>-0.015</z-m>
</center>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
</animation>
</PropertyList>

BIN
Models/Instruments/fuelgauge/Type_BT/fuelgauge_LIT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

22
Models/Instruments/fuelgauge/Type_BT/needle-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>needle-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>fuelgauge_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

5
Models/Instruments/fuelgauge/Type_M/fuelgauge.xml
View File

@ -6,8 +6,13 @@
<effect>
<inherits-from>fuelgauge-light</inherits-from>
<object-name>face</object-name>
</effect>
<effect>
<inherits-from>needle-light</inherits-from>
<object-name>needle</object-name>
</effect>
<animation>
<type>rotate</type>
<object-name>needle</object-name>

22
Models/Instruments/fuelgauge/Type_M/needle-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>needle-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>fuelgauge_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

0
Models/Instruments/speedometer/Type_A/face-light.eff Normal file → Executable file
View File

0
Models/Instruments/speedometer/Type_A/needle-light.eff Normal file → Executable file
View File

0
Models/Instruments/speedometer/Type_A/needle.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
Models/Instruments/speedometer/Type_A/needle_LIT.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
Models/Instruments/speedometer/Type_A/speedometer.ac Normal file → Executable file
View File

0
Models/Instruments/speedometer/Type_A/speedometer.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
Models/Instruments/speedometer/Type_A/speedometer.xml Normal file → Executable file
View File

0
Models/Instruments/speedometer/Type_A/speedometer_LIT.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

22
Models/Instruments/speedometer/Type_BT/face-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>face-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int"><use>controls/lighting/headlight</use></lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>speedometer_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

22
Models/Instruments/speedometer/Type_BT/needle-light.eff Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>needle-light</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>needle_LIT.png</image>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<lightmap-factor type="float" n="0">1</lightmap-factor>
<lightmap-factor type="float" n="1">1</lightmap-factor>
<lightmap-factor type="float" n="2">1</lightmap-factor>
<lightmap-color type="vec3d" n="0"> 1. 0. 0. </lightmap-color>
<lightmap-color type="vec3d" n="1"> 0. 1. 0. </lightmap-color>
<lightmap-color type="vec3d" n="2"> 0. 0. 1. </lightmap-color>
<lightmap-factor type="float" n="3">0</lightmap-factor>
</parameters>
</PropertyList>

BIN
Models/Instruments/speedometer/Type_BT/needle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
Models/Instruments/speedometer/Type_BT/needle_LIT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

1710
Models/Instruments/speedometer/Type_BT/speedometer.ac Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Models/Instruments/speedometer/Type_BT/speedometer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 KiB

106
Models/Instruments/speedometer/Type_BT/speedometer.xml Normal file
View File

@ -0,0 +1,106 @@
<?xml version="1.0"?>
<PropertyList>
<!--back-->
<!--right -->
<!--up -->
<path>speedometer.ac</path>
<effect>
<inherits-from>face-light</inherits-from>
<object-name>digit.1</object-name>
<object-name>digit.2</object-name>
<object-name>digit.3</object-name>
<object-name>digit.4</object-name>
<object-name>digit.5</object-name>
<object-name>digit.6</object-name>
<object-name>face</object-name>
</effect>
<effect>
<inherits-from>Effects/needle-light</inherits-from>
<object-name>needle</object-name>
</effect>
<animation>
<type>rotate</type>
<object-name>needle</object-name>
<condition>
<less-than>
<property>sim/multiplay/generic/float[15]</property>
<value type="double">0</value>
</less-than>
</condition>
<property>sim/multiplay/generic/float[15]</property>
<factor>1.1112</factor>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>needle</object-name>
<condition>
<and>
<greater-than>
<property>sim/multiplay/generic/float[15]</property>
<value type="double">0</value>
</greater-than>
<less-than>
<property>sim/multiplay/generic/float[15]</property>
<value type="double">269.9784</value>
</less-than>
</and>
</condition>
<property>sim/multiplay/generic/float[15]</property>
<factor>-1.1112</factor>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>needle</object-name>
<condition>
<greater-than>
<property>sim/multiplay/generic/float[15]</property>
<value type="double">269.9784</value>
</greater-than>
</condition>
<value>-330</value>
<center>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
<axis>
<x>1.0</x>
<y>0.0</y>
<z>0.0</z>
</axis>
</animation>
</PropertyList>

BIN
Models/Instruments/speedometer/Type_BT/speedometer_LIT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

32
Models/followmeEV.xml
View File

@ -112,7 +112,7 @@
<value>1</value>
</equals>
</condition>-
</condition>
</animation>
@ -146,6 +146,21 @@
</offsets>
</model>
<model>
<condition>
<equals>
<property>sim/multiplay/generic/string[1]</property>
<value>Type_BT</value>
</equals>
</condition>
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/Type_BT/fuelgauge.xml</path>
<offsets>
<x-m>1.31</x-m>
<y-m>-0.25</y-m>
<z-m>1.01</z-m>
</offsets>
</model>
<model>
<condition>
<equals>
@ -236,6 +251,21 @@
</offsets>
</model>
<model>
<condition>
<equals>
<property>sim/multiplay/generic/string[2]</property>
<value>Type_BT</value>
</equals>
</condition>
<path>Aircraft/followme_e-tron/Models/Instruments/speedometer/Type_BT/speedometer.xml</path>
<offsets>
<x-m>1.31</x-m>
<y-m>-0.38</y-m>
<z-m>1.03</z-m>
</offsets>
</model>
<model>
<condition>
<equals>

5
followme_e-tron-set.xml
View File

@ -200,6 +200,11 @@
<splash type="bool">true</splash>
<path>Splash/G4_Tour/10.jpg</path>
</preview>
<preview>
<type>exterior</type>
<splash type="bool">true</splash>
<path>Splash/G4_Tour/11.jpg</path>
</preview>
</previews>
<rating>

2
gui/dialogs/vehicle-dialog.xml
View File

@ -309,6 +309,7 @@
<value>Type_A</value>
<value>Type_M</value>
<value>Type_B</value>
<value>Type_BT</value>
<value>Concept</value>
<value>Original</value>
<binding>
@ -331,6 +332,7 @@
<property>/systems/battery-gauge/type</property>
<value>Type_A</value>
<value>Type_M</value>
<value>Type_BT</value>
<value>Concept</value>
<value>Original</value>
<binding>