Instruments: updated
This commit is contained in:
Sidi Liang
parent
a75c4b4b20
commit
f7eb8e334a
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 70 KiB |
|
|
@ -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>
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>fuelgauge.ac</path>
|
||||
<effect>
|
||||
<inherits-from>fuelgauge-light</inherits-from>
|
||||
<object-name>face</object-name>
|
||||
<object-name>needle</object-name>
|
||||
</effect>
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>needle</object-name>
|
||||
<property>systems/electrical/e-tron/battery-kWh</property>
|
||||
<factor>-1.125</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>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -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>
|
||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>fuelgauge.ac</path>
|
||||
<effect>
|
||||
<inherits-from>fuelgauge-light</inherits-from>
|
||||
<object-name>face</object-name>
|
||||
<object-name>needle</object-name>
|
||||
</effect>
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>needle</object-name>
|
||||
<property>systems/electrical/e-tron/battery-kWh</property>
|
||||
<factor>-1.125</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>
|
||||
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.1 KiB |
|
|
@ -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>
|
||||
|
|
@ -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"><use>controls/lighting/headlight</use></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>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 98 KiB |
|
|
@ -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>needle-light</inherits-from>
|
||||
<object-name>needle</object-name>
|
||||
</effect>
|
||||
|
||||
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>needle</object-name>
|
||||
<condition>
|
||||
<less-than>
|
||||
<property>velocities/groundspeed-kt</property>
|
||||
<value type="double">0</value>
|
||||
</less-than>
|
||||
</condition>
|
||||
<property>velocities/groundspeed-kt</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>velocities/groundspeed-kt</property>
|
||||
<value type="double">0</value>
|
||||
</greater-than>
|
||||
<less-than>
|
||||
<property>velocities/groundspeed-kt</property>
|
||||
<value type="double">64.795</value>
|
||||
</less-than>
|
||||
</and>
|
||||
</condition>
|
||||
<property>velocities/groundspeed-kt</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>velocities/groundspeed-kt</property>
|
||||
<value type="double">161.987</value>
|
||||
</less-than>
|
||||
</condition>
|
||||
<property>velocities/groundspeed-kt</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>velocities/groundspeed-kt</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>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 102 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 58 KiB |
|
|
@ -54,7 +54,58 @@
|
|||
<!-- INSTRUMENTS -->
|
||||
|
||||
<model>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/fuelgauge.xml</path>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>systems/battery-gauge/type</property>
|
||||
<value>Type_A</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/Type_A/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>
|
||||
<property>systems/battery-gauge/type</property>
|
||||
<value>Type_M</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/Type_M/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>
|
||||
<property>systems/battery-gauge/type</property>
|
||||
<value>Original</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/Type_O/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>
|
||||
<property>systems/battery-gauge/type</property>
|
||||
<value>Concept</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/fuelgauge/Concept/fuelgauge.xml</path>
|
||||
<offsets>
|
||||
<x-m>1.31</x-m>
|
||||
<y-m>-0.25</y-m>
|
||||
|
|
@ -81,7 +132,7 @@
|
|||
<condition>
|
||||
<equals>
|
||||
<property>systems/speedometer/type</property>
|
||||
<value>Type_O</value>
|
||||
<value>Original</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/speedometer/Type_O/speedometer.xml</path>
|
||||
|
|
@ -106,6 +157,21 @@
|
|||
<z-m>1.03</z-m>
|
||||
</offsets>
|
||||
</model>
|
||||
|
||||
<model>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>systems/speedometer/type</property>
|
||||
<value>Concept</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<path>Aircraft/followme_e-tron/Models/Instruments/speedometer/Concept/speedometer.xml</path>
|
||||
<offsets>
|
||||
<x-m>1.31</x-m>
|
||||
<y-m>-0.38</y-m>
|
||||
<z-m>1.03</z-m>
|
||||
</offsets>
|
||||
</model>
|
||||
|
||||
<!-- STEERINGWHEEL -->
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ props.getNode("/controls/is-recharging", 1).setValue(0);
|
|||
props.getNode("systems/welcome-message", 1).setValue(0);
|
||||
props.getNode("systems/display-speed", 1).setValue(0);
|
||||
props.getNode("systems/speedometer/type", 1).setValue("Type_A");
|
||||
props.getNode("systems/battery-gauge/type", 1).setValue("Type_A");
|
||||
props.getNode("controls/lighting/headlight-als", 1).setValue(0);
|
||||
props.getNode("controls/lighting/highBeam", 1).setValue(0);
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
</group>
|
||||
|
||||
<hrule/>
|
||||
<text><label>Speedometer Type</label></text>
|
||||
<text><label>Configuration</label></text>
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<!--<button>
|
||||
|
|
@ -230,23 +230,50 @@
|
|||
<value>1</value>
|
||||
</binding>
|
||||
</button>-->
|
||||
<group>
|
||||
<layout>vbox</layout>
|
||||
<text><label>Speedometer type</label></text>
|
||||
<combo>
|
||||
<name>speedType</name>
|
||||
<row>1</row>
|
||||
<col>6</col>
|
||||
<pref-width>120</pref-width>
|
||||
<halign>left</halign>
|
||||
<name>Speedometer Type</name>
|
||||
<property>/systems/speedometer/type</property>
|
||||
<value>Type_A</value>
|
||||
<value>Type_M</value>
|
||||
<value>Concept</value>
|
||||
<value>Original</value>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>speedType</object-name>
|
||||
</binding>
|
||||
</combo>
|
||||
</group>
|
||||
|
||||
<group>
|
||||
<layout>vbox</layout>
|
||||
<text><label>Battery gauge type</label></text>
|
||||
<combo>
|
||||
<name>batteryType</name>
|
||||
<row>1</row>
|
||||
<col>6</col>
|
||||
<pref-width>120</pref-width>
|
||||
<halign>left</halign>
|
||||
<name>Battery gauge Type</name>
|
||||
<property>/systems/battery-gauge/type</property>
|
||||
<value>Type_A</value>
|
||||
<value>Type_M</value>
|
||||
<value>Concept</value>
|
||||
<value>Original</value>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>batteryType</object-name>
|
||||
</binding>
|
||||
</combo>
|
||||
</group>
|
||||
|
||||
<combo>
|
||||
<name>speedType</name>
|
||||
<row>1</row>
|
||||
<col>6</col>
|
||||
<pref-width>120</pref-width>
|
||||
<halign>left</halign>
|
||||
<name>Speedometer Type</name>
|
||||
<property>/systems/speedometer/type</property>
|
||||
<value>Type_A</value>
|
||||
<value>Type_M</value>
|
||||
<value>Type_O</value>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>speedType</object-name>
|
||||
</binding>
|
||||
</combo>
|
||||
</group>
|
||||
|
||||
<hrule/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue