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

Panel: Added indicator sign for luxury. AEB and high beam sign still doesn't support MP.

This commit is contained in:
Sidi Liang 2020-04-16 12:09:21 +08:00
parent 8990482f87
commit 822262aae6
No known key found for this signature in database
GPG Key ID: 79F0A6B20B72F42F
4 changed files with 111 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Models/Interior/luxury/interior.xml
View File

@ -137,6 +137,102 @@
<texture>parkingbrake.png</texture>
</animation>
<animation>
<type>material</type>
<object-name>handbrake_LIT</object-name>
<condition>
<equals>
<property>sim/multiplay/generic/float[19]</property>
<value>1</value>
</equals>
</condition>
<texture>handbrake_LIT.png</texture>
</animation>
<animation>
<type>material</type>
<object-name></object-name>
<condition>
<equals>
<property>sim/multiplay/generic/float[19]</property>
<value>0</value>
</equals>
</condition>
<texture>panel_black.png</texture>
</animation>
<!-- AEB -->
<animation>
<type>material</type>
<object-name>AEB_LIT</object-name>
<condition>
<equals>
<property>system/safety/aeb_activated</property>
<value>1</value>
</equals>
</condition>
<texture>AEB_LIT.png</texture>
</animation>
<animation>
<type>material</type>
<object-name>AEB_LIT</object-name>
<condition>
<equals>
<property>system/safety/aeb_activated</property>
<value>0</value>
</equals>
</condition>
<texture>panel_black.png</texture>
</animation>
<!-- Headlight -->
<animation>
<type>material</type>
<object-name>headlight_LIT</object-name>
<condition>
<equals>
<property>sim/multiplay/generic/int[3]</property>
<value>1</value>
</equals>
</condition>
<texture>headlight_LIT.png</texture>
</animation>
<animation>
<type>material</type>
<object-name>headlight_LIT</object-name>
<condition>
<equals>
<property>sim/multiplay/generic/int[3]</property>
<value>0</value>
</equals>
</condition>
<texture>panel_black.png</texture>
</animation>
<!-- HighBeam -->
<animation>
<type>material</type>
<object-name>longheadlight_LIT</object-name>
<condition>
<equals>
<property>controls/lighting/highBeam</property>
<value>1</value>
</equals>
</condition>
<texture>longheadlight_LIT.png</texture>
</animation>
<animation>
<type>material</type>
<object-name>longheadlight_LIT</object-name>
<condition>
<equals>
<property>controls/lighting/highBeam</property>
<value>0</value>
</equals>
</condition>
<texture>panel_black.png</texture>
</animation>
<!-- Indicator -->
<animation>
<type>material</type>

14
Models/Interior/luxury/luxurystr.ac
View File

@ -6,7 +6,7 @@ kids 7
OBJECT poly
name "box"
loc 1.22736 -0.0293362 0.119003
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 52
0.00245416 -8.9312e-05 -0.237599
@ -402,7 +402,7 @@ kids 0
OBJECT poly
name "block"
loc 1.22826 0 -0.457865
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 428
0.0681581 -0.14358 0.507291
@ -5708,7 +5708,7 @@ kids 0
OBJECT poly
name "box"
loc 0.0285985 -0.942069 -0.000498766
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 8
1.20884 0.880577 -0.0566651
@ -5766,7 +5766,7 @@ kids 0
OBJECT poly
name "block"
loc 1.26047 -0.0553972 0.098279
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 436
0.00708902 -0.0268546 -0.098279
@ -9234,7 +9234,7 @@ kids 0
OBJECT poly
name "cylinder"
loc 1.21499 -0.0516568 0
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 34
0.0301465 0.0523032 0.0844235
@ -9580,7 +9580,7 @@ kids 0
OBJECT poly
name "cylinder"
loc 1.24991 -0.0311779 0.114224
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 68
0.00400531 0.0173331 -0.269026
@ -10264,7 +10264,7 @@ kids 0
OBJECT poly
name "cylinder"
loc 1.25252 -0.0291307 0.117667
texture "C:/Users/13272/Desktop/luxury/leather.jpg"
texture "leather.jpg"
crease 45.000000
numvert 68
0.00322115 0.0128943 -0.273153

BIN
Models/Interior/luxury/panel_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

8
Nasal/systems.nas
View File

@ -114,6 +114,7 @@ props.getNode("systems/screen-enable", 1).setValue(0);
props.getNode("systems/pmodel-enable", 1).setValue(1);
props.getNode("systems/decorations-enable", 1).setValue(0);
props.getNode("systems/interior/type", 1).setValue("Default");
props.getNode("/systems/safety/aeb_activated", 1).setValue(0);
#var Led = {
#
@ -572,6 +573,7 @@ var Safety = {
accYProp: props.getNode("/fdm/jsbsim/accelerations/a-pilot-y-ft_sec2", 1),
frontAirbagProp: props.getNode("/systems/safety/airbag/front", 1),
sideAirbagProp: props.getNode("/systems/safety/airbag/side", 1),
aebStateProp: props.getNode("/systems/safety/aeb_activated", 1),
airbagAccelerationLimit: 140, #To be configured,m/s^2
sideAirbagAccelerationLimit: 72, #To be configured,m/s^2
@ -604,11 +606,13 @@ var Safety = {
me.throttleNode.setValue(0);
brakeController.activeEmergencyBrake();
playAudio("parking_radar_init.wav");
me.aebStateProp.setValue(1);
print("AEB Activated!");
},
aebStop: func(){
me.aebActivated = 0;
print("AEB Stopped");
me.aebStateProp.setValue(0);
#engine.engine_1.engineSwitch.switchConnect();
brakeController.releaseAllBrakes();
},
@ -645,6 +649,7 @@ var Safety = {
}
}else{
if(me.frontRadarEnabled and me.frontRadar.radarTimer.isRunning) me.frontRadar.stop();
props.getNode("/systems/safety/aeb_activated", 1).setValue(0);
}
#ABS
@ -670,11 +675,13 @@ var Safety = {
me.disableFrontRadar();
me.frontAirbagProp.setValue(0);
me.sideAirbagProp.setValue(0);
me.aebStateProp.setValue(0);
},
init: func(){
#initialize or reinitialize
me.frontAirbagProp.setValue(0);
me.sideAirbagProp.setValue(0);
me.aebStateProp.setValue(0);
if(me.safetySystemTimer == nil) me.safetySystemTimer = maketimer(me.updateInterval, func me.update());
me.safetySystemTimer.start();
if(me.frontRadarEnabled) me.enableFrontRadar();
@ -683,6 +690,7 @@ var Safety = {
},
stop: func(){
me.isOn = 0;
me.aebStateProp.setValue(0);
me.disableFrontRadar();
me.safetySystemTimer.stop();
print("Safety system stoped");