mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-21 04:39:18 +02:00
build 170502. minor fixes for brakes subsystem, distribution of sandbox commands to other consist units
This commit is contained in:
tmj-fstate
78
World.cpp
78
World.cpp
@@ -714,6 +714,9 @@ void TWorld::OnKeyDown(int cKey)
|
||||
Train->OnKeyDown(cKey); // przekazanie klawisza do kabiny
|
||||
if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą
|
||||
{ // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny
|
||||
/*
|
||||
// NOTE: disabled so it doesn't interfere with new system controls in outside view
|
||||
// TODO: implement as part of the new system
|
||||
if (cKey == Global::Keys[k_Releaser]) // odluźniacz
|
||||
{ // działa globalnie, sprawdzić zasięg
|
||||
TDynamicObject *temp = Global::DynamicNearest();
|
||||
@@ -721,7 +724,7 @@ void TWorld::OnKeyDown(int cKey)
|
||||
{
|
||||
if (Global::ctrlState) // z ctrl odcinanie
|
||||
{
|
||||
temp->MoverParameters->BrakeStatus ^= 128;
|
||||
temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ 128 );
|
||||
}
|
||||
else if (temp->MoverParameters->BrakeReleaser(1))
|
||||
{
|
||||
@@ -731,7 +734,9 @@ void TWorld::OnKeyDown(int cKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy
|
||||
else
|
||||
*/
|
||||
if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy
|
||||
{ // zmiana próżny/ładowny; Ra: zabrane z kabiny
|
||||
TDynamicObject *temp = Global::DynamicNearest();
|
||||
if (temp)
|
||||
@@ -1799,12 +1804,12 @@ TWorld::Update_UI() {
|
||||
if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M )
|
||||
uitextline2 += "+Mg";
|
||||
|
||||
uitextline2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 );
|
||||
uitextline2 += ", BTP: " + to_string( tmp->MoverParameters->LoadFlag, 0 );
|
||||
{
|
||||
uitextline2 +=
|
||||
"; pant. "
|
||||
"; pant: "
|
||||
+ to_string( tmp->MoverParameters->PantPress, 2 )
|
||||
+ ( tmp->MoverParameters->bPantKurek3 ? "<ZG" : "|ZG" );
|
||||
+ ( tmp->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" );
|
||||
}
|
||||
|
||||
uitextline2 +=
|
||||
@@ -1822,25 +1827,37 @@ TWorld::Update_UI() {
|
||||
+ to_string( tmp->MoverParameters->TotalCurrent, 0 );
|
||||
#ifdef EU07_USE_OLD_HVCOUPLERS
|
||||
uitextline2 +=
|
||||
", HV0: ("
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::outgoing ], 0 )
|
||||
+ ")<-"
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::incoming ], 0 );
|
||||
", HV0: "
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::voltage ], 0 )
|
||||
+ "@"
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::current ], 0 );
|
||||
uitextline2 +=
|
||||
", HV1: ("
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::outgoing ], 0 )
|
||||
+ ")<-"
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::incoming ], 0 );
|
||||
", HV1: "
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::voltage ], 0 )
|
||||
+ "@"
|
||||
+ to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::current ], 0 );
|
||||
#else
|
||||
uitextline2 +=
|
||||
", HV: "
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.incoming, 0 )
|
||||
+ "->("
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.outgoing, 0 )
|
||||
+ ")F" + (tmp->DirectionGet() ? "<<" : ">>") + "R("
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.outgoing, 0 )
|
||||
+ ")<-"
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.incoming, 0 );
|
||||
auto const frontcouplerhighvoltage =
|
||||
to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 )
|
||||
+ "@"
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 );
|
||||
auto const rearcouplerhighvoltage =
|
||||
to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 )
|
||||
+ "@"
|
||||
+ to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 );
|
||||
uitextline2 += ", HV: ";
|
||||
if( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) {
|
||||
uitextline2 +=
|
||||
"(" + frontcouplerhighvoltage + ")-"
|
||||
+ ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:"
|
||||
+ "-(" + rearcouplerhighvoltage + ")";
|
||||
}
|
||||
else {
|
||||
uitextline2 +=
|
||||
frontcouplerhighvoltage
|
||||
+ ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:"
|
||||
+ rearcouplerhighvoltage;
|
||||
}
|
||||
#endif
|
||||
// equipment flags
|
||||
uitextline3 = "";
|
||||
@@ -1855,17 +1872,16 @@ TWorld::Update_UI() {
|
||||
uitextline3 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." );
|
||||
|
||||
uitextline3 +=
|
||||
" BP: " + to_string( tmp->MoverParameters->BrakePress, 2 )
|
||||
+ " (" + to_string( tmp->MoverParameters->BrakeStatus, 0 )
|
||||
+ "), LBP: " + to_string( tmp->MoverParameters->LocBrakePress, 2 )
|
||||
+ ", PP: " + to_string( tmp->MoverParameters->PipePress, 2 )
|
||||
" TrB: " + to_string( tmp->MoverParameters->BrakePress, 2 )
|
||||
+ ", " + to_hex_str( tmp->MoverParameters->Hamulec->GetBrakeStatus(), 2 )
|
||||
+ ", LcB: " + to_string( tmp->MoverParameters->LocBrakePress, 2 )
|
||||
+ ", pipes: " + to_string( tmp->MoverParameters->PipePress, 2 )
|
||||
+ "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 )
|
||||
+ "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 )
|
||||
+ ", MT: " + to_string( tmp->MoverParameters->CompressedVolume, 3 )
|
||||
+ ", BVP: " + to_string( tmp->MoverParameters->Volume, 3 )
|
||||
+ ", " + to_string( tmp->MoverParameters->CntrlPipePress, 3 )
|
||||
+ ", " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 )
|
||||
+ ", " + to_string( tmp->MoverParameters->BrakeStatus, 0 );
|
||||
+ ", BT: " + to_string( tmp->MoverParameters->Volume, 3 )
|
||||
+ ", CtlP: " + to_string( tmp->MoverParameters->CntrlPipePress, 3 )
|
||||
+ ", CtlT: " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 );
|
||||
|
||||
if( tmp->MoverParameters->ManualBrakePos > 0 ) {
|
||||
|
||||
@@ -2579,8 +2595,6 @@ world_environment::update() {
|
||||
keylightintensity = sunlightlevel;
|
||||
// diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon
|
||||
twilightfactor = clamp( -Global::SunAngle, 0.0f, 18.0f ) / 18.0f;
|
||||
// TODO: crank orange up at dawn/dusk
|
||||
keylightcolor = float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f );
|
||||
float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f;
|
||||
keylightcolor = interpolate(
|
||||
float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ),
|
||||
|
||||
Reference in New Issue
Block a user