From c021ac12a95d43fda4f6a362ef3a804534115121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 12 May 2019 19:04:30 +0200 Subject: [PATCH] Another change in turbocharger sound, added rpm in engine ui panel. --- DynObj.cpp | 2 +- driveruipanels.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 6008549d..e8ad81bd 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6625,7 +6625,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( Vehicle.TurboTest > 0 ) { // udawanie turbo: auto const pitch_diesel { Vehicle.EngineType == TEngineType::DieselEngine ? Vehicle.enrot / Vehicle.dizel_nmax : 0 }; - auto const goalpitch { std::max( 0.025, ( engine_volume + pitch_diesel + engine_turbo.m_frequencyoffset ) * engine_turbo.m_frequencyfactor ) }; + auto const goalpitch { std::max( 0.025, ( engine_volume * pitch_diesel + engine_turbo.m_frequencyoffset ) * engine_turbo.m_frequencyfactor ) }; auto const goalvolume { ( ( ( Vehicle.MainCtrlPos >= Vehicle.TurboTest ) && ( Vehicle.enrot > 0.1 ) ) ? std::max( 0.0, ( engine_turbo_pitch + engine_turbo.m_amplitudeoffset ) * engine_turbo.m_amplitudefactor ) : diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 8efa947d..b278f53f 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -717,7 +717,8 @@ debug_panel::update_section_engine( std::vector &Output ) { std::string parameterstext = "param value"; std::vector< std::pair > const paramvalues { - { "efill: ", mover.dizel_fill }, + { " rpm: ", mover.enrot * 60.0 }, + { "efill: ", mover.dizel_fill }, { "etorq: ", mover.dizel_Torque }, { "creal: ", mover.dizel_engage }, { "cdesi: ", mover.dizel_engagestate },