eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

reformat: use auto on certain types

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 05:22:52 +02:00
parent f61068ff89
commit 20e7a99516
118 changed files with 2118 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vehicle/AirCoupler.cpp
View File

@@ -66,7 +66,7 @@ void AirCoupler::Init(std::string const &asName, TModel3d *Model)
*/
void AirCoupler::Load(cParser *Parser, TModel3d *Model)
{
auto name = Parser->getToken<std::string>();
const auto name = Parser->getToken<std::string>();
if(Model)
{
Init(name, Model);

6
vehicle/Camera.cpp
View File

@@ -45,10 +45,10 @@ void TCamera::OnCursorMove(double x, double y) {
}
static double ComputeAxisSpeed(double param, double walkspeed, double maxspeed, double threshold) {
double absval = std::abs(param);
const double absval = std::abs(param);
// 2/3rd of the stick range lerps walk speed, past that we lerp between max walk and run speed
double walk = walkspeed * std::min(absval / threshold, 1.0);
double run = std::max(0.0, absval - threshold) / (1.0 - threshold) * std::max(0.0, maxspeed - walkspeed);
const double walk = walkspeed * std::min(absval / threshold, 1.0);
const double run = std::max(0.0, absval - threshold) / (1.0 - threshold) * std::max(0.0, maxspeed - walkspeed);
return (param >= 0.0 ? 1.0 : -1.0) * (walk + run);
}

84
vehicle/Driver.cpp
View File

@@ -200,9 +200,9 @@ void TSpeedPos::Clear()
void TSpeedPos::CommandCheck()
{ // sprawdzenie typu komendy w evencie i określenie prędkości
TCommandType command = evEvent->input_command();
double value1 = evEvent->input_value(1);
double value2 = evEvent->input_value(2);
const TCommandType command = evEvent->input_command();
const double value1 = evEvent->input_value(1);
const double value2 = evEvent->input_value(2);
switch (command)
{
case TCommandType::cm_ShuntVelocity:
@@ -459,9 +459,9 @@ std::vector<basic_event *> TController::CheckTrackEvent( TTrack *Track, double c
std::vector<basic_event *> events;
auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) };
for( auto const &event : eventsequence ) {
if( event.second != nullptr
&& event.second->m_passive ) {
events.emplace_back( event.second );
if( event != nullptr
&& event->m_passive ) {
events.emplace_back( event );
}
}
return events;
@@ -476,7 +476,7 @@ bool TController::TableAddNew()
bool TController::TableNotFound(basic_event const *Event, double const Distance ) const
{ // sprawdzenie, czy nie został już dodany do tabelki (np. podwójne W4 robi problemy)
auto lookup =
const auto lookup =
std::find_if(
sSpeedTable.begin(),
sSpeedTable.end(),
@@ -1150,8 +1150,8 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub
Drugi paramer dodatni - długość peronu (W4).
*/
auto L = 0.0;
auto Par1 = Point.evEvent->input_value(1);
auto Par2 = Point.evEvent->input_value(2);
const auto Par1 = Point.evEvent->input_value(1);
const auto Par2 = Point.evEvent->input_value(2);
if (Par2 >= 0 || fLength < -Par2) { //użyj tego W4
if (Par1 < 0) {
L = -Par1;
@@ -2014,7 +2014,7 @@ void TController::Activation()
iDirection = iDirectionOrder; // kierunek (względem sprzęgów pojazdu z AI) właśnie został ustalony (zmieniony)
if (iDirection)
{ // jeśli jest ustalony kierunek
auto *initialvehicle { pVehicle };
const auto *initialvehicle { pVehicle };
/*
auto const initiallocalbrakelevel { mvOccupied->LocalBrakePosA };
*/
@@ -2107,7 +2107,7 @@ void TController::Activation()
void TController::AutoRewident()
{ // autorewident: nastawianie hamulców w składzie
int r = 0, g = 0, p = 0; // ilości wagonów poszczególnych typów
TDynamicObject *d = pVehicles[0]; // pojazd na czele składu
const TDynamicObject *d = pVehicles[0]; // pojazd na czele składu
// 1. Zebranie informacji o składzie pociągu — przejście wzdłuż składu i odczyt parametrów:
// · ilość wagonów -> są zliczane, wszystkich pojazdów jest (iVehicles)
// · długość (jako suma) -> jest w (fLength)
@@ -2266,7 +2266,7 @@ void TController::AutoRewident()
BrakingLevelIncrease = IsHeavyCargoTrain ? 0.25 : IsCargoTrain ? 0.25 : 0.25;
if( is_emu() ) {
auto ep_factor { ( BrakeSystem == TBrakeSystem::ElectroPneumatic ? 8 : 4 ) };
const auto ep_factor { ( BrakeSystem == TBrakeSystem::ElectroPneumatic ? 8 : 4 ) };
if( mvControlling->EngineType == TEngineType::ElectricInductionMotor ) {
// HACK: emu with induction motors need to start their braking a bit sooner than the ones with series motors
fNominalAccThreshold = std::max( -0.60, -fBrake_a0[ BrakeAccTableSize ] - ep_factor * fBrake_a1[ BrakeAccTableSize ] );
@@ -2295,8 +2295,8 @@ void TController::AutoRewident()
double TController::ESMVelocity(bool Main)
{
double fCurrentCoeff = 0.9;
double fFrictionCoeff = 0.85;
const double fCurrentCoeff = 0.9;
const double fFrictionCoeff = 0.85;
double ESMVel = 9999;
int MCPN = mvControlling->MainCtrlActualPos;
int SCPN = mvControlling->ScndCtrlActualPos;
@@ -2306,7 +2306,7 @@ double TController::ESMVelocity(bool Main)
SCPN += 1;
if (mvControlling->RList[MCPN].ScndAct < 255 && mvControlling->ScndCtrlActualPos == 0)
SCPN = mvControlling->RList[MCPN].ScndAct;
double FrictionMax = mvControlling->Mass*9.81*mvControlling->Adhesive(mvControlling->RunningTrack.friction)*fFrictionCoeff;
const double FrictionMax = mvControlling->Mass*9.81*mvControlling->Adhesive(mvControlling->RunningTrack.friction)*fFrictionCoeff;
double IF = mvControlling->Imax;
double MS = 0;
double Fmax = 0;
@@ -2324,11 +2324,11 @@ double TController::ESMVelocity(bool Main)
}
}
IF = std::min(IF, mvControlling->Imax*fCurrentCoeff);
double R = mvControlling->RList[MCPN].R + mvControlling->CircuitRes + mvControlling->RList[MCPN].Mn*mvControlling->WindingRes;
double pole = mvControlling->MotorParam[SCPN].fi *
const double R = mvControlling->RList[MCPN].R + mvControlling->CircuitRes + mvControlling->RList[MCPN].Mn*mvControlling->WindingRes;
const double pole = mvControlling->MotorParam[SCPN].fi *
std::max(abs(IF) / (abs(IF) + mvControlling->MotorParam[SCPN].Isat) - mvControlling->MotorParam[SCPN].fi0, 0.0);
double Us = abs(mvControlling->EngineVoltage) - IF*R;
double ns = std::max(0.0, Us / (pole*mvControlling->RList[MCPN].Mn));
const double Us = abs(mvControlling->EngineVoltage) - IF*R;
const double ns = std::max(0.0, Us / (pole*mvControlling->RList[MCPN].Mn));
ESMVel = ns * mvControlling->WheelDiameter*M_PI*3.6/mvControlling->Transmision.Ratio;
return ESMVel;
}
@@ -2589,7 +2589,7 @@ TBrakeSystem TController::consist_brake_system() const {
auto isepcapable = true;
if( pVehicles[ end::front ] != pVehicles[ end::rear ] ) {
// more detailed version, will use manual braking also for coupled sets of controlled vehicles
auto *vehicle = pVehicles[ end::front ]; // start from first
const auto *vehicle = pVehicles[ end::front ]; // start from first
while( true == isepcapable
&& vehicle != nullptr ) {
// NOTE: we could simplify this by doing only check of the rear coupler, but this can be quite tricky in itself
@@ -2606,7 +2606,7 @@ TBrakeSystem TController::consist_brake_system() const {
int TController::OrderDirectionChange(int newdir, TMoverParameters *Vehicle)
{ // zmiana kierunku jazdy, niezależnie od kabiny
int testd = newdir;
const int testd = newdir;
if (Vehicle->Vel < 0.5)
{ // jeśli prawie stoi, można zmienić kierunek, musi być wykonane dwukrotnie, bo za pierwszym razem daje na zero
switch (newdir * Vehicle->CabActive)
@@ -3017,7 +3017,7 @@ bool TController::IncBrake()
*/
if( pVehicles[ end::front ] != pVehicles[ end::rear ] ) {
// more detailed version, will use manual braking also for coupled sets of controlled vehicles
auto *vehicle = pVehicles[ end::front ]; // start from first
const auto *vehicle = pVehicles[ end::front ]; // start from first
while( true == standalone
&& vehicle != nullptr ) {
// NOTE: we could simplify this by doing only check of the rear coupler, but this can be quite tricky in itself
@@ -3070,7 +3070,7 @@ bool TController::IncBrake()
pos_corr += mvOccupied->Handle->GetCP()*0.2;
}
double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]);
const double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]);
if( deltaAcc > fBrake_a1[0])
{
@@ -3577,7 +3577,7 @@ bool TController::IncSpeed()
if (mvControlling->EIMCtrlType > 0) {
if (true == Ready)
{
bool max = mvControlling->Vel > mvControlling->dizel_minVelfullengage
const bool max = mvControlling->Vel > mvControlling->dizel_minVelfullengage
|| (mvControlling->SpeedCtrl && mvControlling->ScndCtrlPos > 0);
DizelPercentage = max ? 100 : 1;
}
@@ -3958,7 +3958,7 @@ void TController::SpeedCntrl(double DesiredSpeed)
}
else if (mvControlling->ScndCtrlPosNo > 1 && !mvOccupied->SpeedCtrlTypeTime)
{
int DesiredPos = 1 + mvControlling->ScndCtrlPosNo * ((DesiredSpeed - 1.0) / mvControlling->Vmax);
const int DesiredPos = 1 + mvControlling->ScndCtrlPosNo * ((DesiredSpeed - 1.0) / mvControlling->Vmax);
while( mvControlling->ScndCtrlPos > DesiredPos && true == mvControlling->DecScndCtrl(1) ) { ; } // all work is done in the condition loop
while( mvControlling->ScndCtrlPos < DesiredPos && true == mvControlling->IncScndCtrl(1) ) { ; } // all work is done in the condition loop
}
@@ -4060,8 +4060,8 @@ void TController::SetTimeControllers()
if (mvControlling->EngineType == TEngineType::DieselEngine && mvControlling->EIMCtrlType == 3)
{
DizelPercentage_Speed = DizelPercentage; //wstepnie procenty
auto MinVel{ std::min(mvControlling->hydro_TC_LockupSpeed, mvControlling->Vmax / 6) }; //minimal velocity
DizelPercentage_Speed = DizelPercentage; // wstepnie procenty
const auto MinVel{ std::min(mvControlling->hydro_TC_LockupSpeed, mvControlling->Vmax / 6) }; //minimal velocity
//when speed controll unit is active - start with the procedure
if (mvControlling->SpeedCtrl && mvControlling->ScndCtrlPos > 0) {
if (mvControlling->ScndCtrlPos > 0 && mvControlling->Vel < 1 + mvControlling->SpeedCtrlUnit.StartVelocity && DizelPercentage > 0)
@@ -4119,12 +4119,12 @@ void TController::SetTimeControllers()
//5.2. Analog direct controller
if (mvControlling->EngineType == TEngineType::DieselEngine && mvControlling->Vmax > 30)
{
int MaxPos = mvControlling->MainCtrlPosNo;
const int MaxPos = mvControlling->MainCtrlPosNo;
int MinPos = MaxPos;
for (int i = MaxPos; i > 1 && mvControlling->RList[i].Mn > 0; i--) MinPos = i;
if (MaxPos > MinPos && mvControlling->MainCtrlPos > 0 && AccDesired > 0)
{
double Factor = 5 * mvControlling->Vmax / (mvControlling->Vmax + mvControlling->Vel);
const double Factor = 5 * mvControlling->Vmax / (mvControlling->Vmax + mvControlling->Vel);
int DesiredPos = MinPos + (MaxPos - MinPos)*(VelDesired > mvControlling->Vel ? (VelDesired - mvControlling->Vel) / Factor : 0);
if (DesiredPos > MaxPos) DesiredPos = MaxPos;
if (DesiredPos < MinPos) DesiredPos = MinPos;
@@ -4228,7 +4228,7 @@ void TController::CheckTimeControllers()
//5.1. Digital controller in DMUs with hydro
if (mvControlling->EngineType == TEngineType::DieselEngine && mvControlling->EIMCtrlType == 3)
{
int DizelActualPercentage = 100.4 * mvControlling->eimic_real;
const int DizelActualPercentage = 100.4 * mvControlling->eimic_real;
int NeutralPos = mvControlling->MainCtrlPosNo - 1; //przedostatnia powinna wstrzymywać - hipoteza robocza
for (int i = mvControlling->MainCtrlPosNo; i >= 0; i--)
if (mvControlling->UniCtrlList[i].SetCtrlVal <= 0 && mvControlling->UniCtrlList[i].SpeedDown < 0.01) //niby zero, ale nie zmniejsza procentów
@@ -5262,7 +5262,7 @@ std::string TController::StopReasonText() const
bool TController::IsOccupiedByAnotherConsist( TTrack *Track, double const Distance = 0 )
{ // najpierw sprawdzamy, czy na danym torze są pojazdy z innego składu
if( false == Track->Dynamics.empty() ) {
for( auto dynamic : Track->Dynamics ) {
for (const auto dynamic : Track->Dynamics ) {
if( dynamic->ctOwner != this ) {
// jeśli jest jakiś cudzy to tor jest zajęty i skanowanie nie obowiązuje
if( Distance == 0 ) {
@@ -5812,7 +5812,7 @@ void TController::ControllingSet()
BrakeSystem = mvOccupied->BrakeSystem; // domyślny sposób hamowania
mvControlling = pVehicle->FindPowered()->MoverParameters; // poszukiwanie członu sterowanego
{
auto *lookup { pVehicle->FindPantographCarrier() };
const auto *lookup { pVehicle->FindPantographCarrier() };
mvPantographUnit = lookup != nullptr ? lookup->MoverParameters : mvControlling;
}
BrakeSystem = consist_brake_system();
@@ -5938,7 +5938,7 @@ TController::determine_consist_state() {
fBrake_a1[0] = fBrake_a1[index];
if (is_emu() || is_dmu()) {
auto Coeff = std::clamp( mvOccupied->Vel*0.015 , 0.5 , 1.0);
const auto Coeff = std::clamp( mvOccupied->Vel*0.015 , 0.5 , 1.0);
fAccThreshold = fNominalAccThreshold * Coeff - fBrake_a0[BrakeAccTableSize] * (1.0 - Coeff);
}
@@ -5952,7 +5952,7 @@ TController::determine_consist_state() {
IsAnyDoorOpen[ side::right ] = IsAnyDoorOpen[ side::left ] = false;
IsAnyDoorPermitActive[ side::right ] = IsAnyDoorPermitActive[ side::left ] = false;
ConsistShade = 0.0;
auto *p { pVehicles[ end::front ] }; // pojazd na czole składu
const auto *p { pVehicles[ end::front ] }; // pojazd na czole składu
double dy; // składowa styczna grawitacji, w przedziale <0,1>
while (p)
{ // sprawdzenie odhamowania wszystkich połączonych pojazdów
@@ -6059,7 +6059,7 @@ TController::determine_consist_state() {
auto absaccs { fAccGravity }; // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji
if( mvOccupied->Vel > EU07_AI_NOMOVEMENT ) {
absaccs = 0;
auto *d = pVehicles[ end::front ]; // pojazd na czele składu
const auto *d = pVehicles[ end::front ]; // pojazd na czele składu
while( d ) {
absaccs += d->MoverParameters->TotalMass * d->MoverParameters->AccS * ( d->DirectionGet() == iDirection ? 1 : -1 );
d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła)
@@ -6535,7 +6535,7 @@ TController::scan_obstacles( double const Range ) {
// HACK: vehicle order in the consist is based on intended travel direction
// if our actual travel direction doesn't match that, we should be scanning from the other end of the consist
// we cast to int to avoid getting confused by microstutters
auto *frontvehicle { pVehicles[ ( static_cast<int>( mvOccupied->V ) * iDirection >= 0 ? end::front : end::rear ) ] };
const auto *frontvehicle { pVehicles[ ( static_cast<int>( mvOccupied->V ) * iDirection >= 0 ? end::front : end::rear ) ] };
int routescandirection;
// for moving vehicle determine heading from velocity; for standing fall back on the set direction
@@ -6757,7 +6757,7 @@ TController::check_load_exchange() {
if( fStopTime > 0 ) { return; }
// czas postoju przed dalszą jazdą (np. na przystanku)
auto *vehicle { pVehicles[ end::front ] };
const auto *vehicle { pVehicles[ end::front ] };
while( vehicle != nullptr ) {
auto const vehicleexchangetime { vehicle->LoadExchangeTime() };
DoesAnyDoorNeedOpening |= vehicleexchangetime > 0 && vehicle->LoadExchangeSpeed() == 0;
@@ -6829,7 +6829,7 @@ TController::UpdateLooseShunt() {
&& AccDesired > 0.1
&& mvOccupied->Vel < 1.0 ) {
auto *vehicle { Obstacle.vehicle };
const auto *vehicle { Obstacle.vehicle };
auto const direction { ( vehicle->Prev() != nullptr ? end::front : end::rear ) };
while( vehicle != nullptr ) {
if( vehicle->MoverParameters->BrakePress > 0.2 ) {
@@ -6889,7 +6889,7 @@ TController::UpdateConnect() {
// podłączanie do składu
if (iDrivigFlags & moveConnect) {
// sprzęgi sprawdzamy w pierwszej kolejności, bo jak połączony, to koniec
auto *vehicle { iCouplingVehicle.value().first };
const auto *vehicle { iCouplingVehicle.value().first };
auto const couplingend { iCouplingVehicle.value().second };
auto *vehicleparameters { vehicle->MoverParameters };
if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != iCoupler ) {
@@ -6949,7 +6949,7 @@ TController::UpdateConnect() {
void
TController::GuardOpenDoor() {
if ((iDrivigFlags & moveGuardOpenDoor) != 0) {
auto *vehicle{ pVehicles[end::front] };
const auto *vehicle{ pVehicles[end::front] };
while (vehicle != nullptr && vehicle->MoverParameters->Doors.range == 0) {
vehicle = vehicle->Next();
}
@@ -6972,7 +6972,7 @@ TController::GuardOpenDoor() {
int
TController::unit_count( int const Threshold ) const {
auto *vehicle { pVehicle };
const auto *vehicle { pVehicle };
auto unitcount { 1 };
do {
auto const decoupledend{ ( vehicle->DirectionGet() > 0 ? // numer sprzęgu od strony czoła składu
@@ -7900,7 +7900,7 @@ void TController::control_tractive_force() {
// zmniejszanie predkosci
// margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h
if( false == TestFlag( iDrivigFlags, movePress ) ) {
double SpeedCtrlMargin = mvControlling->SpeedCtrlUnit.IsActive && VelDesired > 5 ? 3 : 0;
const double SpeedCtrlMargin = mvControlling->SpeedCtrlUnit.IsActive && VelDesired > 5 ? 3 : 0;
// jeśli nie dociskanie
if( AccDesired <= EU07_AI_NOACCELERATION ) {
cue_action( driver_hint::mastercontrollersetzerospeed );

32
vehicle/DynObj.cpp
View File

@@ -552,7 +552,7 @@ void TDynamicObject::SetPneumatic(bool front, bool red)
void TDynamicObject::UpdateAxle(TAnim *pAnim)
{ // animacja osi
size_t wheel_id = pAnim->dWheelAngle;
const size_t wheel_id = pAnim->dWheelAngle;
pAnim->smAnimated->SetRotate(float3(1, 0, 0), dWheelAngle[wheel_id]);
pAnim->smAnimated->future_transform = glm::rotate((float)glm::radians(m_future_wheels_angle[wheel_id]), glm::vec3(1.0f, 0.0f, 0.0f));
};
@@ -718,7 +718,7 @@ void TDynamicObject::UpdateWiper(TAnim* pAnim)
if (!pAnim || !pAnim->smElement)
return;
int i = pAnim->iNumber;
const int i = pAnim->iNumber;
// odwaramy animacje dla parzystych indexow
const double rotateAngle = (i + 1) % 2 == 0 ? -MoverParameters->WiperAngle : MoverParameters->WiperAngle;
@@ -1525,7 +1525,7 @@ TDynamicObject::ABuFindObject( int &Foundcoupler, double &Distance, TTrack const
}
double objectposition; // robocza odległość od kolejnych pojazdów na danym odcinku
for( auto dynamic : Track->Dynamics ) {
for (const auto dynamic : Track->Dynamics ) {
if( dynamic == this ) { continue; } // szukający się nie liczy
/*
@@ -1894,7 +1894,7 @@ void TDynamicObject::place_on_track(TTrack *Track, double fDist, bool Reversed)
-axle.offset :
axle.offset + MoverParameters->Dim.L ) + fDist;
}
double fAxleDistHalf = fAxleDist * 0.5;
const double fAxleDistHalf = fAxleDist * 0.5;
// przesuwanie pojazdu tak, aby jego początek był we wskazanym miejcu
fDist -= 0.5 * MoverParameters->Dim.L; // dodajemy pół długości pojazdu, bo ustawiamy jego środek (zliczanie na minus)
switch (iNumAxles) {
@@ -2739,8 +2739,8 @@ void TDynamicObject::AttachNext(TDynamicObject *Object, int iType)
// potentially attach automatic coupler adapter to allow the connection
// HACK: we're doing it after establishin actual connection, as the method needs valid neighbour data
auto &coupler { MoverParameters->Couplers[ vehicleend ] };
auto &othercoupler { Object->MoverParameters->Couplers[ ( othervehicleend != 2 ? othervehicleend : coupler.ConnectedNr ) ] };
const auto &coupler { MoverParameters->Couplers[ vehicleend ] };
const auto &othercoupler { Object->MoverParameters->Couplers[ ( othervehicleend != 2 ? othervehicleend : coupler.ConnectedNr ) ] };
if( coupler.type() != othercoupler.type() ) {
if( othercoupler.type() == TCouplerType::Automatic ) {
@@ -4181,7 +4181,7 @@ void TDynamicObject::pants_up()
auto d = this;
bool isAnyPantUp = false;
while (d) {
for (auto &item : d->MoverParameters->Pantographs)
for (const auto &item : d->MoverParameters->Pantographs)
{
isAnyPantUp |= item.is_active;
}
@@ -4189,7 +4189,7 @@ void TDynamicObject::pants_up()
}
d = Prev(4);
while (d) {
for (auto &item : d->MoverParameters->Pantographs)
for (const auto &item : d->MoverParameters->Pantographs)
{
isAnyPantUp |= item.is_active;
}
@@ -7295,9 +7295,9 @@ void TDynamicObject::RaLightsSet(int head, int rear)
bool tRight = MoverParameters->iLights[vehicleend] & (light::auxiliary_right | light::headlight_right); // a tu z prawej
if (Controller == Humandriver) {
int &currentDimPos = MoverParameters->modernDimmerPosition;
auto &dimmerPositions = MoverParameters->dimPositions;
TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos];
const int &currentDimPos = MoverParameters->modernDimmerPosition;
const auto &dimmerPositions = MoverParameters->dimPositions;
const TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos];
// domyślnie
HighBeamLights = false;
@@ -7359,9 +7359,9 @@ void TDynamicObject::SetLightDimmings()
if (Controller == Humandriver)
{
int &currentDimPos = MoverParameters->modernDimmerPosition;
auto &dimmerPositions = MoverParameters->dimPositions;
TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos];
const int &currentDimPos = MoverParameters->modernDimmerPosition;
const auto &dimmerPositions = MoverParameters->dimPositions;
const TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos];
// domyślnie
HighBeamLights = false;
@@ -8247,7 +8247,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
}
if (Vehicle.Mains) {
float power = std::clamp(Vehicle.eimv_pr, 0.0, 1.0);
const float power = std::clamp(Vehicle.eimv_pr, 0.0, 1.0);
fake_engine
.pitch(fake_engine.m_frequencyoffset + power * fake_engine.m_frequencyfactor)
@@ -8311,7 +8311,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
}
if (Vehicle.hydro_R) {
float speed = std::abs(Vehicle.hydro_R_n);
const float speed = std::abs(Vehicle.hydro_R_n);
retarder
.pitch(retarder.m_frequencyoffset + speed * retarder.m_frequencyfactor)

6
vehicle/Gauge.cpp
View File

@@ -184,7 +184,7 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu
endscale *= mul;
}
TSubModel *submodel { nullptr };
std::array<TModel3d *, 2> sources { Owner->mdKabina, Owner->mdLowPolyInt };
const std::array<TModel3d *, 2> sources { Owner->mdKabina, Owner->mdLowPolyInt };
for( auto const *source : sources ) {
if( source != nullptr
&& ( submodel = source->GetFromName( submodelname ) ) != nullptr ) {
@@ -219,7 +219,7 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu
{ "wip", TGaugeAnimation::gt_Wiper },
{ "dgt", TGaugeAnimation::gt_Digital }
};
auto lookup = gaugetypes.find( gaugetypename );
const auto lookup = gaugetypes.find( gaugetypename );
auto const type = lookup != gaugetypes.end() ? lookup->second : TGaugeAnimation::gt_Unknown;
Init( submodel, submodelon, type, scale, offset, friction, 0, endvalue, endscale, interpolatescale );
@@ -358,7 +358,7 @@ void TGauge::Update( bool const Power ) {
// update value
// TODO: remove passing manually power state when LD is in place
if( m_value != m_targetvalue ) {
float dt = Timer::GetDeltaTime();
const float dt = Timer::GetDeltaTime();
if( m_friction > 0 && dt < 0.5 * m_friction ) {
// McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow
m_value += dt * ( m_targetvalue - m_value ) / m_friction;

84
vehicle/Train.cpp
View File

@@ -849,8 +849,8 @@ std::shared_ptr<dictionary_source> TTrain::GetTrainState(dictionary_source const
dict->insert("compressors_" + idx + "_car_no", std::get<2>(bCompressors[i]));
}
bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, 4);
const bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
const TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, 4);
int in = 0;
while (p && in < 8)
{
@@ -1878,7 +1878,7 @@ void TTrain::OnCommand_independentbrakebailoff(TTrain *Train, command_data const
else
{
// car brake handling, while in walk mode
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle != nullptr)
{
if (Command.action == GLFW_PRESS)
@@ -2135,7 +2135,7 @@ void TTrain::OnCommand_trainbrakeoperationtoggle(TTrain *Train, command_data con
if (Command.action == GLFW_PRESS)
{
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle == nullptr)
{
return;
@@ -2151,7 +2151,7 @@ void TTrain::OnCommand_manualbrakeincrease(TTrain *Train, command_data const &Co
if (Command.action != GLFW_RELEASE)
{
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle == nullptr)
{
return;
@@ -2171,7 +2171,7 @@ void TTrain::OnCommand_manualbrakedecrease(TTrain *Train, command_data const &Co
if (Command.action != GLFW_RELEASE)
{
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle == nullptr)
{
return;
@@ -2576,7 +2576,7 @@ void TTrain::OnCommand_brakeloadcompensationincrease(TTrain *Train, command_data
if (true == Command.freefly && Command.action == GLFW_PRESS)
{
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle != nullptr)
{
vehicle->MoverParameters->IncBrakeMult();
@@ -2589,7 +2589,7 @@ void TTrain::OnCommand_brakeloadcompensationdecrease(TTrain *Train, command_data
if (true == Command.freefly && Command.action == GLFW_PRESS)
{
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle != nullptr)
{
vehicle->MoverParameters->DecBrakeMult();
@@ -3516,7 +3516,7 @@ void TTrain::update_pantograph_valves()
{
auto const &presets{mvOccupied->PantsPreset.first};
auto &selection{mvOccupied->PantsPreset.second[cab_to_end()]};
const auto &selection{mvOccupied->PantsPreset.second[cab_to_end()]};
auto const preset{presets[selection] - '0'};
auto const swapends{cab_to_end() != end::front};
@@ -3550,7 +3550,7 @@ void TTrain::change_pantograph_selection(int const Change)
void TTrain::OnCommand_pantographvalvesupdate(TTrain *Train, command_data const &Command)
{
bool hasSeparateSwitches = Train->m_controlmapper.contains("pantvalvesupdate_bt:") && Train->m_controlmapper.contains("pantvalvesoff_bt:");
const bool hasSeparateSwitches = Train->m_controlmapper.contains("pantvalvesupdate_bt:") && Train->m_controlmapper.contains("pantvalvesoff_bt:");
if (Command.action == GLFW_REPEAT)
{
@@ -3590,7 +3590,7 @@ void TTrain::OnCommand_pantographvalvesupdate(TTrain *Train, command_data const
void TTrain::OnCommand_pantographvalvesoff(TTrain *Train, command_data const &Command)
{
bool hasSeparateSwitches = Train->m_controlmapper.contains("pantvalvesupdate_bt:") && Train->m_controlmapper.contains("pantvalvesoff_bt:");
const bool hasSeparateSwitches = Train->m_controlmapper.contains("pantvalvesupdate_bt:") && Train->m_controlmapper.contains("pantvalvesoff_bt:");
if (Command.action == GLFW_REPEAT)
{
@@ -5893,7 +5893,7 @@ void TTrain::OnCommand_modernlightdimmerincrease(TTrain *Train, command_data con
// update modern dimmer state
auto &dimPos = Train->mvOccupied->modernDimmerPosition;
auto dimCount = Train->mvOccupied->dimPositions.size();
const auto dimCount = Train->mvOccupied->dimPositions.size();
if (dimPos + 1 < dimCount)
dimPos++;
else if (Train->mvOccupied->modernDimmerCanCycle)
@@ -5917,7 +5917,7 @@ void TTrain::OnCommand_modernlightdimmerdecrease(TTrain *Train, command_data con
if (Command.action == GLFW_PRESS)
{
auto &dimPos = Train->mvOccupied->modernDimmerPosition;
auto dimCount = Train->mvOccupied->dimPositions.size();
const auto dimCount = Train->mvOccupied->dimPositions.size();
if (dimCount == 0)
return;
@@ -6106,7 +6106,7 @@ void TTrain::OnCommand_endsignalstoggle(TTrain *Train, command_data const &Comma
if (true == Command.freefly && Command.action == GLFW_PRESS)
{
auto *vehicle{std::get<TDynamicObject *>(simulation::Region->find_vehicle(Command.location, 10, false, true))};
const auto *vehicle{std::get<TDynamicObject *>(simulation::Region->find_vehicle(Command.location, 10, false, true))};
if (vehicle == nullptr)
{
@@ -6878,7 +6878,7 @@ void TTrain::OnCommand_springbrakerelease(TTrain *Train, command_data const &Com
{
// only reacting to press, so the switch doesn't flip back and forth if key is held down
auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
const auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)};
if (vehicle == nullptr)
{
return;
@@ -6985,9 +6985,9 @@ void TTrain::OnCommand_inverterenable(TTrain *Train, command_data const &Command
if (Command.action == GLFW_PRESS)
{
// only reacting to press, so the switch doesn't flip back and forth if key is held down
bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
const bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
const int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
const TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
while (p)
{
if (p->MoverParameters->eimc[eimc_p_Pmax] > 1)
@@ -7024,9 +7024,9 @@ void TTrain::OnCommand_inverterdisable(TTrain *Train, command_data const &Comman
if (Command.action == GLFW_PRESS)
{
// only reacting to press, so the switch doesn't flip back and forth if key is held down
bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
const bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
const int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
const TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
while (p)
{
if (p->MoverParameters->eimc[eimc_p_Pmax] > 1)
@@ -7063,9 +7063,9 @@ void TTrain::OnCommand_invertertoggle(TTrain *Train, command_data const &Command
if (Command.action == GLFW_PRESS)
{
// only reacting to press, so the switch doesn't flip back and forth if key is held down
bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
const bool kier = Train->DynamicObject->DirectionGet() * Train->mvOccupied->CabOccupied > 0;
const int flag = Train->DynamicObject->MoverParameters->InverterControlCouplerFlag;
const TDynamicObject *p = Train->DynamicObject->GetFirstDynamic(Train->mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
while (p)
{
if (p->MoverParameters->eimc[eimc_p_Pmax] > 1)
@@ -8373,14 +8373,14 @@ void TTrain::OnCommand_vehicleboost(TTrain *Train, const command_data &Command)
if (Command.action == GLFW_RELEASE || !DebugModeFlag)
return;
double boost = Command.param1 != 0.0 ? Command.param1 : 2.78;
const double boost = Command.param1 != 0.0 ? Command.param1 : 2.78;
if (Train->DynamicObject == nullptr)
{
return;
}
auto *vehicle{Train->DynamicObject};
const auto *vehicle{Train->DynamicObject};
while (vehicle)
{
vehicle->MoverParameters->V += vehicle->DirectionGet() * boost;
@@ -8589,7 +8589,7 @@ bool TTrain::Update(double const Deltatime)
}
fTachoVelocity = static_cast<float>(std::min(std::abs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), maxSpeed));
{ // skacze osobna zmienna
float ff = simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy
const float ff = simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy
// pomiar, pol sekundy ustawienie
if (ff != fTachoTimer) // jesli w tej sekundzie nie zmienial
{
@@ -8643,8 +8643,8 @@ bool TTrain::Update(double const Deltatime)
fHCurrent[3] = mvControlled->ShowCurrent(3);
}
bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, 4);
const bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
const TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, 4);
int in = 0;
fEIMParams[0][6] = 0;
iCarNo = 0;
@@ -8843,7 +8843,7 @@ bool TTrain::Update(double const Deltatime)
// youBy - prad w drugim czlonie: galaz lub calosc
{
TDynamicObject *tmp{nullptr};
const TDynamicObject *tmp{nullptr};
if (DynamicObject->NextConnected())
if (TestFlag(mvControlled->Couplers[end::rear].CouplingFlag, coupling::control) && mvOccupied->CabOccupied == 1)
tmp = DynamicObject->NextConnected();
@@ -8976,7 +8976,7 @@ bool TTrain::Update(double const Deltatime)
if (mvControlled->SlippingWheels)
{
// Ra 2014-12: lokomotywy 181/182 dostają SlippingWheels po zahamowaniu powyżej 2.85 bara i buczały
double veldiff = (DynamicObject->GetVelocity() - fTachoVelocity) / mvControlled->Vmax;
const double veldiff = (DynamicObject->GetVelocity() - fTachoVelocity) / mvControlled->Vmax;
if (veldiff < -0.01)
{
// 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza
@@ -9303,7 +9303,7 @@ bool TTrain::Update(double const Deltatime)
}
{ // yB - wskazniki drugiego czlonu
TDynamicObject *tmp{nullptr}; //=mvControlled->mvSecond; //Ra 2014-07: trzeba to jeszcze wyjąć z kabiny...
const TDynamicObject *tmp{nullptr}; //=mvControlled->mvSecond; //Ra 2014-07: trzeba to jeszcze wyjąć z kabiny...
// Ra 2014-07: no nie ma potrzeby szukać tego w każdej klatce
if (TestFlag(mvControlled->Couplers[1].CouplingFlag, coupling::control) && mvOccupied->CabOccupied > 0)
tmp = DynamicObject->NextConnected();
@@ -10202,7 +10202,7 @@ void TTrain::update_sounds_resonancenoise(sound_source &Sound)
auto const frequency{Sound.m_frequencyoffset + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer};
// volume calculation
auto volume = Sound.m_amplitudeoffset + Sound.m_amplitudefactor * std::lerp(mvOccupied->Vel / (1 + mvOccupied->Vmax), 1.0, 0.5); // scale base volume between 0.5-1.0
const auto volume = Sound.m_amplitudeoffset + Sound.m_amplitudefactor * std::lerp(mvOccupied->Vel / (1 + mvOccupied->Vmax), 1.0, 0.5); // scale base volume between 0.5-1.0
if (volume > 0.05)
{
@@ -10261,7 +10261,7 @@ void TTrain::update_sounds_radio()
}
// adjust audibility of remaining messages based on current radio conditions
auto const radioenabled{true == mvOccupied->Radio && (mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable)};
for (auto &message : m_radiomessages)
for (const auto &message : m_radiomessages)
{
auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && message.first == RadioChannel() ? m_radiovolume : 0.0};
message.second->gain(volume);
@@ -10298,7 +10298,7 @@ void TTrain::update_screens(double dt)
screen.updatetimecounter = screen.updatetime > 0 ? 0 : -1;
auto state_dict = GetTrainState(screen.parameters);
const auto state_dict = GetTrainState(screen.parameters);
state_dict->insert("touches", *screen.touch_list);
screen.touch_list->clear();
@@ -10871,7 +10871,7 @@ void TTrain::DynamicSet(TDynamicObject *d)
}
// cache nearest unit equipped with pantographs
{
auto *lookup{DynamicObject->FindPantographCarrier()};
const auto *lookup{DynamicObject->FindPantographCarrier()};
// HACK: set pointer to existing vehicle to avoid error checking all over the place
mvPantographUnit = lookup != nullptr ? lookup->MoverParameters : mvControlled;
}
@@ -11597,14 +11597,14 @@ void TTrain::set_cab_controls(int const Cab)
ggRadioVolumeSelector.PutValue(m_radiovolume);
// finding each inverter - not so optimal, but action ins performed only during changing cabin
bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
int flag = DynamicObject->MoverParameters->InverterControlCouplerFlag;
const bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0;
const int flag = DynamicObject->MoverParameters->InverterControlCouplerFlag;
int itemstart = 0;
for (auto &item : ggInverterToggleButtons) // for each button
{
int itemindex = itemstart;
itemstart++;
TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
const TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->CabOccupied < 0 ? end::rear : end::front, flag);
while (p)
{
if (p->MoverParameters->eimc[eimc_p_Pmax] > 1)
@@ -11742,7 +11742,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co
{"i-edenabled", btEDenabled},
};
{
auto lookup = lights.find(Label);
const auto lookup = lights.find(Label);
if (lookup != lights.end())
{
lookup->second.Load(Parser, DynamicObject);
@@ -11761,7 +11761,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co
{"i-cablight:", &Cabine[iCabn].bLight},
};
{
auto lookup = autolights.find(Label);
const auto lookup = autolights.find(Label);
if (lookup != autolights.end())
{
auto &button = Cabine[Cabindex].Button(-1); // pierwsza wolna lampka
@@ -11798,7 +11798,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co
}
else if (Label == "i-doors:")
{
int i = Parser.getToken<int>() - 1;
const int i = Parser.getToken<int>() - 1;
auto &button = Cabine[Cabindex].Button(-1); // pierwsza wolna lampka
button.Load(Parser, DynamicObject);
button.AssignBool(bDoors[0] + 3 * i);