16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 05:39:18 +02:00

vehicle visualization config file parameters, vehicle attachments support, axle clatter fix, disabled vehicles smoke fix

This commit is contained in:
tmj-fstate
2019-09-25 18:18:33 +02:00
parent 4e0975f387
commit 41834c4d4c
10 changed files with 167 additions and 92 deletions

View File

@@ -44,6 +44,7 @@ drivingaid_panel::update() {
auto const *mover = controlled->MoverParameters;
auto const *driver = controlled->Mechanik;
auto const *owner = ( controlled->ctOwner != nullptr ? controlled->ctOwner : controlled->Mechanik );
{ // throttle, velocity, speed limits and grade
std::string expandedtext;
@@ -60,8 +61,8 @@ drivingaid_panel::update() {
gradetext = m_buffer.data();
}
// next speed limit
auto const speedlimit { static_cast<int>( std::floor( driver->VelDesired ) ) };
auto const nextspeedlimit { static_cast<int>( std::floor( driver->VelNext ) ) };
auto const speedlimit { static_cast<int>( std::floor( owner->VelDesired ) ) };
auto const nextspeedlimit { static_cast<int>( std::floor( owner->VelNext ) ) };
std::string nextspeedlimittext;
if( nextspeedlimit != speedlimit ) {
std::snprintf(
@@ -117,7 +118,7 @@ drivingaid_panel::update() {
{ // alerter, hints
std::string expandedtext;
if( is_expanded ) {
auto const stoptime { static_cast<int>( std::ceil( -1.0 * controlled->Mechanik->fStopTime ) ) };
auto const stoptime { static_cast<int>( std::ceil( -1.0 * owner->fStopTime ) ) };
if( stoptime > 0 ) {
std::snprintf(
m_buffer.data(), m_buffer.size(),
@@ -126,7 +127,7 @@ drivingaid_panel::update() {
expandedtext = m_buffer.data();
}
else {
auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) };
auto const trackblockdistance{ std::abs( owner->TrackBlock() ) };
if( trackblockdistance <= 75.0 ) {
std::snprintf(
m_buffer.data(), m_buffer.size(),