eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrected shifting speed for EIMCtrlType == 2

Browse Source
This commit is contained in:
Królik Uszasty
2019-03-09 22:12:48 +01:00
committed by tmj-fstate
parent 868c86c6e2
commit 18e46aa063
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DynObj.cpp
View File

@@ -2704,9 +2704,9 @@ bool TDynamicObject::Update(double dt, double dt1)
MoverParameters->CheckEIMIC(dt1);
MoverParameters->CheckSpeedCtrl();
MoverParameters->eimic = Min0R(MoverParameters->eimic, MoverParameters->eimicSpeedCtrl);
MoverParameters->SendCtrlToNext("EIMIC", Max0R(0, MoverParameters->eimic), MoverParameters->CabNo);
auto LBR = Max0R(-MoverParameters->eimic, 0);
auto eimic = Min0R(MoverParameters->eimic, MoverParameters->eimicSpeedCtrl);
MoverParameters->SendCtrlToNext("EIMIC", Max0R(0, eimic), MoverParameters->CabNo);
auto LBR = Max0R(-eimic, 0);
// 1. ustal wymagana sile hamowania calego pociagu
// - opoznienie moze byc ustalane na podstawie charakterystyki

10
McZapkie/Mover.cpp
View File

@@ -5947,16 +5947,18 @@ void TMoverParameters::CheckEIMIC(double dt)
eimic = -1.0;
break;
case 1:
eimic -= clamp(1.0 + eimic, 0.0, dt*0.3); //odejmuj do -1
eimic -= clamp(1.0 + eimic, 0.0, dt*0.15); //odejmuj do -1
if (eimic > 0) eimic = 0;
break;
case 2:
eimic -= clamp(0.0 + eimic, 0.0, dt*0.3); //odejmuj do 0
eimic -= clamp(0.0 + eimic, 0.0, dt*0.15); //odejmuj do 0
break;
case 3:
eimic += clamp(0.0 - eimic, 0.0, dt*0.3); //dodawaj do 0
eimic += clamp(0.0 - eimic, 0.0, dt*0.15); //dodawaj do 0
break;
case 4:
eimic += clamp(1.0 - eimic, 0.0, dt*0.3); //dodawaj do 1
eimic += clamp(1.0 - eimic, 0.0, dt*0.15); //dodawaj do 1
if (eimic < 0) eimic = 0;
break;
}
break;