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

engine revolutions change rate tweak for diesel-electric vehicles, support for combined engine revving sound, alerter ui indicator

Browse Source
This commit is contained in:
tmj-fstate
2018-01-05 17:14:34 +01:00
parent ba26ad1918
commit 8d3d50d218
4 changed files with 97 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DynObj.cpp
View File

@@ -4596,6 +4596,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName,
m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor;
}
else if( token == "dieselinc:" ) {
// dzwiek przy wlazeniu na obroty woodwarda
m_powertrainsounds.engine_revving.deserialize( parser, sound_type::single, sound_parameters::range );
m_powertrainsounds.engine_revving.owner( this );
}
else if( ( token == "tractionmotor:" )
&& ( MoverParameters->Power > 0 ) ) {
// plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest.
@@ -4659,12 +4665,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName,
rsDerailment.owner( this );
}
else if( token == "dieselinc:" ) {
// dzwiek przy wlazeniu na obroty woodwarda
m_powertrainsounds.engine_revving.deserialize( parser, sound_type::single, sound_parameters::range );
m_powertrainsounds.engine_revving.owner( this );
}
else if( token == "curve:" ) {
rscurve.deserialize( parser, sound_type::single, sound_parameters::range );
rscurve.owner( this );
@@ -5595,8 +5595,14 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
}
engine_revs_last = Vehicle.enrot * 60;
if( false == engine_revving.is_combined() ) {
// if the sound comes with multiple samples we reuse rpm-based calculation from the engine
frequency = engine_revving.m_frequencyoffset + engine_revving.m_frequencyfactor * 1.0;
}
if( enginerevvolume > 0.02 ) {
engine_revving
.pitch( frequency )
.gain( enginerevvolume )
.play( sound_flags::exclusive | sound_flags::looping );
}