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

Instruments: Added a Beijing type speedometer. Screen: Texture update. Both texture work are done by 0404.

This commit is contained in:
Sidi Liang 2019-10-16 22:37:09 +08:00
parent 7b922c7240
commit 151d9ce3d3
16 changed files with 1913 additions and 5 deletions

2
Models/Instruments/speedometer/Concept/needle-light.eff
View File

@ -4,7 +4,7 @@
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int"><use>controls/lighting/headlight</use></lightmap-enabled>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>needle_LIT.png</image>

2
Models/Instruments/speedometer/Concept/speedometer.xml
View File

@ -22,7 +22,7 @@
</effect>
<effect>
<inherits-from>needle-light</inherits-from>
<inherits-from>Effects/needle-light</inherits-from>
<object-name>needle</object-name>
</effect>

22
Models/Instruments/speedometer/Type_B/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_B/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_B/needle.png Normal file
View File

Binary file not shown.
Side by Side

After

(image error) Size: 5.1 KiB

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

Binary file not shown.
Side by Side

After

(image error) Size: 5.1 KiB

1719
Models/Instruments/speedometer/Type_B/speedometer.ac Normal file
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side

After

(image error) Size: 30 KiB

129
Models/Instruments/speedometer/Type_B/speedometer.xml Normal file
View File

@ -0,0 +1,129 @@
<?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>3.08667</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">64.795</value>
</less-than>
</and>
</condition>
<property>sim/multiplay/generic/float[15]</property>
<factor>-0.61733</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>
<less-than>
<property>sim/multiplay/generic/float[15]</property>
<value type="double">161.987</value>
</less-than>
</condition>
<property>sim/multiplay/generic/float[15]</property>
<factor>-1.23467</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">161.987</value>
</greater-than>
</condition>
<value>-300</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_B/speedometer_LIT.png Normal file
View File

Binary file not shown.
Side by Side

After

(image error) Size: 30 KiB

2
Models/Instruments/speedometer/Type_M/needle-light.eff
View File

@ -4,7 +4,7 @@
<inherits-from>/Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int"><use>controls/lighting/headlight</use></lightmap-enabled>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">1</lightmap-multi>
<texture n="3">
<image>needle_LIT.png</image>

2
Models/Instruments/speedometer/Type_M/speedometer.xml
View File

@ -22,7 +22,7 @@
</effect>
<effect>
<inherits-from>needle-light</inherits-from>
<inherits-from>Effects/needle-light</inherits-from>
<object-name>needle</object-name>
</effect>

17
Models/followmeEV.xml
View File

@ -114,7 +114,7 @@
<value>1</value>
</equals>
</condition>
</condition>-
</animation>
@ -223,6 +223,21 @@
</offsets>
</model>
<model>
<condition>
<equals>
<property>sim/multiplay/generic/string[2]</property>
<value>Type_B</value>
</equals>
</condition>
<path>Aircraft/followme_e-tron/Models/Instruments/speedometer/Type_B/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>

BIN
Models/screen.jpeg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 916 KiB

After

(image error) Size: 870 KiB

BIN
Models/screen_1.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

(image error) Size: 765 KiB

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

@ -243,6 +243,7 @@
<property>/systems/speedometer/type</property>
<value>Type_A</value>
<value>Type_M</value>
<value>Type_B</value>
<value>Concept</value>
<value>Original</value>
<binding>