eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 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
parent d8f3f6fe6b
commit 2f755cfe21
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

@@ -2702,9 +2702,9 @@ bool TDynamicObject::Update(double dt, double dt1)
MoverParameters->CheckEIMIC(dt1); MoverParameters->CheckEIMIC(dt1);
MoverParameters->CheckSpeedCtrl(); MoverParameters->CheckSpeedCtrl();
MoverParameters->eimic = Min0R(MoverParameters->eimic, MoverParameters->eimicSpeedCtrl); auto eimic = Min0R(MoverParameters->eimic, MoverParameters->eimicSpeedCtrl);
MoverParameters->SendCtrlToNext("EIMIC", Max0R(0, MoverParameters->eimic), MoverParameters->CabNo); MoverParameters->SendCtrlToNext("EIMIC", Max0R(0, eimic), MoverParameters->CabNo);
auto LBR = Max0R(-MoverParameters->eimic, 0); auto LBR = Max0R(-eimic, 0);
// 1. ustal wymagana sile hamowania calego pociagu // 1. ustal wymagana sile hamowania calego pociagu
// - opoznienie moze byc ustalane na podstawie charakterystyki // - 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; eimic = -1.0;
break; break;
case 1: 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; break;
case 2: 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; break;
case 3: 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; break;
case 4: 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;
} }
break; break;