mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 16:19:19 +02:00
Better bumps on switches
This commit is contained in:
39
DynObj.cpp
39
DynObj.cpp
@@ -3535,22 +3535,29 @@ bool TDynamicObject::Update(double dt, double dt1)
|
|||||||
clamp(-1.0, 1.0, (MoverParameters->Vel / ( 1 + MoverParameters->Vmax )) * MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
clamp(-1.0, 1.0, (MoverParameters->Vel / ( 1 + MoverParameters->Vmax )) * MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
||||||
|
|
||||||
if (MyTrack->eType == tt_Switch){
|
if (MyTrack->eType == tt_Switch){
|
||||||
MoverParameters->AccSVBased += clamp(
|
MoverParameters->AccS +=
|
||||||
-1.0, 1.0,
|
clamp(0.0, 1.0,
|
||||||
(MoverParameters->Vel / (1 + MoverParameters->Vmax)) *
|
(clamp(0.0, MoverParameters->Vmax,
|
||||||
MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
MoverParameters->Vmax -
|
||||||
MoverParameters->AccS += clamp(
|
(MoverParameters->Vel +
|
||||||
-1.0, 1.0,
|
MoverParameters->Vmax * 0.32f))) *
|
||||||
(MoverParameters->Vel / (1 + MoverParameters->Vmax)) *
|
.05f * (MyTrack->iDamageFlag * 0.25f)) *
|
||||||
MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
((axleindex % 2) != 0 ? 1 : -1);
|
||||||
MoverParameters->AccN += clamp(
|
MoverParameters->AccN +=
|
||||||
-1.0, 1.0,
|
clamp(0.0, 1.0,
|
||||||
(MoverParameters->Vel / (1 + MoverParameters->Vmax)) *
|
(clamp(0.0, MoverParameters->Vmax,
|
||||||
MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
MoverParameters->Vmax -
|
||||||
MoverParameters->AccVert += clamp(
|
(MoverParameters->Vel +
|
||||||
-1.0, 1.0,
|
MoverParameters->Vmax * 0.32f))) *
|
||||||
(MoverParameters->Vel / (1 + MoverParameters->Vmax)) *
|
.05f * (MyTrack->iDamageFlag * 0.25f)) *
|
||||||
MyTrack->iDamageFlag * ((axleindex % 2) != 0 ? 1 : -1));
|
((axleindex % 2) != 0 ? 1 : -1);
|
||||||
|
MoverParameters->AccVert +=
|
||||||
|
clamp(0.0, 2.0,
|
||||||
|
(clamp(0.0, MoverParameters->Vmax,
|
||||||
|
MoverParameters->Vmax -
|
||||||
|
(MoverParameters->Vel +
|
||||||
|
MoverParameters->Vmax * 0.32f))) *
|
||||||
|
.05f * (MyTrack->iDamageFlag * 0.25f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user