eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-01 22:49:16 +01:00
Code Issues 157 Wiki Activity

perf(physics): vehicles standing still and held by their brakes let their physics sleep (physics.sleepheld)

Browse Source
This commit is contained in:
Hirek
2026-10-23 18:20:49 +02:00
parent e054fe900d
commit a04efbf968
7 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
McZapkie/Mover.cpp
View File

@@ -4958,13 +4958,13 @@ void TMoverParameters::ComputeTotalForce(double dt)
// McZapkie-031103: sprawdzanie czy warto liczyc fizyke i inne updaty
// ABu 300105: cos tu mieszalem , dziala teraz troche lepiej, wiec zostawiam
{
auto const vehicleisactive{CabActive != 0 || Vel > 0.0001 || std::abs(AccS) > 0.0001 || LastSwitchingTime < 5 || TrainType == dt_EZT || TrainType == dt_DMU};
auto const vehicleisactive{CabActive != 0 || Vel > 0.0001 || accelerating() || LastSwitchingTime < 5 || TrainType == dt_EZT || TrainType == dt_DMU};
auto const movingvehicleahead{Neighbours[end::front].vehicle != nullptr &&
(Neighbours[end::front].vehicle->MoverParameters->Vel > 0.0001 || std::abs(Neighbours[end::front].vehicle->MoverParameters->AccS) > 0.0001)};
(Neighbours[end::front].vehicle->MoverParameters->Vel > 0.0001 || Neighbours[end::front].vehicle->MoverParameters->accelerating())};
auto const movingvehiclebehind{Neighbours[end::rear].vehicle != nullptr &&
(Neighbours[end::rear].vehicle->MoverParameters->Vel > 0.0001 || std::abs(Neighbours[end::rear].vehicle->MoverParameters->AccS) > 0.0001)};
(Neighbours[end::rear].vehicle->MoverParameters->Vel > 0.0001 || Neighbours[end::rear].vehicle->MoverParameters->accelerating())};
auto const calculatephysics{vehicleisactive || movingvehicleahead || movingvehiclebehind};
@@ -8918,6 +8918,19 @@ double TMoverParameters::GetTrainsetHighVoltage() const
return std::max(GetTrainsetVoltage(coupling::highvoltage), HeatingAllow ? GetTrainsetVoltage(coupling::heating) : 0.0);
}
// *************************************************************************************************
// whether the vehicle accelerates, for the test which turns the physics off in vehicles standing still
// *************************************************************************************************
bool TMoverParameters::accelerating() const
{
if (std::abs(AccS) <= 0.0001)
return false;
// standing still and held by the brakes and the resistance, against the slope and the couplers: the test ComputeMovement()
// sets the speed to zero by. the forces are of the last ComputeTotalForce(), the ones the movement went by
auto const held{Global.physics_sleepheld && Vel <= 0.0001 && std::abs(FStand) > std::abs(FTrain)};
return false == held;
}
// *************************************************************************************************
// Kasowanie zmiennych pracy fizyki
// *************************************************************************************************